summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | 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
* | | | | | | Merge pull request #12389 from nextcloud/fix-dav-groupidJohn Molakvoæ2018-11-122-48/+17
|\ \ \ \ \ \ \
| * | | | | | | Fix displayName return of dav groups requestJohn Molakvoæ (skjnldsv)2018-11-102-48/+17
| | |_|_|_|/ / | |/| | | | |
* | | | | | | [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 marginJohn Molakvoæ (skjnldsv)2018-11-101-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #12385 from nextcloud/fix/12356/grid-toggle-fixMorris Jobke2018-11-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fixes the grid toggle for none folder sharesMichael Weimann2018-11-091-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | [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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Adjust unit testsJoas Schilling2018-11-092-7/+11
| * | | | Improve style of incompatible apps listMorris Jobke2018-11-081-0/+4
| * | | | Use the version number when checking the appstore for compatible updatesJoas Schilling2018-11-086-12/+13
| * | | | Fix overlapping update button in notificationsMorris Jobke2018-11-083-6/+9
| |/ / /
* | | | [tx-robot] updated from transifexNextcloud bot2018-11-09144-330/+400
* | | | Merge pull request #12349 from nextcloud/feature/noid/populate-notification-m...Morris Jobke2018-11-082-49/+157
|\ \ \ \
| * | | | Populate the mention-notification with the actual messageJoas Schilling2018-11-082-49/+157
| |/ / /
* | | | Merge pull request #12352 from nextcloud/adjust-acceptance-tests-to-changes-i...Morris Jobke2018-11-081-1/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Adjust acceptance tests to changes in public share page menuDaniel Calviño Sánchez2018-11-081-1/+4
* | | | 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.Arthur Schiwon2018-11-079-15/+70
* | | | Merge pull request #12310 from nextcloud/version/noid/15.0.0beta1v15.0.0beta1Morris Jobke2018-11-081-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | 15.0.0 beta 1Morris Jobke2018-11-081-2/+2
|/ / /
* | | Merge pull request #12348 from nextcloud/fix/basic_csp_no_longer_deprecatedMorris Jobke2018-11-081-1/+0
|\ \ \
| * | | Basic CSP no longer deprecatedRoeland Jago Douma2018-11-081-1/+0
* | | | Merge pull request #10059 from nextcloud/feature/1497/cache_webcal_calendarsMorris Jobke2018-11-0821-116/+2379
|\ \ \ \
| * | | | update 3rdparty to fix phan error messageGeorg Ehrke2018-11-071-0/+0
| * | | | cache webcal calendars on serverGeorg Ehrke2018-11-0720-116/+2379
* | | | | Merge pull request #12313 from nextcloud/generated-avatar-major-cleanupRoeland Jago Douma2018-11-0811-25/+206
|\ \ \ \ \ | |_|/ / / |/| | | |