Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix uploading files containing a # in the path for webdav | Robin Appelman | 2014-03-31 | 2 | -2/+21 |
| | |||||
* | Merge pull request #7939 from owncloud/wring_redirect_on_login | Vincent Petry | 2014-03-31 | 2 | -6/+6 |
|\ | | | | | Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936 | ||||
| * | Sub-dir was prepended twice | Thomas Tanghus | 2014-03-29 | 1 | -1/+1 |
| | | |||||
| * | Sub-dir was prepended twice | Thomas Tanghus | 2014-03-29 | 1 | -2/+1 |
| | | |||||
| * | Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936 | Thomas Tanghus | 2014-03-28 | 1 | -4/+5 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-31 | 12 | -12/+12 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-30 | 18 | -53/+57 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-29 | 17 | -110/+113 |
| | | |||||
* | | Merge pull request #7845 from duritong/fix_submodule_url | Thomas Müller | 2014-03-28 | 1 | -1/+1 |
|\ \ | | | | | | | use https as submodule url | ||||
| * | | use https as submodule url | mh | 2014-03-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | git:// domains might not be allowed in all environments, while cloning https through a proxy is fine. -> Make checkout in restrictive environments possible. | ||||
* | | | Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-master | Morris Jobke | 2014-03-28 | 1 | -3/+11 |
|\ \ \ | |_|/ |/| | | adding @method annotation to declare methods which can be called on the ... | ||||
| * | | adding @method annotation to declare methods which can be called on the ↵ | Thomas Müller | 2014-03-28 | 1 | -3/+11 |
| | | | | | | | | | | | | wrapped statement object | ||||
* | | | Merge pull request #7934 from owncloud/addEventToExpirationDate | Vincent Petry | 2014-03-28 | 1 | -1/+8 |
|\ \ \ | | | | | | | | | Emit event after setting a new expiration for a share | ||||
| * | | | Emit event after setting a new expiration for a share | Morris Jobke | 2014-03-28 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | all credits to @frisco82 https://github.com/owncloud/core/pull/5335 | ||||
* | | | | Merge pull request #7770 from jamesryanbell/master | Morris Jobke | 2014-03-28 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | SVG support detection | ||||
| * | | | | SVG support detection | jamesryanbell | 2014-03-17 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | The SVGSupport checkMimeType method was failing on my setup as the headers are all returned in lowercase. I have lowercase all the indexes and modified the if statement so that it doesn't matter what case the headers are returned in | ||||
* | | | | | Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails | Björn Schießle | 2014-03-28 | 1 | -0/+2 |
|\ \ \ \ \ | |_|/ / / |/| | | | | don't write file if opening a stream to encrypt the data fails | ||||
| * | | | | don't write file if opening a stream to encrypt the data fails | Bjoern Schiessle | 2014-03-28 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Merge pull request #7824 from owncloud/hash-parameter-order | Thomas Müller | 2014-03-28 | 4 | -19/+35 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix parameter order for Storage\Local::hash | ||||
| * | | | | | fix temporary file based common hash | Robin Appelman | 2014-03-21 | 1 | -2/+1 |
| | | | | | | |||||
| * | | | | | Fix parameter order for Storage\Local::hash | Robin Appelman | 2014-03-20 | 3 | -17/+34 |
| | | | | | | |||||
* | | | | | | Merge pull request #7879 from owncloud/sharing_cleanup_public_api | Vincent Petry | 2014-03-28 | 8 | -1706/+2026 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | sharing api cleanup, first step | ||||
| * | | | | | | finally fix the paths for the OCS Share API | Bjoern Schiessle | 2014-03-25 | 2 | -3/+88 |
| | | | | | | | |||||
| * | | | | | | fix path creation for re-shares, issue #7662 | Bjoern Schiessle | 2014-03-25 | 2 | -85/+7 |
| | | | | | | | |||||
| * | | | | | | don't assign variables in if condition | Bjoern Schiessle | 2014-03-25 | 1 | -18/+17 |
| | | | | | | | |||||
| * | | | | | | add todo | Bjoern Schiessle | 2014-03-25 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | always return an array | Bjoern Schiessle | 2014-03-25 | 2 | -17/+10 |
| | | | | | | | |||||
| * | | | | | | seperate formatResults() | Bjoern Schiessle | 2014-03-25 | 1 | -18/+31 |
| | | | | | | | |||||
| * | | | | | | don't assign variables in if conditions | Bjoern Schiessle | 2014-03-25 | 1 | -2/+4 |
| | | | | | | | |||||
| * | | | | | | use variable | Bjoern Schiessle | 2014-03-25 | 1 | -6/+5 |
| | | | | | | | |||||
| * | | | | | | seperate transformDBResults | Bjoern Schiessle | 2014-03-25 | 1 | -24/+33 |
| | | | | | | | |||||
| * | | | | | | seperate creation of select statement | Bjoern Schiessle | 2014-03-25 | 1 | -38/+44 |
| | | | | | | | |||||
| * | | | | | | remove prepFileTarget() seems that it is no longer in use | Bjoern Schiessle | 2014-03-25 | 2 | -27/+0 |
| | | | | | | | |||||
| * | | | | | | add a "helper" and a "hooks" class. Move constants needed by multiple classes | Bjoern Schiessle | 2014-03-25 | 6 | -355/+377 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | to a "constants" class | ||||
| * | | | | | | added private share api | Bjoern Schiessle | 2014-03-25 | 2 | -1647/+1944 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7613 from owncloud/fix_urlGenerator2 | Vincent Petry | 2014-03-28 | 2 | -4/+29 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | Add \OC::$WEBROOT to URLGenerator::getAbsoluteURL() | ||||
| * | | | | | | Fix unit tests | Thomas Tanghus | 2014-03-07 | 1 | -3/+27 |
| | | | | | | | |||||
| * | | | | | | Add \OC:: to URLGenerator::getAbsoluteURL() | Thomas Tanghus | 2014-03-06 | 1 | -1/+2 |
| | | | | | | | |||||
* | | | | | | | Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction ↵ | Thomas Müller | 2014-03-28 | 1 | -4/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled. Squashed commit of the following: commit eaf4f43f687db59137a0b00bc0e12ed4eb0d0943 Merge: 1e9c5be 1e7d7bd Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Mar 28 11:49:04 2014 +0100 Merge branch 'master' of https://github.com/kev300/core into kev300-master commit 1e7d7bdd8b5c7f301501cb822cdf2ef0ad3f2872 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:11:42 2013 +0100 Update util.php commit 3f0723f054a27a506be7f26932ccb54fff6f2be9 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:09:15 2013 +0100 Update util.php commit 512176abdcfbe5b2b060b91033abc9608912d1f8 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:02:04 2013 +0100 Update util.php commit 6cbefd080188d287024e0b047b88dd4525d6c2c1 Author: kev300 <admin@gadeco.de> Date: Mon Dec 16 16:44:46 2013 +0100 Update util.php Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled. | ||||
* | | | | | | | Merge pull request #7829 from owncloud/cachefolderlocation | Vincent Petry | 2014-03-28 | 5 | -9/+111 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Cache folder is now configurable | ||||
| * | | | | | | | Remove unused setUserVars utility method | Vincent Petry | 2014-03-26 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | That method was moved to the external storage recently so isn't needed here any more. | ||||
| * | | | | | | | Added unit tests for external cache folder | Vincent Petry | 2014-03-24 | 1 | -0/+51 |
| | | | | | | | | |||||
| * | | | | | | | Cache folder is now configurable | Vincent Petry | 2014-03-24 | 4 | -9/+71 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using an external cache folder, it is automatically mounted in FileSystem::initFileSystem so that any app can use it transparently by creating a view on the "/$user/cache" directory. | ||||
* | | | | | | | | Merge pull request #7703 from rnveach/jstest | Thomas Müller | 2014-03-28 | 2 | -1/+8 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fixing issues found with running 'autotest-js' locally | ||||
| * | | | | | | | | added missing packages required to run "karma" and "phantomjs" inside | rnveach | 2014-03-12 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | "autotest-js" | ||||
| * | | | | | | | | added missing ignores for files and directories created by "autotest-js" | rnveach | 2014-03-12 | 1 | -0/+5 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #7678 from owncloud/test-bootstrap-fileproxy-cleanup | Vincent Petry | 2014-03-28 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | | Cleanup the fileproxy proxies on test bootstrap | ||||
| * | | | | | | | | Cleanup the fileproxy proxies on test bootstrap | Bart Visscher | 2014-03-11 | 1 | -0/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #7872 from owncloud/trash-disablestoragestats | Björn Schießle | 2014-03-28 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Do not retrieve storage stats for trash bin | ||||
| * | | | | | | | | | Do not retrieve storage stats for trash bin | Vincent Petry | 2014-03-28 | 1 | -0/+5 |
| | | | | | | | | | |