summaryrefslogtreecommitdiffstats
Commit message (Collapse)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-4
| * 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
|\ | | | | Initial implementation of the new chunked upload
| * 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
| | | | | | | | | | | | | | | | The same intergration tests as for the old endpoint. But now using the new chunking. We upload 3 chunks in different order and the result should be the same in all three.
| * Initial implementation of the new chunked upload - as specified in ↵Thomas Müller2016-04-1210-1/+712
| | | | | | | | https://dragotin.wordpress.com/2015/06/22/owncloud-chunking-ng/
* | 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 …
| * | Document an example wait timeout for MySQL in case the web hoster is killing ↵Thomas Müller2016-04-121-1/+2
| | | | | | | | | | | | | | | | | | the connection too early - fixes #15407 This reverts commit e9a9af3493caa7e839e18cda0c8ea2d8dd7bfd22.
* | | Merge pull request #23962 from owncloud/activity-psr4Thomas Müller2016-04-131-0/+0
|\ \ \ | | | | | | | | Move files in \OC\Activity to PSR-4
| * | | 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 rows
| * | | | restore selection after re-rendering file rowsChristoph Wurst2016-04-131-0/+5
| | | | |
* | | | | Merge pull request #23963 from owncloud/lazyRootJoas Schilling2016-04-133-3/+494
|\ \ \ \ \ | |/ / / / |/| | | | Add LazyRootFolder
| * | | | 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 threshold
| * | | | | Use 6 months as SSL STS header thresholdMorris Jobke2016-04-132-5/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | * this uses 6 months (6 * 30 * 24 * 60 * 60 = 15552000) * old value was half a year (365 / 2 * 24 * 60 * 60 = 15768000) * fixes #23957
* | | | | Merge pull request #23954 from stweil/masterThomas Müller2016-04-134-5/+5
|\ \ \ \ \ | | | | | | | | | | | | misc: Fix some typos
| * | | | | misc: Fix some typosStefan Weil2016-04-124-5/+5
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Some of them were found by codespell. Signed-off-by: Stefan Weil <sw@weilnetz.de>
* | | | | 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 server
| * | | | Show tooltip if the app is downloaded from a remote serverChristoph Wurst2016-04-123-1/+28
| | | | | | | | | | | | | | | | | | | | fixes #14405
* | | | | Merge pull request #23945 from owncloud/fix_oc_share_permissionsJoas Schilling2016-04-133-28/+20
|\ \ \ \ \ | |_|_|/ / |/| | | | always return the complete permissions the file was shared with
| * | | | 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
|\ \ \ \ | |/ / / |/| | | set $share to null if getShareByToken() failed
| * | | 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
| | | | | | | | | | | | | | | | | | killing the connection too early - fixes #15407" This reverts commit acad7b30bef8ec11f6e57ee7bfcafec4b8795e03.
* | | Document an example wait timeout for MySQL in case the web hoster is killing ↵Thomas Müller2016-04-121-1/+2
| | | | | | | | | | | | the connection too early - fixes #15407
* | | apps: Fix typos (found by codespell) (#23862)Stefan Weil2016-04-127-11/+11
| | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de>
* | | Add unit testing capabilities for templates (#23708)Thomas Müller2016-04-126-27/+132
| |/ |/| | | | | Add unit testing capabilities for templates
* | Exclude autoload_static.php (#23935)Lukas Reschke2016-04-121-1/+1
| | | | | | | | | | Composer 1.1 has since yesterday a new performance improvement that will be automatically used for PHP >= 5.6, however this file is incompatible with older PHP versions and thus we need to exclude it from the checks. Note that this performance improvement is only used on >= 5.6 so ownCloud will still run fine on older PHP versions as well.
* | Checkboxes (#23063)Hendrik Leppelsack2016-04-122-19/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove ie8 fixes for checkboxes * add indeterminate style to checkboxes * add styles for radio inputs * add missing checkbox-mixed-disabled icon * fix white radios * remove unnecessary png file
* | Migrate post_groupDelete hook to share manager (#23841)Roeland Douma2016-04-129-14/+179
| | | | | | | | | | | | | | | | The hook now calls the share manager that will call the responsible shareProvider to do the proper cleanup. * Unit tests added Again nothing should change it is just to cleanup old code
* | Don't calculate permissions twice (#23917)Roeland Douma2016-04-121-1/+1
| | | | | | | | There is no need to calculate the permissions twice. Saves some is_dir and file_exists calls.
* | [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 shares
| * Remove pre/post_addToGroup hooks for sharesRoeland Jago Douma2016-04-083-235/+0
| | | | | | | | | | There is no need to perform the checks for unique targets on add to group as we have to do this all when mounting the shares anyway.
* | Catch the AutoloadNotAllowedException also for legacy jobs (#23901)Morris Jobke2016-04-111-2/+9
| | | | | | | | * same as #18839 for legacy jobs * avoids spamming the log with useless entries
* | To be safe don't unload until end (#23752)Joshua Ruehlig2016-04-111-1/+1
| | | | | | | | | | | | * To be safe don't unload until end * unlink needs to be before return to actually do anything
* | 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 available
| * | 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-Fixes
| * | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2016-04-081-1/+1
| | | | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | | Merge pull request #22615 from owncloud/add-blacklisted-files-to-capabilitiesThomas Müller2016-04-111-0/+13
|\ \ \ \ | | | | | | | | | | Add blacklisted_files to capabilities
| * | | | 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 files
| * | | | | Correctly return an empty string for empty filesJoas Schilling2016-04-081-3/+9
| | |_|_|/ | |/| | |