summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-3112-12/+12
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-3018-53/+57
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-2917-110/+113
* Merge pull request #7845 from duritong/fix_submodule_urlThomas Müller2014-03-281-1/+1
|\
| * use https as submodule urlmh2014-03-211-1/+1
* | Merge pull request #7932 from owncloud/update-phpdoc-statement-wrapper-masterMorris Jobke2014-03-281-3/+11
|\ \
| * | adding @method annotation to declare methods which can be called on the wrapp...Thomas Müller2014-03-281-3/+11
* | | Merge pull request #7934 from owncloud/addEventToExpirationDateVincent Petry2014-03-281-1/+8
|\ \ \
| * | | Emit event after setting a new expiration for a shareMorris Jobke2014-03-281-1/+8
* | | | Merge pull request #7770 from jamesryanbell/masterMorris Jobke2014-03-281-2/+2
|\ \ \ \
| * | | | SVG support detectionjamesryanbell2014-03-171-2/+2
* | | | | Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_failsBjörn Schießle2014-03-281-0/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | don't write file if opening a stream to encrypt the data failsBjoern Schiessle2014-03-281-0/+2
* | | | | Merge pull request #7824 from owncloud/hash-parameter-orderThomas Müller2014-03-284-19/+35
|\ \ \ \ \
| * | | | | fix temporary file based common hashRobin Appelman2014-03-211-2/+1
| * | | | | Fix parameter order for Storage\Local::hashRobin Appelman2014-03-203-17/+34
* | | | | | Merge pull request #7879 from owncloud/sharing_cleanup_public_apiVincent Petry2014-03-288-1706/+2026
|\ \ \ \ \ \
| * | | | | | finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-252-3/+88
| * | | | | | fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-252-85/+7
| * | | | | | don't assign variables in if conditionBjoern Schiessle2014-03-251-18/+17
| * | | | | | add todoBjoern Schiessle2014-03-251-1/+1
| * | | | | | always return an arrayBjoern Schiessle2014-03-252-17/+10
| * | | | | | seperate formatResults()Bjoern Schiessle2014-03-251-18/+31
| * | | | | | don't assign variables in if conditionsBjoern Schiessle2014-03-251-2/+4
| * | | | | | use variableBjoern Schiessle2014-03-251-6/+5
| * | | | | | seperate transformDBResultsBjoern Schiessle2014-03-251-24/+33
| * | | | | | seperate creation of select statementBjoern Schiessle2014-03-251-38/+44
| * | | | | | remove prepFileTarget() seems that it is no longer in useBjoern Schiessle2014-03-252-27/+0
| * | | | | | add a "helper" and a "hooks" class. Move constants needed by multiple classesBjoern Schiessle2014-03-256-355/+377
| * | | | | | added private share apiBjoern Schiessle2014-03-252-1647/+1944
* | | | | | | Merge pull request #7613 from owncloud/fix_urlGenerator2Vincent Petry2014-03-282-4/+29
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix unit testsThomas Tanghus2014-03-071-3/+27
| * | | | | | Add \OC:: to URLGenerator::getAbsoluteURL()Thomas Tanghus2014-03-061-1/+2
* | | | | | | Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction ena...Thomas Müller2014-03-281-4/+45
* | | | | | | Merge pull request #7829 from owncloud/cachefolderlocationVincent Petry2014-03-285-9/+111
|\ \ \ \ \ \ \
| * | | | | | | Remove unused setUserVars utility methodVincent Petry2014-03-261-11/+0
| * | | | | | | Added unit tests for external cache folderVincent Petry2014-03-241-0/+51
| * | | | | | | Cache folder is now configurableVincent Petry2014-03-244-9/+71
* | | | | | | | Merge pull request #7703 from rnveach/jstestThomas Müller2014-03-282-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | added missing packages required to run "karma" and "phantomjs" insidernveach2014-03-121-1/+3
| * | | | | | | | added missing ignores for files and directories created by "autotest-js"rnveach2014-03-121-0/+5
* | | | | | | | | Merge pull request #7678 from owncloud/test-bootstrap-fileproxy-cleanupVincent Petry2014-03-281-0/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Cleanup the fileproxy proxies on test bootstrapBart Visscher2014-03-111-0/+1
* | | | | | | | | Merge pull request #7872 from owncloud/trash-disablestoragestatsBjörn Schießle2014-03-281-0/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not retrieve storage stats for trash binVincent Petry2014-03-281-0/+5
* | | | | | | | | | Merge pull request #7842 from Xenopathic/files_external_config_optionalRobin McCorkell2014-03-282-17/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Insert missing braceRobin McCorkell2014-03-241-3/+3
| * | | | | | | | | | Enable the use of 'optional' on password fields (JavaScript part)Robin McCorkell2014-03-211-8/+13
| * | | | | | | | | | Correct field modifier checkingRobin McCorkell2014-03-201-3/+3
| * | | | | | | | | | Enable the use of 'optional' on password fieldsRobin McCorkell2014-03-201-7/+10