summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | | | | 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-281-1/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | 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-283-7/+49
|\ \ \ \ \ \ \
| * | | | | | | Remove unused setUserVars utility methodVincent Petry2014-03-261-11/+0
| * | | | | | | Cache folder is now configurableVincent Petry2014-03-243-7/+60
* | | | | | | | Merge pull request #7107 from owncloud/load-apps-proper-masterThomas Müller2014-03-283-23/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | all authentication apps are loaded at first - everything else relies on these...Thomas Müller2014-03-211-1/+2
| * | | | | | | Merge branch 'master' into load-apps-proper-masterThomas Müller2014-03-21240-2341/+3915
| |\ \ \ \ \ \ \
| * | | | | | | | Within OC:init() the minimum set of apps is loaded - which is filesystem, aut...Thomas Müller2014-02-062-13/+4
| * | | | | | | | remove some more global variable $RUNTIME_NOAPPSThomas Müller2014-02-062-8/+1
| * | | | | | | | remove global variable $RUNTIME_NOAPPS - it's just superfluousThomas Müller2014-02-061-2/+1
* | | | | | | | | Merge pull request #7902 from owncloud/ext-xsendfileextstoragefixVincent Petry2014-03-271-1/+2
|\ \ \ \ \ \ \ \ \