nextcloud-server.git - Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix silent conflicts due to merging #7256 after #7251	Daniel Calviño Sánchez	2017-11-28	1	-3/+3
*	Merge pull request #7303 from nextcloud/fix-contact-menu	Morris Jobke	2017-11-27	1	-0/+1
\|\
\| *	Fix contacts menu height for Safari	Morris Jobke	2017-11-27	1	-0/+1
* \|	Merge pull request #6901 from nextcloud/bugfix/4014/catch_parsing_error	Morris Jobke	2017-11-27	6	-5/+44
\|\ \
\| * \|	catch errors when parsing calendar data for calendar query requests	Georg Ehrke	2017-11-27	6	-5/+44
* \| \|	Merge pull request #7305 from nextcloud/log-level-for-log-extending	Morris Jobke	2017-11-27	2	-4/+5
\|\ \ \
\| * \| \|	Pass log level to log reporters	Morris Jobke	2017-11-27	2	-4/+5
* \| \| \|	Merge pull request #7292 from Neraste/fix/4789_disabled_users	Lukas Reschke	2017-11-27	1	-3/+3
\|\ \ \ \
\| * \| \| \|	Fix #4789: Group admins cannot see disabled users	Neraste	2017-11-27	1	-3/+3
* \| \| \| \|	Merge pull request #7308 from nextcloud/do-not-log-InvalidSyncToken	Morris Jobke	2017-11-27	1	-0/+3
\|\ \ \ \ \
\| * \| \| \| \|	Log InvalidSyncToken on DAV in debug level	Morris Jobke	2017-11-27	1	-0/+3
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #7307 from nextcloud/do-not-log-not-implemented-dav	Lukas Reschke	2017-11-27	1	-0/+4
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Log NotImplementedException on DAV in debug level	Morris Jobke	2017-11-27	1	-0/+4
\| \|/ / /
* \| \| \|	Merge pull request #7222 from nextcloud/fix-filerow-avatars	blizzz	2017-11-27	7	-145/+241
\|\ \ \ \
\| * \| \| \|	fix sorting test on phantomjs	Arthur Schiwon	2017-11-24	1	-15/+29
\| * \| \| \|	recycle SharedFileInfo values in fileInfo	Arthur Schiwon	2017-11-23	3	-6/+22
\| * \| \| \|	fix tooltips for good	Arthur Schiwon	2017-11-23	1	-1/+1
\| * \| \| \|	apply tooltip to all avatars	Arthur Schiwon	2017-11-23	1	-2/+1
\| * \| \| \|	rip out obsolete recipientsDisplayName	Arthur Schiwon	2017-11-23	6	-108/+31
\| * \| \| \|	adjust tests and apply sorting	Arthur Schiwon	2017-11-23	5	-37/+144
\| * \| \| \|	adjust, fix and extend tests	Arthur Schiwon	2017-11-23	2	-25/+48
\| * \| \| \|	Fix avatars in file rows of incoming shares	Arthur Schiwon	2017-11-23	3	-5/+8
\| * \| \| \|	fix avatars in file rows of outgoing shares	Arthur Schiwon	2017-11-23	3	-9/+20
* \| \| \| \|	Merge pull request #7210 from nextcloud/pg10	Morris Jobke	2017-11-27	8	-120/+41
\|\ \ \ \ \
\| * \| \| \| \|	Bump thirdparty ref	Lukas Reschke	2017-11-27	1	-0/+0
\| * \| \| \| \|	run postgresql 10 tests in drone	Robin Appelman	2017-11-22	2	-3/+23
\| * \| \| \| \|	add postgresql10 compatibility to dbal	Robin Appelman	2017-11-22	6	-117/+18
* \| \| \| \| \|	Merge pull request #7256 from nextcloud/fix-cursor-for-avatar-and-user-names-...	blizzz	2017-11-27	2	-11/+34
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Replace with non-deprecated JS call	Lukas Reschke	2017-11-27	1	-1/+1
\| * \| \| \| \|	Disable contacts menu for mentions to current user in comment messages	Daniel Calviño Sánchez	2017-11-27	2	-4/+9
\| * \| \| \| \|	Disable contacts menu for mentioned users in comments being composed	Daniel Calviño Sánchez	2017-11-27	2	-7/+14
\| * \| \| \| \|	Fix cursor for author row and avatars in comments	Daniel Calviño Sánchez	2017-11-26	2	-4/+15
* \| \| \| \| \|	Merge pull request #7266 from nextcloud/fix-input-field-not-disabled-while-a-...	Morris Jobke	2017-11-27	2	-5/+30
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Make "contenteditable=false" divs look like disabled input fields	Daniel Calviño Sánchez	2017-11-23	1	-2/+27
\| * \| \| \| \| \|	Fix input field not disabled while a comment is being sent	Daniel Calviño Sánchez	2017-11-23	1	-3/+3
* \| \| \| \| \| \|	Merge pull request #7246 from william-p/Add_html5_audioplayer_public	Lukas Reschke	2017-11-27	1	-0/+6
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add HTML5 audio player in public view	William Pain	2017-11-22	1	-0/+6
* \| \| \| \| \| \| \|	Merge pull request #7280 from nextcloud/fix-working-icon-position-when-sendin...	Morris Jobke	2017-11-27	2	-2/+18
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Show delete working icon at the same position as the delete icon	Daniel Calviño Sánchez	2017-11-24	2	-2/+4
\| * \| \| \| \| \| \| \|	Show submit working icon at the same position as the submit confirm icon	Daniel Calviño Sánchez	2017-11-24	1	-0/+14
* \| \| \| \| \| \| \| \|	Merge pull request #7251 from nextcloud/contact-menu-position-fix	Morris Jobke	2017-11-27	2	-10/+17
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Fixed alignment of items in comments	John Molakvoæ (skjnldsv)	2017-11-23	2	-9/+16
\| * \| \| \| \| \| \| \| \|	Fix contacts menu vertical position for comment authors	Daniel Calviño Sánchez	2017-11-23	1	-1/+1
\| * \| \| \| \| \| \| \| \|	Fixed contact menu horizontal position	John Molakvoæ (skjnldsv)	2017-11-23	1	-1/+1
* \| \| \| \| \| \| \| \| \|	Merge pull request #7295 from nextcloud/remove-unused-method	Lukas Reschke	2017-11-27	2	-32/+1
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	Remove unused mimetype detection method in OC_Image	Morris Jobke	2017-11-27	2	-32/+1
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #7264 from nextcloud/cache-fetched-apps	Lukas Reschke	2017-11-27	20	-107/+168
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Make isUpdateAvailable non-static	Morris Jobke	2017-11-25	7	-26/+50
\| * \| \| \| \| \| \| \| \| \| \|	Get the Installer via DI	Morris Jobke	2017-11-25	15	-83/+116
\| * \| \| \| \| \| \| \| \| \| \|	Cache fetched apps in update check	Morris Jobke	2017-11-25	1	-1/+5