Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 | mh | 2014-03-21 | 1 | -1/+1 |
* | | 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 wrapp... | Thomas Müller | 2014-03-28 | 1 | -3/+11 |
* | | | 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 | Morris Jobke | 2014-03-28 | 1 | -1/+8 |
* | | | | Merge pull request #7770 from jamesryanbell/master | Morris Jobke | 2014-03-28 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | SVG support detection | jamesryanbell | 2014-03-17 | 1 | -2/+2 |
* | | | | | 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 | 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 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 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
| * | | | | | | 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 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | 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 ena... | Thomas Müller | 2014-03-28 | 1 | -4/+45 |
* | | | | | | | Merge pull request #7829 from owncloud/cachefolderlocation | Vincent Petry | 2014-03-28 | 5 | -9/+111 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove unused setUserVars utility method | Vincent Petry | 2014-03-26 | 1 | -11/+0 |
| * | | | | | | | 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 |
* | | | | | | | | Merge pull request #7703 from rnveach/jstest | Thomas Müller | 2014-03-28 | 2 | -1/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | added missing packages required to run "karma" and "phantomjs" inside | rnveach | 2014-03-12 | 1 | -1/+3 |
| * | | | | | | | | 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 | 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 | Vincent Petry | 2014-03-28 | 1 | -0/+5 |
* | | | | | | | | | | Merge pull request #7842 from Xenopathic/files_external_config_optional | Robin McCorkell | 2014-03-28 | 2 | -17/+25 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Insert missing brace | Robin McCorkell | 2014-03-24 | 1 | -3/+3 |
| * | | | | | | | | | | Enable the use of 'optional' on password fields (JavaScript part) | Robin McCorkell | 2014-03-21 | 1 | -8/+13 |
| * | | | | | | | | | | Correct field modifier checking | Robin McCorkell | 2014-03-20 | 1 | -3/+3 |
| * | | | | | | | | | | Enable the use of 'optional' on password fields | Robin McCorkell | 2014-03-20 | 1 | -7/+10 |