summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-apiBjörn Schießle2017-01-256-39/+177
|\
| * unify endpoints form core and the the provisioning apiBjoern Schiessle2017-01-256-35/+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-253-1/+55
|\ \
| * | allow editing single files shared as public linkBjoern Schiessle2017-01-243-1/+55
| |/
* | Merge pull request #3223 from nextcloud/fix-public-page-styleBjörn Schießle2017-01-251-1/+1
|\ \
| * | Fix public page styleMorris Jobke2017-01-231-1/+1
* | | Merge pull request #3241 from nextcloud/fix-padding-settingsJoas Schilling2017-01-251-1/+1
|\ \ \
| * | | Fix left padding for settings sidebarMorris Jobke2017-01-241-1/+1
* | | | Merge pull request #3239 from nextcloud/added-inline-buttonChristoph Wurst2017-01-251-1/+1
|\ \ \ \
| * | | | fix #3235John Molakvoæ (skjnldsv)2017-01-241-1/+1
* | | | | Merge pull request #3240 from nextcloud/storage-interface-tweaksChristoph Wurst2017-01-252-2/+3
|\ \ \ \ \
| * | | | | minor storage interface tweaksRobin Appelman2017-01-242-2/+3
| |/ / / /
* | | | | Merge pull request #3215 from nextcloud/fix-search-borderJohn Molakvoæ2017-01-251-2/+2
|\ \ \ \ \
| * | | | | Fix white flashing of search backgroundMorris Jobke2017-01-231-1/+1
| * | | | | Fix #3205John Molakvoæ (skjnldsv)2017-01-231-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #3030 from nextcloud/filesapi-renamefailcaseMorris Jobke2017-01-246-641/+565
|\ \ \ \ \
| * | | | | Add tests for move/copy hooks in Node APIVincent Petry2017-01-121-0/+81
| * | | | | Fix files node API failed rename/copyVincent Petry2017-01-125-112/+127
| * | | | | Refactor files node API for more code reuseVincent Petry2017-01-114-531/+359
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-01-2532-50/+128
* | | | | | 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
|\ \ \ \ \ \ \