aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7904 from nextcloud/fix_7224Morris Jobke2018-03-214-33/+38
|\
| * Add Cache-control: immutableRoeland Jago Douma2018-03-194-33/+38
* | [tx-robot] updated from transifexNextcloud bot2018-03-21136-392/+412
* | Merge pull request #8821 from nextcloud/feature/noid/show-eol-warningMorris Jobke2018-03-209-0/+26
|\ \
| * | Show EOL warning in the update sectionJoas Schilling2018-03-209-0/+26
* | | Merge pull request #8847 from nextcloud/ocs-api-userdetailsMorris Jobke2018-03-203-73/+169
|\ \ \ | |/ / |/| |
| * | fixup! Check if groups is array, return empty do not throwJohn Molakvoæ (skjnldsv)2018-03-192-37/+5
| * | Check if groups is array, return empty do not throwJohn Molakvoæ (skjnldsv)2018-03-161-2/+2
| * | Fixed tests and improved codeJohn Molakvoæ (skjnldsv)2018-03-162-61/+117
| * | Fixed throw error on unreachable usersJohn Molakvoæ (skjnldsv)2018-03-161-7/+11
| * | Add userdetails to ocs apiJohn Molakvoæ (skjnldsv)2018-03-162-3/+71
* | | Merge pull request #8861 from nextcloud/rakekniven-patch-1Joas Schilling2018-03-202-5/+5
|\ \ \
| * | | Update ThemingControllerTest.phprakekniven2018-03-191-2/+2
| * | | Update ThemingController.phprakekniven2018-03-191-1/+1
| * | | Update ThemingController.phprakekniven2018-03-161-3/+3
* | | | Merge pull request #8864 from nextcloud/ocs-allow-empty-email-displaynameRoeland Jago Douma2018-03-201-1/+1
|\ \ \ \
| * | | | Allow empty emails provisionning apiJohn Molakvoæ (skjnldsv)2018-03-171-1/+1
* | | | | Merge pull request #8887 from nextcloud/fix-appmenu-min-widthRoeland Jago Douma2018-03-201-0/+1
|\ \ \ \ \
| * | | | | Add min width of two icons to the app menuJulius Härtl2018-03-191-0/+1
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-03-2022-42/+160
* | | | | | Merge pull request #8822 from nextcloud/fix/8641/undefined-indexblizzz2018-03-191-5/+11
|\ \ \ \ \ \
| * | | | | | the FN is optional, carrying the displayname if presentArthur Schiwon2018-03-141-5/+11
* | | | | | | Merge pull request #8880 from nextcloud/delete_unused_downloadRoeland Jago Douma2018-03-192-55/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove unused download.phpRoeland Jago Douma2018-03-192-55/+0
* | | | | | | | Merge pull request #8871 from nextcloud/3rdparty-bump-openstack-3-0-5Roeland Jago Douma2018-03-191-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | [3rdparty] Bump php-opencloud/openstack to 3.0.5Roeland Jago Douma2018-03-191-0/+0
* | | | | | | | | Merge pull request #8881 from nextcloud/setUserValue_optRoeland Jago Douma2018-03-191-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Store setUserValue as string in cacheRoeland Jago Douma2018-03-191-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #8878 from nextcloud/remove_tmpfileRoeland Jago Douma2018-03-1912-42/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove \OCP\Files::tmpFolderRoeland Jago Douma2018-03-194-18/+6
| * | | | | | | | Remove \OCP\Files::tmpFileRoeland Jago Douma2018-03-1911-24/+11
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #8879 from nextcloud/dep_jsonRoeland Jago Douma2018-03-192-47/+0
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Remove unused private functionRoeland Jago Douma2018-03-191-15/+0
| * | | | | | | Remove unused deprecated functions from OCP\JSONRoeland Jago Douma2018-03-191-32/+0
|/ / / / / / /
* | | | | | | Merge pull request #8877 from nextcloud/deprecated_bgj_deleteRoeland Jago Douma2018-03-191-7/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove old deprecated function from the BackgroundJobRoeland Jago Douma2018-03-191-7/+0
| |/ / / / / /
* | | | | | | Merge pull request #8815 from nextcloud/channel-descriptionRoeland Jago Douma2018-03-193-0/+28
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Provide a description of the update channels inlineMorris Jobke2018-03-153-0/+28
* | | | | | | Merge pull request #8857 from nextcloud/swift-verify-cached-tokenMorris Jobke2018-03-193-13/+29
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | verify cached swift tokenRobin Appelman2018-03-163-13/+29
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-03-192-40/+120
* | | | | | | [tx-robot] updated from transifexNextcloud bot2018-03-186-6/+8
| |_|_|/ / / |/| | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-03-1742-4/+60
* | | | | | Merge pull request #8853 from nextcloud/remove-resolve-reshareMorris Jobke2018-03-162-33/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove unused resolveReshare of old sharing codeMorris Jobke2018-03-162-33/+0
* | | | | | Merge pull request #8843 from nextcloud/set-share-with-field-to-the-id-of-the...blizzz2018-03-163-4/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use the display name in the avatar for a circle shareDaniel Calviño Sánchez2018-03-162-2/+2
| * | | | | Set "share_with" field to the ID of the circleDaniel Calviño Sánchez2018-03-161-2/+10
* | | | | | Merge pull request #8835 from nextcloud/fix/noid/ldap_existence_checkMorris Jobke2018-03-161-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | existence check works without attribute (like with users)Arthur Schiwon2018-03-151-1/+2
| | |_|_|/ | |/| | |