summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3244 from nextcloud/settings-iconMorris Jobke2017-01-254-2/+11
|\
| * Fix testsJoas Schilling2017-01-251-1/+1
| * add icon for encryption settings on personal pageMorris Jobke2017-01-241-0/+5
| * Add icon to admin page sidebar for LDAPMorris Jobke2017-01-242-1/+5
* | Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-apiBjörn Schießle2017-01-253-6/+177
|\ \
| * | unify endpoints form core and the the provisioning apiBjoern Schiessle2017-01-253-2/+112
| * | add data from the users profile to the provisioning apiBjoern Schiessle2017-01-242-4/+65
* | | Merge pull request #3231 from nextcloud/allow-editing-public-linksBjörn Schießle2017-01-251-0/+1
|\ \ \
| * | | allow editing single files shared as public linkBjoern Schiessle2017-01-241-0/+1
| |/ /
* | / [tx-robot] updated from transifexNextcloud bot2017-01-2520-40/+100
| |/ |/|
* | Merge pull request #3151 from nextcloud/navigation-iconsMorris Jobke2017-01-249-16/+111
|\ \
| * | fix test mocksMorris Jobke2017-01-201-0/+5
| * | Fix app section testsJoas Schilling2017-01-192-4/+32
| * | Add the icons for shipped appsJoas Schilling2017-01-196-12/+74
* | | [tx-robot] updated from transifexNextcloud bot2017-01-244-34/+34
* | | Merge pull request #3209 from nextcloud/fix-theming-typoMorris Jobke2017-01-231-1/+1
|\ \ \
| * | | Fix typo in theming descriptionJoas Schilling2017-01-231-1/+1
| | |/ | |/|
* | | Merge pull request #3157 from nextcloud/fcloseafterkillMorris Jobke2017-01-232-0/+2
|\ \ \
| * | | Prevent PHP request to get killed when using fclose callback (#26775)Vincent Petry2017-01-232-0/+2
* | | | Merge pull request #3220 from nextcloud/direct-link-open-sidebarMorris Jobke2017-01-231-0/+5
|\ \ \ \
| * | | | open the sidebar when opening a permalinkRobin Appelman2017-01-231-0/+5
| | |/ / | |/| |
* | | | Merge pull request #2924 from nextcloud/flexbox-headerMorris Jobke2017-01-232-32/+30
|\ \ \ \ | |/ / / |/| | |
| * | | fix public sharing buttonsChristoph Wurst2017-01-231-2/+5
| * | | fix log and app nameChristoph Wurst2017-01-231-5/+4
| * | | more cleanupChristoph Wurst2017-01-231-30/+26
* | | | Merge pull request #3141 from nextcloud/subadmin-check-on-removing-user-from-...Joas Schilling2017-01-232-26/+236
|\ \ \ \ | |/ / / |/| | |
| * | | Allow subadmins to add people to groups via provisioning apiJoas Schilling2017-01-182-7/+151
| * | | Make sure subadmins can not delete users from their last subadmin groupJoas Schilling2017-01-182-0/+76
| * | | No need to check the subadmin againJoas Schilling2017-01-182-21/+11
* | | | Merge pull request #3118 from nextcloud/newFileMenu-css-guidelinesMorris Jobke2017-01-223-41/+12
|\ \ \ \
| * | | | Popover newFolder input fixJohn Molakvoæ (skjnldsv)2017-01-221-4/+2
| * | | | Popover positionning fixJohn Molakvoæ (skjnldsv)2017-01-221-1/+0
| * | | | Popover positionning and classesJohn Molakvoæ (skjnldsv)2017-01-223-2/+6
| * | | | fit newFileMenu to css guidelinesJohn Molakvoæ (skjnldsv)2017-01-223-39/+9
* | | | | [tx-robot] updated from transifexNextcloud bot2017-01-234-4/+4
* | | | | Merge pull request #3190 from nextcloud/fix-sharing-popoverJohn Molakvoæ2017-01-221-9/+7
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix #3174John Molakvoæ (skjnldsv)2017-01-211-9/+7
| | |_|/ | |/| |
* | | | Merge pull request #3187 from nextcloud/inputs-scss-optimisationMorris Jobke2017-01-224-53/+28
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed public share download buttonJohn Molakvoæ (skjnldsv)2017-01-221-2/+2
| * | | Fixed sharing jsJohn Molakvoæ (skjnldsv)2017-01-221-1/+1
| * | | Fixed public share header buttonsJohn Molakvoæ (skjnldsv)2017-01-222-44/+23
| * | | Login and authenticate inputs fixesJohn Molakvoæ (skjnldsv)2017-01-221-6/+2
| |/ /
* | | [tx-robot] updated from transifexNextcloud bot2017-01-228-10/+10
* | | [tx-robot] updated from transifexNextcloud bot2017-01-218-28/+28
* | | [tx-robot] updated from transifexNextcloud bot2017-01-206-10/+122
* | | Merge pull request #3144 from nextcloud/use-data-download-responseMorris Jobke2017-01-192-7/+3
|\ \ \
| * | | Use DataDownloadResponseLukas Reschke2017-01-182-7/+3
* | | | some code cleanup while working on the fileBjoern Schiessle2017-01-191-19/+26
* | | | add brute force protection to 'mount public link' operationBjoern Schiessle2017-01-191-0/+1
| |/ / |/| |
* | | Merge pull request #3150 from nextcloud/highlight-active-navigationJohn Molakvoæ2017-01-192-0/+5
|\ \ \