Commit graph

46817 commits

Author SHA1 Message Date
John Molakvoæ (skjnldsv)
a8dafc2ff8
Remove conflicting multiselect
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-15 14:08:13 +01:00
Morris Jobke
c993b6e261
Merge pull request #12448 from nextcloud/bugfix/noid/dav-loadapps
Load apps that have a dav type set before the dav server plugins
2018-11-14 21:42:47 +01:00
Morris Jobke
299c280fb9
Merge pull request #12457 from nextcloud/fix/noid/fix-phpdoc
Update PHPDoc to fix typos
2018-11-14 21:37:26 +01:00
Morris Jobke
c126c3f56a
Update PHPDoc to fix typos
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-14 21:21:41 +01:00
Morris Jobke
08bd8373f6
Merge pull request #12417 from nextcloud/bugfix/noid/app-files_external-replace-insertIfNotExist
Fix UniqueConstraintViolationException while insert into files_external config tables
2018-11-14 21:05:32 +01:00
Morris Jobke
c965d2921d
Merge pull request #12456 from nextcloud/move_to_github_bot
Sign-off check is now handled by a github app
2018-11-14 21:04:44 +01:00
Morris Jobke
cbf90bf201
Merge pull request #12454 from nextcloud/list-shrink-fix
Fix breakpoint and shrinking of the content + list
2018-11-14 20:58:24 +01:00
Roeland Jago Douma
abe4af7903
Sign-off check is now handled by a github app
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-14 19:47:06 +01:00
Roeland Jago Douma
1783fa7176
Merge pull request #12455 from nextcloud/twofactor-backup-settings
Don't register twofactor_backup settings as "regular" settings
2018-11-14 19:35:13 +01:00
Roeland Jago Douma
c414bd1c07
Merge pull request #12450 from nextcloud/fix/11868/decryption_hardening
Throw exception if decryption fails
2018-11-14 19:34:26 +01:00
John Molakvoæ (skjnldsv)
f8bed7d585
Allow apps to use the variables too
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-14 18:34:26 +01:00
Robin Appelman
7ac15d4bab
twofactor auth settings are not regular settings
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-11-14 18:05:13 +01:00
Robin Appelman
2482e8ee34
Log invalid settings class
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-11-14 18:04:52 +01:00
John Molakvoæ (skjnldsv)
2b7832d0c9
Fix breakpoint and shrinking of the content + list
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-14 17:19:35 +01:00
Morris Jobke
6bace99aa1
Fix UniqueConstraintViolationException while insert into files_external config tables
* followup to #12371

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-14 15:24:03 +01:00
Roeland Jago Douma
be5c050acc
Throw exception if decryption fails
For #11868

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-14 12:47:35 +01:00
Julius Härtl
5a5d46b1b8
Load apps that have a dav type set before the dav server plugins
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-14 11:01:42 +01:00
Nextcloud bot
fef51895c2
[tx-robot] updated from transifex 2018-11-14 01:12:12 +00:00
Morris Jobke
79681ef3d9
Merge pull request #12398 from nextcloud/fix/12378
change "Download" to "Download all files" for shared folders
2018-11-13 17:21:09 +01:00
Morris Jobke
3c5e43898e
Merge pull request #12275 from nextcloud/bugfix/11975/oracle_calendar_subscriptions_source
Fix Calendarsubscriptions source column change on Oracle
2018-11-13 16:34:32 +01:00
Georg Ehrke
071301bfb9
Fix Calendarsubscriptions source column change on Oracle
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-11-13 16:32:47 +01:00
Morris Jobke
e36924e3f9
Merge pull request #12439 from nextcloud/vcard_uid_repair_postgres
Fix SetVcardDatabaseUID when using postgresql
2018-11-13 16:22:10 +01:00
Robin Appelman
e1a49a223b
Fix SetVcardDatabaseUID when using postgresql
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-11-13 14:26:33 +01:00
Nextcloud bot
5e84824839
[tx-robot] updated from transifex 2018-11-13 01:12:40 +00:00
Morris Jobke
795cc8345d
Merge pull request #12359 from nextcloud/ie11-width-fix
Fix IE rule for min width
2018-11-12 23:45:17 +01:00
Morris Jobke
0c9e411f76
Merge pull request #12418 from nextcloud/bugfix/noid/do-not-show-integrity-warning-always
Remove outdated integrity warning on each page
2018-11-12 22:44:55 +01:00
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