summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Fix sharebymail testsRoeland Jago Douma2020-07-063-99/+13
* | | | | | Merge pull request #20729 from nextcloud/cleanup/noid/shared-tags-codeMorris Jobke2020-07-065-454/+9
|\ \ \ \ \ \
| * | | | | | Cascading effect - more code that now is not used anymoreMorris Jobke2020-07-061-338/+0
| * | | | | | Tags.php and the old sharing mechanismMorris Jobke2020-07-065-116/+9
| |/ / / / /
* | | | | | Merge pull request #21706 from nextcloud/bugfix/21698/add-a-clear-abuse-messageRoeland Jago Douma2020-07-062-0/+8
|\ \ \ \ \ \
| * | | | | | Add a clear message why you could end up thereJoas Schilling2020-07-062-0/+8
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #21713 from nextcloud/td/deprecate/register_rotuesRoeland Jago Douma2020-07-061-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Deprecate registerRoutesRoeland Jago Douma2020-07-061-0/+1
|/ / / / /
* | | | | Merge pull request #21704 from nextcloud/fix/18895/fix-unit-testsMorris Jobke2020-07-061-1/+1
|\ \ \ \ \
| * | | | | Fix unit tests from #18895Morris Jobke2020-07-061-1/+1
* | | | | | Merge pull request #21074 from jvsalo/shared-lock-multi-releaseMorris Jobke2020-07-062-1/+19
|\ \ \ \ \ \
| * | | | | | In LockPlugin, only release a lock if it was acquiredJaakko Salo2020-05-241-0/+14
| * | | | | | Fix releasing a shared lock multiple timesJaakko Salo2020-05-241-1/+5
* | | | | | | Merge pull request #21171 from nextcloud/enh/noid/tidy-up-group-ldapMorris Jobke2020-07-064-235/+198
|\ \ \ \ \ \ \
| * | | | | | | tidy up Group_LDAPArthur Schiwon2020-06-084-235/+198
* | | | | | | | Merge pull request #21222 from nextcloud/bugfix/18965/reduce-contacts-search-...Morris Jobke2020-07-062-7/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Reduce load of the contacts search when we know it can't matchJoas Schilling2020-06-152-7/+25
* | | | | | | | | Merge pull request #21238 from nextcloud/techdebt/noid/deferrable-notificatio...Morris Jobke2020-07-065-0/+111
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Allow notification apps to defer and flush the sendingJoas Schilling2020-07-035-0/+111
* | | | | | | | | Merge pull request #18895 from nextcloud/bugfix/noid/fix_birthday_calendar_colorMorris Jobke2020-07-061-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Changes the Birthday calendar color to slightly brighter oneGeorg Ehrke2020-01-141-1/+1
* | | | | | | | | Merge pull request #21665 from nextcloud/debt/noid/job-listMorris Jobke2020-07-063-23/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use formal type hints instead of informal PHPDocMorris Jobke2020-07-062-21/+9
| * | | | | | | | | Fix wrong phpdoc for execute methodDaniel Kesselberg2020-07-033-3/+5
* | | | | | | | | | Merge pull request #21692 from nextcloud/cleanup/sharebymailRoeland Jago Douma2020-07-0610-111/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Cleanup share by mail a bitRoeland Jago Douma2020-07-0610-111/+43
* | | | | | | | | | | Merge pull request #21581 from nextcloud/3rdparty/symfony/4.4.10Roeland Jago Douma2020-07-061-0/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Bump symfony deps to 4.4.10Roeland Jago Douma2020-07-061-0/+0
| |/ / / / / / / / / /
* | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2020-07-062-4/+32
* | | | | | | | | | | Merge pull request #21264 from stweil/masterMorris Jobke2020-07-055-51/+51
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | build: Fix two typos in function namesStefan Weil2020-06-061-2/+2
| * | | | | | | | | | | build: Fix some typos (most of them found by codespell)Stefan Weil2020-06-065-49/+49
* | | | | | | | | | | | Merge pull request #21636 from nextcloud/lock-exception-readable-pathMorris Jobke2020-07-056-10/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | add proper paths to locking exceptionsRobin Appelman2020-06-306-10/+17
* | | | | | | | | | | | | Merge pull request #21626 from nextcloud/enhancement/injectible-callablesMorris Jobke2020-07-0510-45/+206
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Use \OCP\IContainer::injectFn to boot the admin_audit appChristoph Wurst2020-07-031-4/+4
| * | | | | | | | | | | | Use \OCP\IContainer::injectFn to boot the Accessibility appChristoph Wurst2020-07-031-12/+5
| * | | | | | | | | | | | Use \OCP\IContainer::injectFn to boot the DAV appChristoph Wurst2020-07-031-26/+10
| * | | | | | | | | | | | Callable parameter injectionChristoph Wurst2020-07-037-3/+187
* | | | | | | | | | | | | Merge pull request #21686 from nextcloud/dependabot/npm_and_yarn/babel/core-7...Roeland Jago Douma2020-07-042-237/+237
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bump @babel/core from 7.10.3 to 7.10.4dependabot-preview[bot]2020-07-042-237/+237
* | | | | | | | | | | | | | Merge pull request #21533 from nextcloud/techdebt/noid/dedicated-method-to-ge...Roeland Jago Douma2020-07-0414-200/+138
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Use the new method everywhereJoas Schilling2020-07-0312-200/+106
| * | | | | | | | | | | | | Add a dedicated method to get the language for another userJoas Schilling2020-07-012-0/+32
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #21685 from nextcloud/dependabot/npm_and_yarn/babel/preset...Roeland Jago Douma2020-07-042-1000/+1863
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bump @babel/preset-env from 7.10.3 to 7.10.4dependabot-preview[bot]2020-07-042-1000/+1863
| | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #21682 from nextcloud/dependabot/npm_and_yarn/eslint-plugi...Roeland Jago Douma2020-07-042-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Bump eslint-plugin-import from 2.21.2 to 2.22.0dependabot-preview[bot]2020-07-042-7/+7
| |/ / / / / / / / / / / /
* / / / / / / / / / / / / [tx-robot] updated from transifexNextcloud bot2020-07-0420-18/+152
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #21280 from nextcloud/dependabot/npm_and_yarn/nextcloud/ro...Morris Jobke2020-07-0366-384/+377
|\ \ \ \ \ \ \ \ \ \ \ \