summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-11-13256-288/+336
|
* Merge pull request #12359 from nextcloud/ie11-width-fixMorris Jobke2018-11-121-1/+1
|\ | | | | Fix IE rule for min width
| * Fix IE rule for min widthJohn Molakvoæ (skjnldsv)2018-11-081-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #12418 from ↵Morris Jobke2018-11-122-45/+0
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/do-not-show-integrity-warning-always Remove outdated integrity warning on each page
| * | Remove outdated integrity warning on each pageMorris Jobke2018-11-122-45/+0
| | | | | | | | | | | | | | | | | | | | | * integrity warning is shown during update and in the admin setup checks * there is also the plan to retire this old way of notification Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #12419 from ↵Morris Jobke2018-11-121-4/+10
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/group-creation-replace-insertIfNotExist Fix UniqueConstraintViolationException while insert into oc_groups
| * | | Fix UniqueConstraintViolationException while insert into oc_groupsMorris Jobke2018-11-121-4/+10
| |/ / | | | | | | | | | | | | | | | | | | * fixes race condition in insert * fixes potentiaol deadlock Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #12420 from nextcloud/bugfix/noid/icons-cacher-not-foundMorris Jobke2018-11-121-2/+2
|\ \ \ | | | | | | | | Ignore icons if the file could not be found
| * | | Do not fail if the icon file doesn't existsJulius Härtl2018-11-121-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #11942 from nextcloud/techdebt/noid/use-count-functionMorris Jobke2018-11-1220-33/+32
|\ \ \ \ | |/ / / |/| | | Use the defined func()->count() instead of manual counting
| * | | Use the defined func()->count() instead of manual countingJoas Schilling2018-11-0820-33/+32
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #12413 from ↵Morris Jobke2018-11-121-1/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/9305/oc_file_locks-unique-constraint Fix UniqueConstraintViolationException while insert into oc_file_locks
| * | | | Fix UniqueConstraintViolationException while insert into oc_file_locksMorris Jobke2018-11-121-1/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #9305 by not being prone to the race condition in insertIfNotExists * fixes #6899 by not using a query that can result in a deadlock * replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block * followup to #12371 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #12411 from ↵Morris Jobke2018-11-121-7/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/6160/oc_filecache-unique-constraint Fix UniqueConstraintViolationException while insert into oc_filecache
| * | | | Fix UniqueConstraintViolationException while insert into oc_filecacheMorris Jobke2018-11-121-7/+18
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes #6160 by not being prone to the race condition in insertIfNotExists * fixes #12228 by not using a query that can result in a deadlock * replaces the insertIfNotExists call with an insert which is wrapped into a try-catch block Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #12409 from nextcloud/admin-vue-approval-fixMorris Jobke2018-11-1214-73/+40
|\ \ \ \ | |/ / / |/| | | Use nextcloud-password-confirmation
| * | | fixup! Use nextcloud-password-confirmationJohn Molakvoæ (skjnldsv)2018-11-1212-43/+34
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | fixup! Use nextcloud-password-confirmationJohn Molakvoæ (skjnldsv)2018-11-121-4/+2
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Use nextcloud-password-confirmationJohn Molakvoæ (skjnldsv)2018-11-123-31/+9
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #12371 from ↵Morris Jobke2018-11-125-8/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/12369/catch-unique-constraint-violation-exception-in-insertIfNotExist Catch UniqueConstraintViolationException inside insertIfNotExist
| * | | | Exception is not thrown anymoreMorris Jobke2018-11-121-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Add deprecation message ofr insertIfNotExistMorris Jobke2018-11-094-0/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Catch UniqueConstraintViolationException inside insertIfNotExistMorris Jobke2018-11-094-6/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the most common case for the usage of this method. See also https://github.com/nextcloud/server/issues/12369 and the linked tickets. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #12408 from nextcloud/bugfix/noid/icon-cacher-updateMorris Jobke2018-11-122-4/+21
|\ \ \ \ \ | | | | | | | | | | | | Make sure to always load the latest icons-vars.css file
| * | | | | Make sure to always load the latest icons-vars.css fileJulius Härtl2018-11-122-4/+21
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #12384 from nextcloud/fix/12357/public-share-scrollbarMorris Jobke2018-11-121-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Reduces the footer link padding
| * | | | Fixes the footer #12357Michael Weimann2018-11-091-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | | | | Merge pull request #12389 from nextcloud/fix-dav-groupidJohn Molakvoæ2018-11-122-48/+17
|\ \ \ \ \ | | | | | | | | | | | | Fix displayName return of dav groups request
| * | | | | Fix displayName return of dav groups requestJohn Molakvoæ (skjnldsv)2018-11-102-48/+17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-11-1214-2/+46
| | | | | |
* | | | | | Merge pull request #12388 from nextcloud/inline-input-confirm-margin-fixMorris Jobke2018-11-111-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix inline input confirm margin
| * | | | | | Fix inline input confirm marginJohn Molakvoæ (skjnldsv)2018-11-101-0/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #12385 from nextcloud/fix/12356/grid-toggle-fixMorris Jobke2018-11-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixes the grid toggle for none folder shares
| * | | | | | Fixes the grid toggle for none folder sharesMichael Weimann2018-11-091-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-11-1110-4/+28
| |/ / / / |/| | | |
* | | | | [tx-robot] updated from transifexNextcloud bot2018-11-10122-444/+506
|/ / / /
* | | | Merge pull request #12358 from nextcloud/bugfix/noid/wrong-update-check-versionMorris Jobke2018-11-099-24/+36
|\ \ \ \ | |/ / / |/| | | Check for compatible apps from the appstore fails
| * | | Adjust unit testsJoas Schilling2018-11-092-7/+11
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Improve style of incompatible apps listMorris Jobke2018-11-081-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Use the version number when checking the appstore for compatible updatesJoas Schilling2018-11-086-12/+13
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix overlapping update button in notificationsMorris Jobke2018-11-083-6/+9
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2018-11-09144-330/+400
| | |
* | | Merge pull request #12349 from ↵Morris Jobke2018-11-082-49/+157
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/noid/populate-notification-message-with-the-comment Populate the mention-notification with the actual message
| * | | Populate the mention-notification with the actual messageJoas Schilling2018-11-082-49/+157
| |/ / | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #12352 from ↵Morris Jobke2018-11-081-1/+4
|\ \ \ | |_|/ |/| | | | | | | | nextcloud/adjust-acceptance-tests-to-changes-in-public-share-page-menu Adjust acceptance tests to changes in public share page menu
| * | Adjust acceptance tests to changes in public share page menuDaniel Calviño Sánchez2018-11-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | The "Download" item in the menu of public share pages is no longer shown in wide (>768px) windows (although the element is in the DOM and shown if resized to a narrow window). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #12335 from nextcloud/fix/12319/respect-fixed-usernamesblizzz2018-11-089-15/+70
|\ \ \ | |/ / |/| | do not offer to change display name or password, if not possible.
| * | do not offer to change display name or password, if not possible.Arthur Schiwon2018-11-079-15/+70
| | | | | | | | | | | | | | | | | | Fixes #12319 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #12310 from nextcloud/version/noid/15.0.0beta1v15.0.0beta1Morris Jobke2018-11-081-2/+2
|\ \ \ | |_|/ |/| | 15.0.0 beta 1
| * | 15.0.0 beta 1Morris Jobke2018-11-081-2/+2
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>