summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #12448 from nextcloud/bugfix/noid/dav-loadappsMorris Jobke2018-11-142-3/+2
|\ | | | | Load apps that have a dav type set before the dav server plugins
| * Load apps that have a dav type set before the dav server pluginsJulius Härtl2018-11-142-3/+2
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #12457 from nextcloud/fix/noid/fix-phpdocMorris Jobke2018-11-141-2/+3
|\ \ | | | | | | Update PHPDoc to fix typos
| * | Update PHPDoc to fix typosMorris Jobke2018-11-141-2/+3
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #12417 from ↵Morris Jobke2018-11-141-18/+28
|\ \ | | | | | | | | | | | | nextcloud/bugfix/noid/app-files_external-replace-insertIfNotExist Fix UniqueConstraintViolationException while insert into files_external config tables
| * | Fix UniqueConstraintViolationException while insert into files_external ↵Morris Jobke2018-11-141-18/+28
| | | | | | | | | | | | | | | | | | | | | | | | config tables * followup to #12371 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #12456 from nextcloud/move_to_github_botMorris Jobke2018-11-141-3/+0
|\ \ \ | | | | | | | | Sign-off check is now handled by a github app
| * | | Sign-off check is now handled by a github appRoeland Jago Douma2018-11-141-3/+0
| | |/ | |/| | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #12454 from nextcloud/list-shrink-fixMorris Jobke2018-11-147-9/+23
|\ \ \ | | | | | | | | Fix breakpoint and shrinking of the content + list
| * | | Allow apps to use the variables tooJohn Molakvoæ (skjnldsv)2018-11-142-5/+6
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Fix breakpoint and shrinking of the content + listJohn Molakvoæ (skjnldsv)2018-11-147-9/+22
| |/ / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #12455 from nextcloud/twofactor-backup-settingsRoeland Jago Douma2018-11-142-5/+1
|\ \ \ | | | | | | | | Don't register twofactor_backup settings as "regular" settings
| * | | twofactor auth settings are not regular settingsRobin Appelman2018-11-141-4/+0
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | Log invalid settings classRobin Appelman2018-11-141-1/+1
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #12450 from nextcloud/fix/11868/decryption_hardeningRoeland Jago Douma2018-11-142-4/+11
|\ \ \ | |/ / |/| | Throw exception if decryption fails
| * | Throw exception if decryption failsRoeland Jago Douma2018-11-142-4/+11
|/ / | | | | | | | | | | For #11868 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-11-1418-6/+614
| |
* | Merge pull request #12398 from nextcloud/fix/12378Morris Jobke2018-11-131-6/+15
|\ \ | | | | | | change "Download" to "Download all files" for shared folders
| * | change "Download" to "Download all files" for shared foldersJonas Sulzer2018-11-101-6/+15
| | | | | | | | | | | | | | | | | | fixes #12378 Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
* | | Merge pull request #12275 from ↵Morris Jobke2018-11-138-12/+221
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/11975/oracle_calendar_subscriptions_source Fix Calendarsubscriptions source column change on Oracle
| * | | Fix Calendarsubscriptions source column change on OracleGeorg Ehrke2018-11-138-12/+221
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #12439 from nextcloud/vcard_uid_repair_postgresMorris Jobke2018-11-131-1/+5
|\ \ \ \ | | | | | | | | | | Fix SetVcardDatabaseUID when using postgresql
| * | | | Fix SetVcardDatabaseUID when using postgresqlRobin Appelman2018-11-131-1/+5
|/ / / / | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | [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>
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 13:35:44 +0000