summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3204 from nextcloud/remove-button-shadowMorris Jobke2017-01-241-6/+1
|\
| * remove button shadow effect, fix #3203Jan-Christoph Borchardt2017-01-231-6/+1
* | Merge pull request #3227 from nextcloud/fix-avatar-user-menu-headerMorris Jobke2017-01-241-8/+6
|\ \
| * | Fixed menu arrow, padding and avatar position, fix #3217John Molakvoæ (skjnldsv)2017-01-241-8/+6
* | | Merge pull request #3226 from nextcloud/header-app-menu-flex-fixChristoph Wurst2017-01-241-0/+1
|\ \ \
| * | | Fix #3225John Molakvoæ (skjnldsv)2017-01-241-0/+1
| |/ /
* | | Merge pull request #3151 from nextcloud/navigation-iconsMorris Jobke2017-01-2428-62/+310
|\ \ \
| * | | fix positioning details of icons in navigationJan-Christoph Borchardt2017-01-241-0/+6
| * | | fix test mocksMorris Jobke2017-01-201-0/+5
| * | | update autoloader static class filesMorris Jobke2017-01-192-0/+2
| * | | Fix app section testsJoas Schilling2017-01-192-4/+32
| * | | Fix the manager testsJoas Schilling2017-01-191-30/+44
| * | | Add the icons for shipped appsJoas Schilling2017-01-196-12/+74
| * | | Add the icon for the default sectionsJoas Schilling2017-01-1910-45/+33
| * | | Allow apps to specify an icon with the sections via the APIJoas Schilling2017-01-195-6/+74
| * | | add viewBox to not run into scaling issuesMorris Jobke2017-01-194-4/+4
| * | | add icons to admin settings navigationJan-Christoph Borchardt2017-01-197-2/+40
| * | | add icons to personal settings navigationJan-Christoph Borchardt2017-01-197-2/+39
* | | | Merge pull request #3214 from nextcloud/cache-storage-infoRobin Appelman2017-01-241-5/+29
|\ \ \ \
| * | | | hash the path used for the cache key to prevent key length problemsRobin Appelman2017-01-241-2/+3
| * | | | cache the storage info for 5 minRobin Appelman2017-01-231-5/+28
* | | | | [tx-robot] updated from transifexNextcloud bot2017-01-24190-452/+480
* | | | | Merge pull request #3192 from nextcloud/fix-app-settings-layout-minorMorris Jobke2017-01-232-1/+11
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add classJohn Molakvoæ (skjnldsv)2017-01-232-2/+2
| * | | | Fix gap by filter svg and empty search message overflowFelix A. Epp2017-01-222-1/+11
* | | | | Merge pull request #3212 from mwalbeck/mimetype-hidden-filesRobin Appelman2017-01-232-0/+8
|\ \ \ \ \
| * | | | | Reduced code for filename trimMagnus Walbeck2017-01-231-3/+1
| * | | | | Mimetype detection for hidden filesMagnus Walbeck2017-01-232-0/+10
| | |/ / / | |/| | |
* | | | | 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-234-0/+5
|\ \ \ \ \
| * | | | | Prevent PHP request to get killed when using fclose callback (#26775)Vincent Petry2017-01-234-0/+5
* | | | | | 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-235-111/+109
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix appname positionChristoph Wurst2017-01-231-3/+2
| * | | | | fix searchbox positionChristoph Wurst2017-01-231-1/+1
| * | | | | fix public sharing buttonsChristoph Wurst2017-01-232-3/+5
| * | | | | fix log and app nameChristoph Wurst2017-01-231-5/+4
| * | | | | more cleanupChristoph Wurst2017-01-232-44/+28
| * | | | | fix scssChristoph Wurst2017-01-232-3/+4
| * | | | | use less space for the left part of the headerChristoph Wurst2017-01-231-1/+2
| * | | | | Use flexbox for header and rearrange some elementsChristoph Wurst2017-01-233-62/+74
| | |_|_|/ | |/| | |
* | | | | Merge pull request #3141 from nextcloud/subadmin-check-on-removing-user-from-...Joas Schilling2017-01-236-147/+288
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove the old ajax fileJoas Schilling2017-01-181-92/+0
| * | | | Use the provisioning api in the user management to handle group membershipsJoas Schilling2017-01-182-28/+51
| * | | | 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
| * | | | Fix CamelCasingJoas Schilling2017-01-181-1/+1
| * | | | No need to check the subadmin againJoas Schilling2017-01-182-21/+11