summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | urldecode group principals in Cal- and CardDAV backendGeorg Ehrke2017-06-125-0/+20
* | | | | | | Merge pull request #5300 from nextcloud/bugfix/noid/fix_proppatch_requests_to...Morris Jobke2017-06-142-0/+12
|\ \ \ \ \ \ \
| * | | | | | | allow users to send PropPatch request when calendar is group-shared with themGeorg Ehrke2017-06-082-0/+12
* | | | | | | | Merge pull request #5375 from nextcloud/share-folder-for-remote-sharesMorris Jobke2017-06-141-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Use the share_folder config for remote sharesJoas Schilling2017-06-131-2/+4
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-15170-432/+652
* | | | | | | | | Merge pull request #5384 from nextcloud/allow-to-share-to-local-users-via-emailMorris Jobke2017-06-142-7/+72
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add unit testJoas Schilling2017-06-141-0/+15
| * | | | | | | | | Make sure to only add system users onceJoas Schilling2017-06-141-8/+35
| * | | | | | | | | Allow to find local users by their email addressJoas Schilling2017-06-131-7/+30
* | | | | | | | | | Merge pull request #5244 from nextcloud/dynamic-percentual-appmenu-limitMorris Jobke2017-06-141-2/+20
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Show at least 8 icons, don't use percentage on mobileJulius Härtl2017-06-141-1/+14
| * | | | | | | | | | Decimal percentage, dynamic appIcon widthPatrik Kernstock2017-06-101-3/+3
| * | | | | | | | | | Now using dynamic percentual appmenu limitPatrik Kernstock2017-06-041-1/+6
* | | | | | | | | | | Merge pull request #4993 from michaelletzgus/emit_css-tagsMorris Jobke2017-06-144-19/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Streamline templates, more DRYMichael Letzgus2017-05-254-19/+34
* | | | | | | | | | | | Merge pull request #5409 from nextcloud/1param2muchJoas Schilling2017-06-141-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | a parameter too muchArthur Schiwon2017-06-141-2/+1
* | | | | | | | | | | | | Merge pull request #5400 from nextcloud/fix/contactsmenu-l10n-search-placeholderJoas Schilling2017-06-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Localize contacts menu search input placeholderChristoph Wurst2017-06-141-1/+1
* | | | | | | | | | | | | Merge pull request #5013 from nextcloud/update-integration-tests-composer-cacheLukas Reschke2017-06-141-30/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Update integration tests composer cacheMorris Jobke2017-06-141-30/+30
* | | | | | | | | | | | | | Merge pull request #5392 from nextcloud/maintenance-mode-styleLukas Reschke2017-06-142-10/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Use the guest.css for the maintenance page as wellMorris Jobke2017-06-132-10/+1
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #5207 from nextcloud/ldap-remove-userwebdavauth-checkblizzz2017-06-142-9/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | remove check, user_webdavauth is not an app anymore for longArthur Schiwon2017-06-012-9/+1
* | | | | | | | | | | | | | Merge pull request #5361 from nextcloud/exclude-files-external-dir-from-encry...Lukas Reschke2017-06-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | don't try to encrypt/decrypt the certificate bundleBjoern Schiessle2017-06-131-0/+1
* | | | | | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-06-14118-228/+256
* | | | | | | | | | | | | | Merge pull request #5295 from nextcloud/bugfix/5077/allow_proppatches_to_birt...Morris Jobke2017-06-132-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | allow PropPatch requests to contact_birthdaysGeorg Ehrke2017-06-082-0/+11
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #5072 from mjmunger/masterMorris Jobke2017-06-131-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fixed a crash caused by Local::copyFromStorage() not conforming to Common::co...Michael Munger2017-05-231-1/+1
* | | | | | | | | | | | | | | Merge pull request #5061 from nextcloud/example-theme-guestMorris Jobke2017-06-131-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move styles.css to server.cssJulius Härtl2017-05-231-0/+0
* | | | | | | | | | | | | | | Merge pull request #5367 from nextcloud/better-share-errorMorris Jobke2017-06-132-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix unknown share tokenJoas Schilling2017-06-132-2/+7
| | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #5380 from nextcloud/global-scale-settingsMorris Jobke2017-06-132-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \