aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update documentationBjoern Schiessle2017-12-011-1/+5
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* check if $defaultLanguage is a valid string before we move onBjoern Schiessle2017-12-011-2/+3
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* use formal version of German if default_language is set to 'de_DE'Bjoern Schiessle2017-11-302-3/+67
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* [tx-robot] updated from transifexNextcloud bot2017-11-3030-38/+128
|
* Merge pull request #7343 from ↵Morris Jobke2017-11-294-0/+78
|\ | | | | | | | | nextcloud/fix_exception_on_unreachable_server_take2 Actually set the status so we don't cause another exception
| * Actually set the status so we don't cause another exceptionRoeland Jago Douma2017-11-294-0/+78
|/ | | | | | * And add tests so I don't mess up again Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #7338 from nextcloud/fix_exception_on_unreachable_serverRoeland Jago Douma2017-11-292-0/+6
|\ | | | | Do not log Exception if a connection error occured
| * Do not log Exception if a connection error occuredRoeland Jago Douma2017-11-292-0/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #7316 from ↵Roeland Jago Douma2017-11-291-3/+3
|\ \ | | | | | | | | | | | | nextcloud/fix-silent-conflicts-due-to-merging-7256-after-7251 Fix silent conflicts due to merging #7256 after #7251
| * | Fix silent conflicts due to merging #7256 after #7251Daniel Calviño Sánchez2017-11-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Although #7256 was merged cleanly some of the changes really conflicted with those introduced by the last commit of #7251, and this broke the appearance of the author row of comments. This commit fixes those silent conflicts and restores the appearance of the author row. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #7333 from nextcloud/mario-readme-patchRoeland Jago Douma2017-11-291-1/+1
|\ \ \ | |_|/ |/| | Update README.md
| * | Update README.mdMario Đanić2017-11-291-1/+1
|/ / | | | | authentification is not a real word :)
* | [tx-robot] updated from transifexNextcloud bot2017-11-2924-0/+186
| |
* | Merge pull request #7327 from ↵blizzz2017-11-282-3/+120
|\ \ | | | | | | | | | | | | nextcloud/bugfix/7325/access-list-regression-for-not-current-accesss Only in case of $currentAccess the array uses the user id as index
| * | Only in case of $currentAccess the array uses the id as indexJoas Schilling2017-11-281-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise its a normal string[] with the user ids, in that case the array_merge did it's job just fine, apart from it not being deduplicated. The array+array is only needed when the user id is the key, so integer only user ids are kept as they are instead of being reindexed. Regression from 3820d6883dffcaa49deb1054ae0f32ab3d3e39b1 Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix current access list test and add one for $currentAccess === falseJoas Schilling2017-11-281-2/+113
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / [tx-robot] updated from transifexNextcloud bot2017-11-28314-1958/+1066
|/
* 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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 03:43:55 +0000