summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5491 from nextcloud/issue-5457-create-users-in-non-defaul...blizzz2017-06-221-0/+13
|\
| * Create users in non default backends firstJoas Schilling2017-06-201-0/+13
* | [tx-robot] updated from transifexNextcloud bot2017-06-2256-210/+212
* | Merge pull request #5474 from nextcloud/wording-4925Morris Jobke2017-06-215-45/+45
|\ \
| * | Improve wording of various error messagesJan-Christoph Borchardt2017-06-215-45/+45
* | | Merge pull request #5252 from derkostka/masterMorris Jobke2017-06-212-2/+2
|\ \ \
| * | | Squashed the webroot fixSebastian Kostka2017-06-202-2/+2
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-2118-2/+354
| |_|/ |/| |
* | | Merge pull request #5479 from nextcloud/pr-5459-follow-upMorris Jobke2017-06-201-10/+8
|\ \ \
| * | | Also allow group admins to toogle the storage locationJoas Schilling2017-06-201-10/+8
|/ / /
* | / [tx-robot] updated from transifexNextcloud bot2017-06-2030-58/+78
| |/ |/|
* | Merge pull request #5459 from nextcloud/issue-5399-dont-reload-on-subadmin-se...Morris Jobke2017-06-191-8/+24
|\ \
| * | Don't try to save the setting when its not an adminJoas Schilling2017-06-191-8/+24
* | | Merge pull request #5450 from nextcloud/fix-appmenu-more-themingMorris Jobke2017-06-191-0/+3
|\ \ \
| * | | Fix more icon in apps menu on bright backgroundsJulius Härtl2017-06-171-0/+3
* | | | Merge pull request #5091 from nextcloud/shared-cache-during-initRobin Appelman2017-06-191-1/+8
|\ \ \ \
| * | | | dont die if we try to access the shared cache while setting up the shared sto...Robin Appelman2017-05-241-1/+8
* | | | | Merge pull request #5447 from nextcloud/calendar-icon-whiteJan-Christoph Borchardt2017-06-199-7/+11
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Add CSS class for icon-calendarMarin Treselj2017-06-171-0/+3
| * | | | Add viewport to all core/img/places/* icons.Marin Treselj2017-06-179-9/+9
| * | | | Add white version of the calendar.svg iconMarin Treselj2017-06-162-1/+2
* | | | | Merge pull request #5429 from nextcloud/cache-baseurlMorris Jobke2017-06-186-66/+133
|\ \ \ \ \
| * | | | | Fix testsJulius Härtl2017-06-161-20/+31
| * | | | | Fix theming app to also use the prefixJulius Härtl2017-06-161-5/+10
| * | | | | Add tests and inject IRequestJulius Härtl2017-06-163-32/+65
| * | | | | Do not open version file againJulius Härtl2017-06-151-1/+1
| * | | | | Make cache and scss caching depend on the baseUrlJulius Härtl2017-06-154-15/+33
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-1920-2/+30
* | | | | | Merge pull request #5423 from nextcloud/better-svg-optimizationMorris Jobke2017-06-171-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Remove XML heared and line breaks in SVG files.Marin Treselj2017-06-151-1/+1
| |/ / / /
* | | | | Merge pull request #5436 from jplitza/patch-1Lukas Reschke2017-06-171-1/+1
|\ \ \ \ \
| * | | | | Fix 500 Internal Server Error on writingJan-Philipp Litza2017-06-161-1/+1
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-1770-84/+194
| |_|/ / / |/| | | |
* | | | | Merge pull request #5177 from Bekcpear/masterRobin Appelman2017-06-161-13/+15
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | update core.jsBekcpear2017-06-161-1/+1
| * | | | Fix uploadrate value of 'original-title' attributeBekcpear2017-06-161-1/+1
| * | | | Fix upload remaining timeBekcpear2017-06-161-12/+14
* | | | | Merge pull request #5124 from nextcloud/allow-dirlisting-with-unreadable-itemsJoas Schilling2017-06-162-4/+11
|\ \ \ \ \
| * | | | | Fix unit testJoas Schilling2017-06-071-4/+5
| * | | | | Allow dir-listing also when one child is blocked by access controlJoas Schilling2017-05-261-0/+6
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-1676-52/+176
* | | | | | Merge pull request #5421 from nextcloud/5190-masterMorris Jobke2017-06-151-9/+32
|\ \ \ \ \ \
| * | | | | | Forward port of #5190 to masterArthur Schiwon2017-06-151-9/+32
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #5396 from nextcloud/gpx-mimetypeblizzz2017-06-155-1/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | bycatch, x-ldif entry was missingArthur Schiwon2017-06-142-1/+2
| * | | | | add location filetype iconArthur Schiwon2017-06-142-0/+7
| * | | | | added kml, kmz, tcx types as well while at itArthur Schiwon2017-06-143-1/+10
| * | | | | add geospatial mime types repair stepArthur Schiwon2017-06-141-0/+12
| * | | | | add gpx mimetypeArthur Schiwon2017-06-142-0/+2
* | | | | | Merge pull request #5298 from nextcloud/bugfix/4885/calendar_shares_url_speci...Morris Jobke2017-06-145-0/+20
|\ \ \ \ \ \