aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7476 from owncloud/type-hintingThomas Müller2014-04-0315-32/+26
|\
| * Merge branch 'master' into type-hintingBart Visscher2014-03-31132-3136/+3938
| |\
| * | More PHPDoc updatesBart Visscher2014-02-284-7/+8
| * | Type is with a small letterBart Visscher2014-02-281-1/+1
| * | More PHPDoc fixes, using scrutinizer patches as hintsBart Visscher2014-02-2810-19/+14
| * | Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10NBart Visscher2014-02-284-27/+26
* | | Merge pull request #8006 from wakeup/masterMorris Jobke2014-04-021-1/+1
|\ \ \
| * | | Fix admin-dir_permissions redirection when cannot write warningVolkan Gezer2014-04-021-1/+1
* | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabledMorris Jobke2014-04-021-3/+3
|\ \ \ \
| * | | | always encrypt files to ownerBjoern Schiessle2014-03-311-3/+3
| | |_|/ | |/| |
* | | | Merge pull request #7968 from owncloud/core-overwritewebrootwithrootVincent Petry2014-04-021-2/+3
|\ \ \ \
| * | | | Allow using "/" in "overwritewebroot"Vincent Petry2014-03-311-2/+3
| |/ / /
* | | | Merge pull request #7979 from owncloud/core-fixfilegetcontentsloopVincent Petry2014-04-021-6/+6
|\ \ \ \
| * | | | Added missing fclose in file_get_contents and file_put_contentsVincent Petry2014-04-011-1/+4
| * | | | Correctly read the full stream in file_get_contentsVincent Petry2014-04-011-5/+2
| |/ / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-022-1/+7
* | | | Merge pull request #7884 from owncloud/use-idn_to_ascii-if-availableThomas Müller2014-04-011-0/+3
|\ \ \ \
| * | | | idn_to_ascii is only used if availableThomas Müller2014-03-261-0/+3
* | | | | Merge pull request #7935 from owncloud/getpath-sharedVincent Petry2014-04-012-6/+31
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Improve phpdocRobin Appelman2014-03-311-1/+3
| * | | | Give storages the option to implement the getById behaviour for View->getPathRobin Appelman2014-03-282-6/+29
* | | | | Merge pull request #7696 from owncloud/chunk-remainingspacefixVincent Petry2014-04-012-3/+48
|\ \ \ \ \
| * | | | | Fixed chunking and insufficient storage checkVincent Petry2014-03-172-3/+48
* | | | | | Merge pull request #7975 from owncloud/fix-7973-master-2Vincent Petry2014-04-011-5/+0
|\ \ \ \ \ \
| * | | | | | remove pl_PL - fixes #7973Thomas Müller2014-03-311-5/+0
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #7966 from owncloud/url_generation_hackMorris Jobke2014-04-011-1/+6
|\ \ \ \ \ \
| * | | | | | Check if web root has already been appendedThomas Tanghus2014-03-311-1/+6
| |/ / / / /
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-012-0/+3
* | | | | | select statement always need to contain file_source respectively item_sourceBjoern Schiessle2014-03-311-2/+2
|/ / / / /
* | | | | Merge pull request #7939 from owncloud/wring_redirect_on_loginVincent Petry2014-03-312-6/+6
|\ \ \ \ \
| * | | | | Sub-dir was prepended twiceThomas Tanghus2014-03-291-1/+1
| * | | | | Sub-dir was prepended twiceThomas Tanghus2014-03-291-2/+1
| * | | | | Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936Thomas Tanghus2014-03-281-4/+5
* | | | | | 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
* | | | | | Emit event after setting a new expiration for a shareMorris Jobke2014-03-281-1/+8
* | | | | | Merge pull request #7824 from owncloud/hash-parameter-orderThomas Müller2014-03-283-4/+3
|\ \ \ \ \ \
| * | | | | | fix temporary file based common hashRobin Appelman2014-03-211-2/+1
| * | | | | | Fix parameter order for Storage\Local::hashRobin Appelman2014-03-202-2/+2
* | | | | | | Merge pull request #7879 from owncloud/sharing_cleanup_public_apiVincent Petry2014-03-286-1699/+2019
|\ \ \ \ \ \ \
| * | | | | | | finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-251-2/+4
| * | | | | | | fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-251-2/+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-251-11/+4
| * | | | | | | 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