summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #7303 from nextcloud/fix-contact-menuMorris Jobke2017-11-271-0/+1
|\ | | | | Fix contacts menu height for Safari
| * Fix contacts menu height for SafariMorris Jobke2017-11-271-0/+1
| | | | | | | | | | | | | | * fixes #5119 * in Safari the input field was 38px in height and not 34px like in all other browsers Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #6901 from nextcloud/bugfix/4014/catch_parsing_errorMorris Jobke2017-11-276-5/+44
|\ \ | | | | | | catch errors when parsing calendar data for calendar query requests
| * | catch errors when parsing calendar data for calendar query requestsGeorg Ehrke2017-11-276-5/+44
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #7305 from nextcloud/log-level-for-log-extendingMorris Jobke2017-11-272-4/+5
|\ \ \ | | | | | | | | Pass log level to log reporters
| * | | Pass log level to log reportersMorris Jobke2017-11-272-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7292 from Neraste/fix/4789_disabled_usersLukas Reschke2017-11-271-3/+3
|\ \ \ \ | | | | | | | | | | Fix #4789: Group admins cannot see disabled users
| * | | | Fix #4789: Group admins cannot see disabled usersNeraste2017-11-271-3/+3
| | | | |
* | | | | Merge pull request #7308 from nextcloud/do-not-log-InvalidSyncTokenMorris Jobke2017-11-271-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Log InvalidSyncToken on DAV in debug level
| * | | | | Log InvalidSyncToken on DAV in debug levelMorris Jobke2017-11-271-0/+3
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #7307 from nextcloud/do-not-log-not-implemented-davLukas Reschke2017-11-271-0/+4
|\ \ \ \ \ | |_|_|/ / |/| | | | Log NotImplementedException on DAV in debug level
| * | | | Log NotImplementedException on DAV in debug levelMorris Jobke2017-11-271-0/+4
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7222 from nextcloud/fix-filerow-avatarsblizzz2017-11-277-145/+241
|\ \ \ \ | | | | | | | | | | Fix filerow avatars
| * | | | fix sorting test on phantomjsArthur Schiwon2017-11-241-15/+29
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | recycle SharedFileInfo values in fileInfoArthur Schiwon2017-11-233-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fileInfo is composed of data from sharing, however additional data is pulled when sidebar opens, e.g. the size. Then, existing data is overwritten by data from the other source (files). The data points that would be lost are not dirty however and still used, so we keep them. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | fix tooltips for goodArthur Schiwon2017-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | apply tooltip to all avatarsArthur Schiwon2017-11-231-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | rip out obsolete recipientsDisplayNameArthur Schiwon2017-11-236-108/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also needs tests adjustements, and this also brings in natural sorting Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | adjust tests and apply sortingArthur Schiwon2017-11-235-37/+144
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | adjust, fix and extend testsArthur Schiwon2017-11-232-25/+48
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Fix avatars in file rows of incoming sharesArthur Schiwon2017-11-233-5/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | fix avatars in file rows of outgoing sharesArthur Schiwon2017-11-233-9/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #7210 from nextcloud/pg10Morris Jobke2017-11-278-120/+41
|\ \ \ \ \ | | | | | | | | | | | | add postgresql 10 compatibility to dbal
| * | | | | Bump thirdparty refLukas Reschke2017-11-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | run postgresql 10 tests in droneRobin Appelman2017-11-222-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | add postgresql10 compatibility to dbalRobin Appelman2017-11-226-117/+18
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #7256 from ↵blizzz2017-11-272-11/+34
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | nextcloud/fix-cursor-for-avatar-and-user-names-in-comments Fix cursor for avatar and user names in comments
| * | | | | Replace with non-deprecated JS callLukas Reschke2017-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | | | | Disable contacts menu for mentions to current user in comment messagesDaniel Calviño Sánchez2017-11-272-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contacts menu is not shown for avatars and user names in the author row if they represent the current user. For consistency, and because the contacts menu provides no value when shown for the current user, this commit also disables the contacts menu for mentions to the current user. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Disable contacts menu for mentioned users in comments being composedDaniel Calviño Sánchez2017-11-272-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contacts menu does not provide too much value for users mentioned in a message being composed, so it is now disabled in this case. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Fix cursor for author row and avatars in commentsDaniel Calviño Sánchez2017-11-262-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When it was on an author row the cursor was shown as a pointer, even if clicking on the author row itself does nothing. On the other hand, avatars used the default cursor, even if clicking on them either shows the contacts menu (in the case of the author row, only when the avatar is for a different user than the current one) or inserts a mention (for avatars shown in the list of suggested mentions), depending on the case. Now, the author row uses the default cursor, and avatars (and their associated user name) use a pointer cursor if clicking on them will trigger an action (either showing the contacts menu or inserting a mention). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #7266 from ↵Morris Jobke2017-11-272-5/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-input-field-not-disabled-while-a-comment-is-being-sent Fix input field not disabled while a comment is being sent
| * | | | | | Make "contenteditable=false" divs look like disabled input fieldsDaniel Calviño Sánchez2017-11-231-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | Fix input field not disabled while a comment is being sentDaniel Calviño Sánchez2017-11-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the change of the text area to a content editable div the input field was no longer disabled while a new comment was being sent. It was caused by still trying to disable the div using the "disabled" property, which works only on real input fields; when using a content editable div the way to disable it is by setting "contenteditable" to "false". Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | | Merge pull request #7246 from william-p/Add_html5_audioplayer_publicLukas Reschke2017-11-271-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add HTML5 audio player in public view
| * | | | | | | Add HTML5 audio player in public viewWilliam Pain2017-11-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: William Pain <pain.william@gmail.com>
* | | | | | | | Merge pull request #7280 from ↵Morris Jobke2017-11-272-2/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-working-icon-position-when-sending-or-deleting-a-comment Fix working icon position when sending or deleting a comment
| * | | | | | | | Show delete working icon at the same position as the delete iconDaniel Calviño Sánchez2017-11-242-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a comment was being deleted the submit working icon was shown. Now the submit working icon is kept hidden in that case and a specific delete working icon, which is shown at the same position as the delete icon, is used instead. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | | Show submit working icon at the same position as the submit confirm iconDaniel Calviño Sánchez2017-11-241-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The submit confirm icon is shown as the background image of an absolutely positioned input element, so the CSS rules for the submit working icon were modified to match those of the submit confirm icon. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | | | | Merge pull request #7251 from nextcloud/contact-menu-position-fixMorris Jobke2017-11-272-10/+17
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixed contact menu position on comments
| * | | | | | | | | Fixed alignment of items in commentsJohn Molakvoæ (skjnldsv)2017-11-232-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | | | Fix contacts menu vertical position for comment authorsDaniel Calviño Sánchez2017-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contacts menu was being shown as "inline-block", which caused the top of the menu to be aligned to the top of the author row. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | | | Fixed contact menu horizontal positionJohn Molakvoæ (skjnldsv)2017-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The arrow tip was 1px off from the avatar centre. Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | | | | Merge pull request #7295 from nextcloud/remove-unused-methodLukas Reschke2017-11-272-32/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Remove unused mimetype detection method in OC_Image
| * | | | | | | | | | Remove unused mimetype detection method in OC_ImageMorris Jobke2017-11-272-32/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | | | Merge pull request #7264 from nextcloud/cache-fetched-appsLukas Reschke2017-11-2720-107/+168
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Cache fetched apps in update check
| * | | | | | | | | | | Make isUpdateAvailable non-staticMorris Jobke2017-11-257-26/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | | | | | Get the Installer via DIMorris Jobke2017-11-2515-83/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | | | | | | | Cache fetched apps in update checkMorris Jobke2017-11-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code tried to find the apps with updates and thus was called for every available app. This caused to get the full appstore content as often as apps are available. The appstore request itself was cached nevertheless in an appdata dir, but with an object storage this is still a lot of round trips to read this cached result. Thus the instantiated list is now cached in a static variable (because it's a static method call). Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | | | | | | Merge pull request #7298 from nextcloud/fix-wordingMorris Jobke2017-11-271-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a sentence in the README
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 18:36:31 +0000