summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9268 from nextcloud/bugfix/6711Morris Jobke2018-05-2814-31/+242
|\
| * Move repairstep to a custom commandRoeland Jago Douma2018-05-286-39/+24
| * Fix testsRoeland Jago Douma2018-05-272-2/+16
| * Adding repair step which cleans shares of invalid principalsRoeland Jago Douma2018-05-275-1/+174
| * CalDAV and CardDAV plugins need to be registered for the principals collectio...Roeland Jago Douma2018-05-272-15/+29
| * When sharing calendars and addressbooks the principal has to be verified to b...Roeland Jago Douma2018-05-274-5/+18
| * Do not load calendar/addressbook plugins if not neededRoeland Jago Douma2018-05-271-16/+28
* | Merge pull request #9584 from nextcloud/file-cache-gc-isdirMorris Jobke2018-05-281-1/+1
|\ \
| * | remove unneeded is_dir from file cache gcRobin Appelman2018-05-241-1/+1
* | | Merge pull request #9627 from nextcloud/limit-sinon-version-to-5.0.7-at-mostMorris Jobke2018-05-281-1/+1
|\ \ \
| * | | Limit Sinon version to 5.0.7 at mostDaniel Calviño Sánchez2018-05-281-1/+1
|/ / /
* | / [tx-robot] updated from transifexNextcloud bot2018-05-2826-0/+74
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2018-05-27114-188/+252
* | Merge pull request #9585 from nextcloud/feature/noid/rename-syncclientsMorris Jobke2018-05-262-5/+5
|\ \
| * | Fix Settings\ManagerTestJulius Härtl2018-05-251-2/+2
| * | Rename sync clients section to mobile & desktopJulius Härtl2018-05-242-3/+3
| |/
* | [tx-robot] updated from transifexNextcloud bot2018-05-2670-98/+214
* | Merge pull request #9488 from nextcloud/disabled-users-fixblizzz2018-05-2525-105/+370
|\ \
| * | Do not show count on empty groupsJohn Molakvoæ (skjnldsv)2018-05-253-8/+21
| * | Tabs fixJohn Molakvoæ (skjnldsv)2018-05-251-1/+1
| * | Fixed app navigation orderJohn Molakvoæ (skjnldsv)2018-05-244-3/+5
| * | Fixed error throw and disablign count group updateJohn Molakvoæ (skjnldsv)2018-05-245-20/+41
| * | Fix the navigation componentJohn Molakvoæ (skjnldsv)2018-05-244-10/+25
| * | Added total count for subadminsJohn Molakvoæ (skjnldsv)2018-05-247-14/+39
| * | Disabled fix since new users listJohn Molakvoæ (skjnldsv)2018-05-2414-61/+86
| * | Fixes since requirementJohn Molakvoæ (skjnldsv)2018-05-241-0/+1
| * | Fixed testsJohn Molakvoæ (skjnldsv)2018-05-242-2/+25
| * | Added disabled count per groupsJohn Molakvoæ (skjnldsv)2018-05-248-11/+151
* | | Merge pull request #9593 from nextcloud/fwdport/9586/masterMorris Jobke2018-05-259-23/+166
|\ \ \
| * | | addjust footer height when legal links are present. fixes #9572Arthur Schiwon2018-05-243-3/+16
| * | | also add a privacy linkArthur Schiwon2018-05-248-21/+151
* | | | [tx-robot] updated from transifexNextcloud bot2018-05-25236-408/+582
|/ / /
* | | Merge pull request #9576 from nextcloud/feature/noid/missing_index_eventRoeland Jago Douma2018-05-243-8/+19
|\ \ \ | |/ / |/| |
| * | Emit event when running ./occ db:add-missing-indicesRoeland Jago Douma2018-05-243-8/+19
| |/
* | Merge pull request #9582 from nextcloud/feature/2593/password-confirm-textsMorris Jobke2018-05-244-17/+56
|\ \ | |/ |/|
| * Add custom texts to apps management password checksJulius Härtl2018-05-241-3/+12
| * Add placeholder to input in OCdialog promptJulius Härtl2018-05-241-1/+1
| * Allow to specify custom text on admin password confirmation dialogsJulius Härtl2018-05-242-13/+43
|/
* Merge pull request #9574 from nextcloud/search-categoryMorris Jobke2018-05-241-0/+5
|\
| * Add search category iconJohn Molakvoæ (skjnldsv)2018-05-241-0/+5
|/
* [tx-robot] updated from transifexNextcloud bot2018-05-24140-110/+502
* Merge pull request #9435 from nextcloud/bugfix/noid/fix_force_language_html_attrRoeland Jago Douma2018-05-232-7/+48
|\
| * Always set the request language to the force languageRoeland Jago Douma2018-05-231-6/+5
| * make sure force language is reflected in html lang attributeGeorg Ehrke2018-05-222-7/+49
* | Merge pull request #9395 from nextcloud/scanner-error-lock-cleanupMorris Jobke2018-05-231-9/+12
|\ \
| * | cleanup locks in scanner on errorRobin Appelman2018-05-041-9/+12
* | | Merge pull request #9564 from nextcloud/techdebt/noid/new-sharingMorris Jobke2018-05-233-44/+45
|\ \ \
| * | | Fix ViewTestRoeland Jago Douma2018-05-231-1/+11
| * | | Fix ExpiresSharesJobTestRoeland Jago Douma2018-05-231-16/+21
| * | | Use node apiRoeland Jago Douma2018-05-231-27/+13