Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-14 | 4 | -0/+4 |
| | |||||
* | Merge pull request #23981 from owncloud/app_psr4 | Thomas Müller | 2016-04-14 | 14 | -0/+0 |
|\ | | | | | Move \OC\App to PSR-4 | ||||
| * | Move \OC\App to PSR-4 | Roeland Jago Douma | 2016-04-13 | 14 | -0/+0 |
|/ | |||||
* | Merge pull request #20118 from owncloud/chunked-upload-dav | Thomas Müller | 2016-04-13 | 14 | -15/+809 |
|\ | | | | | Initial implementation of the new chunked upload | ||||
| * | Fix unit test of file plugin | Thomas Müller | 2016-04-12 | 2 | -14/+21 |
| | | |||||
| * | Fix chunk file move | Thomas Müller | 2016-04-12 | 1 | -1/+9 |
| | | |||||
| * | Add intergration tests for new chunking | Roeland Jago Douma | 2016-04-12 | 2 | -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üller | 2016-04-12 | 10 | -1/+712 |
| | | | | | | | | https://dragotin.wordpress.com/2015/06/22/owncloud-chunking-ng/ | ||||
* | | Merge pull request #23943 from owncloud/document-mysql-wait-timeout | Thomas Müller | 2016-04-13 | 1 | -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üller | 2016-04-12 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | the connection too early - fixes #15407 This reverts commit e9a9af3493caa7e839e18cda0c8ea2d8dd7bfd22. | ||||
* | | | Merge pull request #23962 from owncloud/activity-psr4 | Thomas Müller | 2016-04-13 | 1 | -0/+0 |
|\ \ \ | | | | | | | | | Move files in \OC\Activity to PSR-4 | ||||
| * | | | Move files in \OC\Activity to PSR-4 | Roeland Jago Douma | 2016-04-13 | 1 | -0/+0 |
| | | | | |||||
* | | | | Merge pull request #23966 from owncloud/restore-file-selection | Christoph Wurst | 2016-04-13 | 1 | -0/+5 |
|\ \ \ \ | | | | | | | | | | | restore selection after re-rendering file rows | ||||
| * | | | | restore selection after re-rendering file rows | Christoph Wurst | 2016-04-13 | 1 | -0/+5 |
| | | | | | |||||
* | | | | | Merge pull request #23963 from owncloud/lazyRoot | Joas Schilling | 2016-04-13 | 3 | -3/+494 |
|\ \ \ \ \ | |/ / / / |/| | | | | Add LazyRootFolder | ||||
| * | | | | Make shareproviders use the lazy root folder | Roeland Jago Douma | 2016-04-13 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add lazyRootFolder | Roeland Jago Douma | 2016-04-13 | 2 | -1/+492 |
| | | | | | |||||
* | | | | | Merge pull request #23958 from owncloud/use-6-months-as-threshold-for-ssl | Thomas Müller | 2016-04-13 | 2 | -5/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Use 6 months as SSL STS header threshold | ||||
| * | | | | | Use 6 months as SSL STS header threshold | Morris Jobke | 2016-04-13 | 2 | -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/master | Thomas Müller | 2016-04-13 | 4 | -5/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | misc: Fix some typos | ||||
| * | | | | | misc: Fix some typos | Stefan Weil | 2016-04-12 | 4 | -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-tooltip | Thomas Müller | 2016-04-13 | 3 | -1/+28 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Show tooltip if the app is downloaded from a remote server | ||||
| * | | | | Show tooltip if the app is downloaded from a remote server | Christoph Wurst | 2016-04-12 | 3 | -1/+28 |
| | | | | | | | | | | | | | | | | | | | | fixes #14405 | ||||
* | | | | | Merge pull request #23945 from owncloud/fix_oc_share_permissions | Joas Schilling | 2016-04-13 | 3 | -28/+20 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | always return the complete permissions the file was shared with | ||||
| * | | | | always return the complete permissions the file was shared with | Björn Schießle | 2016-04-12 | 3 | -28/+20 |
| | |/ / | |/| | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-13 | 32 | -16/+688 |
| | | | | |||||
* | | | | Merge pull request #23953 from owncloud/small_share_manager_fix | Lukas Reschke | 2016-04-13 | 2 | -1/+41 |
|\ \ \ \ | |/ / / |/| | | | set $share to null if getShareByToken() failed | ||||
| * | | | Add test | Lukas Reschke | 2016-04-12 | 1 | -0/+40 |
| | | | | |||||
| * | | | set $share to null if getShareByToken() failed | Björn Schießle | 2016-04-12 | 1 | -1/+1 |
|/ / / | |||||
* | | | Revert "Document an example wait timeout for MySQL in case the web hoster is ↵ | Thomas Müller | 2016-04-12 | 1 | -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üller | 2016-04-12 | 1 | -1/+2 |
| | | | | | | | | | | | | the connection too early - fixes #15407 | ||||
* | | | apps: Fix typos (found by codespell) (#23862) | Stefan Weil | 2016-04-12 | 7 | -11/+11 |
| | | | | | | | | | Signed-off-by: Stefan Weil <sw@weilnetz.de> | ||||
* | | | Add unit testing capabilities for templates (#23708) | Thomas Müller | 2016-04-12 | 6 | -27/+132 |
| |/ |/| | | | | | Add unit testing capabilities for templates | ||||
* | | Exclude autoload_static.php (#23935) | Lukas Reschke | 2016-04-12 | 1 | -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 Leppelsack | 2016-04-12 | 2 | -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 Douma | 2016-04-12 | 9 | -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 Douma | 2016-04-12 | 1 | -1/+1 |
| | | | | | | | | There is no need to calculate the permissions twice. Saves some is_dir and file_exists calls. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-12 | 6 | -0/+12 |
|/ | |||||
* | Merge pull request #23856 from owncloud/share_remove_addtogroup_hooks | Joas Schilling | 2016-04-11 | 3 | -235/+0 |
|\ | | | | | Remove pre/post_addToGroup hooks for shares | ||||
| * | Remove pre/post_addToGroup hooks for shares | Roeland Jago Douma | 2016-04-08 | 3 | -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 Jobke | 2016-04-11 | 1 | -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 Ruehlig | 2016-04-11 | 1 | -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-job | Morris Jobke | 2016-04-11 | 4 | -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 available | Bjoern Schiessle | 2016-04-08 | 4 | -5/+337 |
| | | | |||||
* | | | Merge pull request #23868 from owncloud/scrutinizer-patch-2 | Thomas Müller | 2016-04-11 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Scrutinizer Auto-Fixes | ||||
| * | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2016-04-08 | 1 | -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-capabilities | Thomas Müller | 2016-04-11 | 1 | -0/+13 |
|\ \ \ \ | | | | | | | | | | | Add blacklisted_files to capabilities | ||||
| * | | | | Add blacklisted_files to capabilities | Joas Schilling | 2016-04-04 | 1 | -0/+13 |
| | | | | | |||||
* | | | | | Merge pull request #23860 from owncloud/followup-23304-opening-empty-file | Thomas Müller | 2016-04-11 | 1 | -3/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | Correctly return an empty string for empty files | ||||
| * | | | | | Correctly return an empty string for empty files | Joas Schilling | 2016-04-08 | 1 | -3/+9 |
| | |_|_|/ | |/| | | |