Commit Graph

46893 Commits

Author SHA1 Message Date
Morris Jobke 3996210307
Merge pull request #12419 from nextcloud/bugfix/noid/group-creation-replace-insertIfNotExist
Fix UniqueConstraintViolationException while insert into oc_groups
2018-11-12 21:14:38 +01:00
Morris Jobke f6fed4d54b
Merge pull request #12420 from nextcloud/bugfix/noid/icons-cacher-not-found
Ignore icons if the file could not be found
2018-11-12 21:13:19 +01:00
Morris Jobke fd8eeccb15
Merge pull request #11942 from nextcloud/techdebt/noid/use-count-function
Use the defined func()->count() instead of manual counting
2018-11-12 17:43:56 +01:00
Morris Jobke 84fd81e33f
Fix UniqueConstraintViolationException while insert into oc_groups
* fixes race condition in insert
* fixes potentiaol deadlock

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-12 17:36:35 +01:00
Julius Härtl 4acd053e4d
Do not fail if the icon file doesn't exists
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-12 17:31:54 +01:00
Morris Jobke 9e1ec0cf46
Merge pull request #12413 from nextcloud/bugfix/9305/oc_file_locks-unique-constraint
Fix UniqueConstraintViolationException while insert into oc_file_locks
2018-11-12 17:27:09 +01:00
Morris Jobke 761ba1801b
Remove outdated integrity warning on each page
* 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>
2018-11-12 16:54:38 +01:00
Morris Jobke dcf6861784
Merge pull request #12411 from nextcloud/bugfix/6160/oc_filecache-unique-constraint
Fix UniqueConstraintViolationException while insert into oc_filecache
2018-11-12 16:52:48 +01:00
Morris Jobke f7e3cf2085
Fix UniqueConstraintViolationException while insert into oc_file_locks
* 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>
2018-11-12 15:13:10 +01:00
Morris Jobke 237c70d3cd
Merge pull request #12409 from nextcloud/admin-vue-approval-fix
Use nextcloud-password-confirmation
2018-11-12 14:48:06 +01:00
Morris Jobke 93c62d78db
Fix UniqueConstraintViolationException while insert into oc_filecache
* 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>
2018-11-12 14:43:28 +01:00
Morris Jobke 859dd1e742
Merge pull request #12371 from nextcloud/bugfix/12369/catch-unique-constraint-violation-exception-in-insertIfNotExist
Catch UniqueConstraintViolationException inside insertIfNotExist
2018-11-12 13:41:00 +01:00
John Molakvoæ (skjnldsv) 85c708c3ed
fixup! Use nextcloud-password-confirmation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-12 13:05:51 +01:00
John Molakvoæ (skjnldsv) cddc6c0207
fixup! Use nextcloud-password-confirmation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-12 12:54:17 +01:00
Morris Jobke 8e60006744
Exception is not thrown anymore
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-12 12:22:04 +01:00
Morris Jobke 0fe2a4f6cd
Merge pull request #12408 from nextcloud/bugfix/noid/icon-cacher-update
Make sure to always load the latest icons-vars.css file
2018-11-12 12:16:43 +01:00
John Molakvoæ (skjnldsv) 1cb5f316ed
Use nextcloud-password-confirmation
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-12 11:59:38 +01:00
Morris Jobke 3117e996be
Merge pull request #12384 from nextcloud/fix/12357/public-share-scrollbar
Reduces the footer link padding
2018-11-12 11:16:53 +01:00
Julius Härtl 26b160cc43
Make sure to always load the latest icons-vars.css file
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-12 11:00:56 +01:00
John Molakvoæ d6de8ebeb2
Merge pull request #12389 from nextcloud/fix-dav-groupid
Fix displayName return of dav groups request
2018-11-12 09:49:24 +01:00
Nextcloud bot 48395baa7e
[tx-robot] updated from transifex 2018-11-12 01:12:49 +00:00
Morris Jobke 63249616c3
Merge pull request #12388 from nextcloud/inline-input-confirm-margin-fix
Fix inline input confirm margin
2018-11-11 23:34:33 +01:00
Morris Jobke bbd51f4ddb
Merge pull request #12385 from nextcloud/fix/12356/grid-toggle-fix
Fixes the grid toggle for none folder shares
2018-11-11 23:30:14 +01:00
Nextcloud bot 6dc2b03ebe
[tx-robot] updated from transifex 2018-11-11 01:13:10 +00:00
Marc Peña Segarra ea10c6a141 Fix the warning appearing check setup when mail_smtpmode is not configured.
Closes #11107
2018-11-11 00:55:41 +01:00
Jonas Sulzer 1f237c7e25
change "Download" to "Download all files" for shared folders
fixes #12378

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
2018-11-10 19:10:31 +01:00
John Molakvoæ (skjnldsv) e18548ce75
Fix displayName return of dav groups request
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-10 13:34:07 +01:00
John Molakvoæ (skjnldsv) dbcea3316a
Fix inline input confirm margin
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-10 09:48:16 +01:00
Nextcloud bot cc96b93f95
[tx-robot] updated from transifex 2018-11-10 01:12:25 +00:00
Michael Weimann 04b9154c9a
Fixes the grid toggle for none folder shares
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-11-09 22:28:19 +01:00
Michael Weimann b4b96fc23f
Fixes the footer #12357
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-11-09 21:23:02 +01:00
Morris Jobke b7a59fb56a
Merge pull request #12358 from nextcloud/bugfix/noid/wrong-update-check-version
Check for compatible apps from the appstore fails
2018-11-09 16:48:12 +01:00
Morris Jobke 5273639d0e
Add deprecation message ofr insertIfNotExist
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-09 12:13:30 +01:00
Morris Jobke 230e93f575
Catch UniqueConstraintViolationException inside insertIfNotExist
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>
2018-11-09 10:38:20 +01:00
Joas Schilling eff7a9c904
Adjust unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-09 10:24:34 +01:00
Nextcloud bot da57aaf814
[tx-robot] updated from transifex 2018-11-09 01:12:25 +00:00
Morris Jobke bd7e983080
Merge pull request #12349 from nextcloud/feature/noid/populate-notification-message-with-the-comment
Populate the mention-notification with the actual message
2018-11-08 22:47:55 +01:00
Morris Jobke fe261c4866
Merge pull request #12352 from nextcloud/adjust-acceptance-tests-to-changes-in-public-share-page-menu
Adjust acceptance tests to changes in public share page menu
2018-11-08 22:44:26 +01:00
John Molakvoæ (skjnldsv) 563df2a9ea
Fix IE rule for min width
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-08 18:19:52 +01:00
Joas Schilling bb352fb667
Use the defined func()->count() instead of manual counting
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-08 15:44:45 +01:00
Morris Jobke 03b140c008
Improve style of incompatible apps list
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-08 15:28:58 +01:00
blizzz 42121fe4d7
Merge pull request #12335 from nextcloud/fix/12319/respect-fixed-usernames
do not offer to change display name or password, if not possible.
2018-11-08 15:13:24 +01:00
Joas Schilling b04a44babd
Use the version number when checking the appstore for compatible updates
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-08 14:52:28 +01:00
Morris Jobke 90a35aab29
Fix overlapping update button in notifications
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-08 14:19:46 +01:00
Daniel Calviño Sánchez b5977bef2e Adjust acceptance tests to changes in public share page menu
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>
2018-11-08 13:19:15 +01:00
Morris Jobke 13d7a2746c
Merge pull request #12310 from nextcloud/version/noid/15.0.0beta1
15.0.0 beta 1
2018-11-08 13:12:30 +01:00
Joas Schilling 1b4f1b9a63
Populate the mention-notification with the actual message
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-08 12:10:09 +01:00
Morris Jobke 8dff57deb6
15.0.0 beta 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-08 11:22:01 +01:00
Morris Jobke 78fd8ab0fd
Merge pull request #12348 from nextcloud/fix/basic_csp_no_longer_deprecated
Basic CSP no longer deprecated
2018-11-08 11:14:41 +01:00
Morris Jobke 0fb74aff5a
Merge pull request #10059 from nextcloud/feature/1497/cache_webcal_calendars
cache webcal calendars on server
2018-11-08 10:54:18 +01:00