summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Introduce isReadyForUser and verify in file transfer ownership - fixes #23786Thomas Müller2016-04-157-5/+57
* Merge pull request #23527 from owncloud/fix-21136C. Montero Luque2016-04-142-2/+6
|\
| * disable Paged Search when chunksize is set to 0, fixes #21136Arthur Schiwon2016-03-232-2/+6
* | Merge pull request #23985 from owncloud/ext-fix-namespacesMorris Jobke2016-04-1439-121/+132
|\ \
| * | Fix OCA\Files\External\Api namespaceRobin McCorkell2016-04-143-3/+2
| * | Fix storage backend class namespaces and move to subdirRobin McCorkell2016-04-1437-118/+130
* | | Merge pull request #23991 from owncloud/handle-exceptions-in-templatesThomas Müller2016-04-141-2/+7
|\ \ \
| * | | Properly handle exception within templatesMorris Jobke2016-04-141-2/+7
* | | | Merge pull request #23975 from owncloud/change-default-calendar-and-contacts-...Thomas Müller2016-04-141-2/+4
|\ \ \ \
| * | | | Use better names for the default calendars and addressbooks - fixes #23720Thomas Müller2016-04-131-2/+4
| | |/ / | |/| |
* | | | Merge pull request #22760 from owncloud/tooltip-cssfixThomas Müller2016-04-141-0/+1
|\ \ \ \
| * | | | add word wrap to tooltipsErik Pellikka2016-03-021-0/+1
* | | | | close navigation menu when opening app in new tab (#23914)Christoph Wurst2016-04-141-0/+4
* | | | | add loading feedback to user menu entries (#23916)Christoph Wurst2016-04-142-0/+21
* | | | | On mount make sure multiple shares with same target map to unique ones (#23937)Roeland Douma2016-04-143-15/+61
* | | | | Scrutinizer Auto-Fixes (#23959)Scrutinizer Auto-Fixer2016-04-141-2/+2
* | | | | Merge pull request #23976 from owncloud/kill-dav-migrationThomas Müller2016-04-1415-1476/+0
|\ \ \ \ \
| * | | | | Remove dav migration for 9.1Thomas Müller2016-04-1315-1476/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #19615 from owncloud/issue-15858-mount-points-return-wrong...Morris Jobke2016-04-141-4/+17
|\ \ \ \ \
| * | | | | Fix Share::getUsersSharingFile() for mount pointsJoas Schilling2016-04-131-4/+17
| |/ / / /
* | | | | Merge pull request #23986 from owncloud/psr-4_lockRoeland Douma2016-04-144-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Move \OC\Lock to PSR-4Roeland Jago Douma2016-04-144-0/+0
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-144-0/+4
* | | | Merge pull request #23981 from owncloud/app_psr4Thomas Müller2016-04-1414-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Move \OC\App to PSR-4Roeland Jago Douma2016-04-1314-0/+0
|/ / /
* | | Merge pull request #20118 from owncloud/chunked-upload-davThomas Müller2016-04-1314-15/+809
|\ \ \
| * | | Fix unit test of file pluginThomas Müller2016-04-122-14/+21
| * | | Fix chunk file moveThomas Müller2016-04-121-1/+9
| * | | Add intergration tests for new chunkingRoeland Jago Douma2016-04-122-0/+68
| * | | Initial implementation of the new chunked upload - as specified in https://dr...Thomas Müller2016-04-1210-1/+712
* | | | Merge pull request #23943 from owncloud/document-mysql-wait-timeoutThomas Müller2016-04-131-1/+2
|\ \ \ \
| * | | | Document an example wait timeout for MySQL in case the web hoster is killing ...Thomas Müller2016-04-121-1/+2
* | | | | Merge pull request #23962 from owncloud/activity-psr4Thomas Müller2016-04-131-0/+0
|\ \ \ \ \
| * | | | | Move files in \OC\Activity to PSR-4Roeland Jago Douma2016-04-131-0/+0
* | | | | | Merge pull request #23966 from owncloud/restore-file-selectionChristoph Wurst2016-04-131-0/+5
|\ \ \ \ \ \
| * | | | | | restore selection after re-rendering file rowsChristoph Wurst2016-04-131-0/+5
* | | | | | | Merge pull request #23963 from owncloud/lazyRootJoas Schilling2016-04-133-3/+494
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Make shareproviders use the lazy root folderRoeland Jago Douma2016-04-131-2/+2
| * | | | | | Add lazyRootFolderRoeland Jago Douma2016-04-132-1/+492
* | | | | | | Merge pull request #23958 from owncloud/use-6-months-as-threshold-for-sslThomas Müller2016-04-132-5/+5
|\ \ \ \ \ \ \
| * | | | | | | Use 6 months as SSL STS header thresholdMorris Jobke2016-04-132-5/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #23954 from stweil/masterThomas Müller2016-04-134-5/+5
|\ \ \ \ \ \ \
| * | | | | | | misc: Fix some typosStefan Weil2016-04-124-5/+5
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #23921 from owncloud/show-app-download-tooltipThomas Müller2016-04-133-1/+28
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Show tooltip if the app is downloaded from a remote serverChristoph Wurst2016-04-123-1/+28
* | | | | | | Merge pull request #23945 from owncloud/fix_oc_share_permissionsJoas Schilling2016-04-133-28/+20
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | always return the complete permissions the file was shared withBjörn Schießle2016-04-123-28/+20
| | |/ / / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-1332-16/+688
* | | | | | Merge pull request #23953 from owncloud/small_share_manager_fixLukas Reschke2016-04-132-1/+41
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add testLukas Reschke2016-04-121-0/+40