summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into type-hintingBart Visscher2014-03-3163-1115/+3277
|\
| * 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-284-0/+1966
| |\ \ \
| | * | | 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-251-18/+0
| | * | | add a "helper" and a "hooks" class. Move constants needed by multiple classesBjoern Schiessle2014-03-254-302/+372
| | * | | added private share apiBjoern Schiessle2014-03-251-0/+1886
| * | | | 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-282-5/+1
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' into load-apps-proper-masterThomas Müller2014-03-21144-1912/+2785
| | |\ \ \ \ \
| | * | | | | | Within OC:init() the minimum set of apps is loaded - which is filesystem, aut...Thomas Müller2014-02-061-2/+0
| | * | | | | | remove some more global variable $RUNTIME_NOAPPSThomas Müller2014-02-061-3/+1
| * | | | | | | Merge pull request #7902 from owncloud/ext-xsendfileextstoragefixVincent Petry2014-03-271-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Use the correct resolve method to resolve file storageVincent Petry2014-03-261-1/+2
| * | | | | | | | Merge pull request #7893 from owncloud/no-routed-link-for-css-filesThomas Müller2014-03-261-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | css files are not to be routed through index.php anymoreThomas Müller2014-03-261-1/+1
| * | | | | | | | fix undefined index warning in routerRobin Appelman2014-03-261-1/+1
| |/ / / / / / /
| * | | | | | | Merge pull request #7748 from owncloud/postgresversionwarningThomas Müller2014-03-251-0/+35
| |\ \ \ \ \ \ \
| | * | | | | | | fixing code styleThomas Müller2014-03-251-2/+1
| | * | | | | | | Log exception when PostgreSQL version check failedVincent Petry2014-03-241-1/+3
| | * | | | | | | Added PostgreSQL version warning on upgradeVincent Petry2014-03-171-0/+34
| * | | | | | | | Merge pull request #7864 from owncloud/routing-performanceThomas Müller2014-03-253-22/+102
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix routes getting lost when loading app routes twiceRobin Appelman2014-03-251-7/+9
| | * | | | | | | | fix incorect arrayRobin Appelman2014-03-251-1/+1
| | * | | | | | | | Only load core routes for ocs and settingsRobin Appelman2014-03-251-1/+2
| | * | | | | | | | Only load core routes when matching a core routeRobin Appelman2014-03-241-3/+5
| | * | | | | | | | Cache generated urls for routesRobin Appelman2014-03-241-0/+43