Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | White-list known secure mime types. Refs. #8184 | Thomas Tanghus | 2014-04-14 | 1 | -0/+12 |
* | Remove annoying karma 404 warnings for images | Vincent Petry | 2014-04-11 | 1 | -0/+8 |
* | Merge pull request #8112 from owncloud/karma-enableautowatch | Thomas Müller | 2014-04-10 | 1 | -1/+1 |
|\ | |||||
| * | Enable autowatch for karma | Vincent Petry | 2014-04-08 | 1 | -1/+1 |
* | | Merge pull request #8137 from owncloud/routeing-requirements | Thomas Müller | 2014-04-10 | 1 | -4/+22 |
|\ \ | |||||
| * | | add requirements to routing | Bernhard Posselt | 2014-04-09 | 1 | -4/+22 |
* | | | Merge pull request #8018 from owncloud/ocs_result_success_is_100 | Vincent Petry | 2014-04-10 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix test case for api response code | tomneedham | 2014-04-03 | 1 | -1/+1 |
* | | | Merge pull request #7643 from owncloud/chainable_response | Thomas Müller | 2014-04-08 | 3 | -0/+40 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Chainable Response in AppFramework | Thomas Tanghus | 2014-03-09 | 3 | -0/+40 |
* | | | class Test_Config is already declared | Thomas Müller | 2014-04-08 | 1 | -1/+1 |
* | | | unit test testSetAppValueIfSetToNull() added | Thomas Müller | 2014-04-07 | 1 | -0/+37 |
* | | | Merge pull request #7476 from owncloud/type-hinting | Thomas Müller | 2014-04-03 | 2 | -3/+6 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into type-hinting | Bart Visscher | 2014-03-31 | 19 | -39/+624 |
| |\ \ \ | |||||
| * | | | | More PHPDoc fixes, using scrutinizer patches as hints | Bart Visscher | 2014-02-28 | 2 | -3/+6 |
* | | | | | Merge pull request #7970 from owncloud/webdav-upload-hash | Thomas Müller | 2014-04-03 | 1 | -1/+20 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Fix uploading files containing a # in the path for webdav | Robin Appelman | 2014-03-31 | 1 | -1/+20 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop | Vincent Petry | 2014-04-02 | 2 | -2/+42 |
|\ \ \ \ | |||||
| * | | | | Correctly read the full stream in file_get_contents | Vincent Petry | 2014-04-01 | 2 | -2/+42 |
| |/ / / | |||||
* | | | | Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available | Thomas Müller | 2014-04-01 | 1 | -0/+9 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | idn_to_ascii is only used if available | Thomas Müller | 2014-03-26 | 1 | -0/+9 |
* | | | | Merge pull request #7824 from owncloud/hash-parameter-order | Thomas Müller | 2014-03-28 | 1 | -15/+32 |
|\ \ \ \ | |||||
| * | | | | Fix parameter order for Storage\Local::hash | Robin Appelman | 2014-03-20 | 1 | -15/+32 |
* | | | | | Merge pull request #7879 from owncloud/sharing_cleanup_public_api | Vincent Petry | 2014-03-28 | 1 | -6/+6 |
|\ \ \ \ \ | |||||
| * | | | | | always return an array | Bjoern Schiessle | 2014-03-25 | 1 | -6/+6 |
* | | | | | | Merge pull request #7613 from owncloud/fix_urlGenerator2 | Vincent Petry | 2014-03-28 | 1 | -3/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix unit tests | Thomas Tanghus | 2014-03-07 | 1 | -3/+27 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge pull request #7829 from owncloud/cachefolderlocation | Vincent Petry | 2014-03-28 | 1 | -0/+51 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added unit tests for external cache folder | Vincent Petry | 2014-03-24 | 1 | -0/+51 |
* | | | | | | | 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 | Bart Visscher | 2014-03-11 | 1 | -0/+1 |
* | | | | | | | Merge pull request #7420 from owncloud/cachehooks-first | Thomas Müller | 2014-03-25 | 1 | -5/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Merge branch 'master' into cachehooks-first | Robin Appelman | 2014-03-13 | 10 | -32/+385 |
| |\| | | | | | | |||||
| * | | | | | | | Manually triger the filecache update hooks before any other hook | Robin Appelman | 2014-02-26 | 1 | -5/+0 |
* | | | | | | | | Merge pull request #7477 from owncloud/foldersize-reuse | Thomas Müller | 2014-03-25 | 1 | -1/+0 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into foldersize-reuse | Robin Appelman | 2014-03-11 | 3 | -0/+266 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Remove assert since the root size of the home storage is no longer calculated | Robin Appelman | 2014-03-03 | 1 | -1/+0 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #7861 from owncloud/idn-domains-support-on-emails-master | Thomas Müller | 2014-03-25 | 1 | -0/+30 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | idn have to be converted before being used | Thomas Müller | 2014-03-24 | 1 | -0/+30 |
| | |_|_|/ / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #7714 from owncloud/phpunit-config | icewind1991 | 2014-03-24 | 1 | -2/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Allow setting the config dir to use as enviroment variable for phpunit | Robin Appelman | 2014-03-13 | 1 | -2/+7 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknown | Vincent Petry | 2014-03-20 | 1 | -0/+18 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Still return quota value when free space is unknown | Vincent Petry | 2014-03-19 | 1 | -0/+18 |
* | | | | | | Merge pull request #7732 from owncloud/datafolderexistence | Vincent Petry | 2014-03-20 | 2 | -0/+109 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Added .ocdata file to check for data folder validity | Vincent Petry | 2014-03-14 | 2 | -0/+109 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'master' into close-session-faster-master | Thomas Müller | 2014-03-17 | 4 | -7/+142 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge pull request #7649 from owncloud/routing-public | Thomas Müller | 2014-03-17 | 1 | -4/+4 |
| |\ \ \ \ \ | |||||
| | * | | | | | Move the router classes to a namespace and expose it with a public interface | Robin Appelman | 2014-03-10 | 1 | -4/+4 |
| * | | | | | | Merge pull request #7760 from owncloud/core-roundbytes | icewind1991 | 2014-03-17 | 1 | -1/+3 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Correctly round bytes when converted from human readable format | Vincent Petry | 2014-03-17 | 1 | -1/+3 |
| | | |/ / / / | | |/| | | | |