summaryrefslogtreecommitdiffstats
Commit message (Expand)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 pluginsJulius Härtl2018-11-142-3/+2
* | Merge pull request #12457 from nextcloud/fix/noid/fix-phpdocMorris Jobke2018-11-141-2/+3
|\ \
| * | Update PHPDoc to fix typosMorris Jobke2018-11-141-2/+3
|/ /
* | Merge pull request #12417 from nextcloud/bugfix/noid/app-files_external-repla...Morris Jobke2018-11-141-18/+28
|\ \
| * | Fix UniqueConstraintViolationException while insert into files_external confi...Morris Jobke2018-11-141-18/+28
* | | Merge pull request #12456 from nextcloud/move_to_github_botMorris Jobke2018-11-141-3/+0
|\ \ \
| * | | Sign-off check is now handled by a github appRoeland Jago Douma2018-11-141-3/+0
| | |/ | |/|
* | | Merge pull request #12454 from nextcloud/list-shrink-fixMorris Jobke2018-11-147-9/+23
|\ \ \
| * | | Allow apps to use the variables tooJohn Molakvoæ (skjnldsv)2018-11-142-5/+6
| * | | Fix breakpoint and shrinking of the content + listJohn Molakvoæ (skjnldsv)2018-11-147-9/+22
| |/ /
* | | Merge pull request #12455 from nextcloud/twofactor-backup-settingsRoeland Jago Douma2018-11-142-5/+1
|\ \ \
| * | | twofactor auth settings are not regular settingsRobin Appelman2018-11-141-4/+0
| * | | Log invalid settings classRobin Appelman2018-11-141-1/+1
| |/ /
* | | Merge pull request #12450 from nextcloud/fix/11868/decryption_hardeningRoeland Jago Douma2018-11-142-4/+11
|\ \ \ | |/ / |/| |
| * | Throw exception if decryption failsRoeland Jago Douma2018-11-142-4/+11
|/ /
* | [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 foldersJonas Sulzer2018-11-101-6/+15
* | | Merge pull request #12275 from nextcloud/bugfix/11975/oracle_calendar_subscri...Morris Jobke2018-11-138-12/+221
|\ \ \
| * | | Fix Calendarsubscriptions source column change on OracleGeorg Ehrke2018-11-138-12/+221
* | | | Merge pull request #12439 from nextcloud/vcard_uid_repair_postgresMorris Jobke2018-11-131-1/+5
|\ \ \ \
| * | | | Fix SetVcardDatabaseUID when using postgresqlRobin Appelman2018-11-131-1/+5
|/ / / /
* | | | [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 widthJohn Molakvoæ (skjnldsv)2018-11-081-1/+1
* | | | | Merge pull request #12418 from nextcloud/bugfix/noid/do-not-show-integrity-wa...Morris Jobke2018-11-122-45/+0
|\ \ \ \ \
| * | | | | Remove outdated integrity warning on each pageMorris Jobke2018-11-122-45/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #12419 from nextcloud/bugfix/noid/group-creation-replace-i...Morris Jobke2018-11-121-4/+10
|\ \ \ \ \
| * | | | | Fix UniqueConstraintViolationException while insert into oc_groupsMorris Jobke2018-11-121-4/+10
| |/ / / /
* | | | | Merge pull request #12420 from nextcloud/bugfix/noid/icons-cacher-not-foundMorris Jobke2018-11-121-2/+2
|\ \ \ \ \
| * | | | | Do not fail if the icon file doesn't existsJulius Härtl2018-11-121-2/+2
* | | | | | Merge pull request #11942 from nextcloud/techdebt/noid/use-count-functionMorris Jobke2018-11-1220-33/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use the defined func()->count() instead of manual countingJoas Schilling2018-11-0820-33/+32
* | | | | | Merge pull request #12413 from nextcloud/bugfix/9305/oc_file_locks-unique-con...Morris Jobke2018-11-121-1/+12
|\ \ \ \ \ \
| * | | | | | Fix UniqueConstraintViolationException while insert into oc_file_locksMorris Jobke2018-11-121-1/+12
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #12411 from nextcloud/bugfix/6160/oc_filecache-unique-cons...Morris Jobke2018-11-121-7/+18
|\ \ \ \ \ \
| * | | | | | Fix UniqueConstraintViolationException while insert into oc_filecacheMorris Jobke2018-11-121-7/+18
| |/ / / / /
* | | | | | Merge pull request #12409 from nextcloud/admin-vue-approval-fixMorris Jobke2018-11-1214-73/+40
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fixup! Use nextcloud-password-confirmationJohn Molakvoæ (skjnldsv)2018-11-1212-43/+34
| * | | | | fixup! Use nextcloud-password-confirmationJohn Molakvoæ (skjnldsv)2018-11-121-4/+2
| * | | | | Use nextcloud-password-confirmationJohn Molakvoæ (skjnldsv)2018-11-123-31/+9
* | | | | | Merge pull request #12371 from nextcloud/bugfix/12369/catch-unique-constraint...Morris Jobke2018-11-125-8/+39
|\ \ \ \ \ \
| * | | | | | Exception is not thrown anymoreMorris Jobke2018-11-121-2/+1
| * | | | | | Add deprecation message ofr insertIfNotExistMorris Jobke2018-11-094-0/+4
| * | | | | | Catch UniqueConstraintViolationException inside insertIfNotExistMorris Jobke2018-11-094-6/+34
* | | | | | | 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 fileJulius Härtl2018-11-122-4/+21
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #12384 from nextcloud/fix/12357/public-share-scrollbarMorris Jobke2018-11-121-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixes the footer #12357Michael Weimann2018-11-091-2/+2