summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
| * | | set $share to null if getShareByToken() failedBjörn Schießle2016-04-121-1/+1
|/ / /
* | | Revert "Document an example wait timeout for MySQL in case the web hoster is ...Thomas Müller2016-04-121-2/+1
* | | Document an example wait timeout for MySQL in case the web hoster is killing ...Thomas Müller2016-04-121-1/+2
* | | apps: Fix typos (found by codespell) (#23862)Stefan Weil2016-04-127-11/+11
* | | Add unit testing capabilities for templates (#23708)Thomas Müller2016-04-126-27/+132
| |/ |/|
* | Exclude autoload_static.php (#23935)Lukas Reschke2016-04-121-1/+1
* | Checkboxes (#23063)Hendrik Leppelsack2016-04-122-19/+86
* | Migrate post_groupDelete hook to share manager (#23841)Roeland Douma2016-04-129-14/+179
* | Don't calculate permissions twice (#23917)Roeland Douma2016-04-121-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-126-0/+12
|/
* Merge pull request #23856 from owncloud/share_remove_addtogroup_hooksJoas Schilling2016-04-113-235/+0
|\
| * Remove pre/post_addToGroup hooks for sharesRoeland Jago Douma2016-04-083-235/+0
* | Catch the AutoloadNotAllowedException also for legacy jobs (#23901)Morris Jobke2016-04-111-2/+9
* | To be safe don't unload until end (#23752)Joshua Ruehlig2016-04-111-1/+1
* | Merge pull request #23798 from owncloud/federated-unshare-background-jobMorris Jobke2016-04-114-5/+337
|\ \
| * | re-try to send unshare notification if remote server is not availableBjoern Schiessle2016-04-084-5/+337
* | | Merge pull request #23868 from owncloud/scrutinizer-patch-2Thomas Müller2016-04-111-1/+1
|\ \ \
| * | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2016-04-081-1/+1
* | | | Merge pull request #22615 from owncloud/add-blacklisted-files-to-capabilitiesThomas Müller2016-04-111-0/+13
|\ \ \ \
| * | | | Add blacklisted_files to capabilitiesJoas Schilling2016-04-041-0/+13
* | | | | Merge pull request #23860 from owncloud/followup-23304-opening-empty-fileThomas Müller2016-04-111-3/+9
|\ \ \ \ \
| * | | | | Correctly return an empty string for empty filesJoas Schilling2016-04-081-3/+9
| | |_|_|/ | |/| | |