Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available | Thomas Müller | 2014-04-01 | 1 | -0/+3 |
|\ | |||||
| * | idn_to_ascii is only used if available | Thomas Müller | 2014-03-26 | 1 | -0/+3 |
* | | Merge pull request #7935 from owncloud/getpath-shared | Vincent Petry | 2014-04-01 | 2 | -6/+31 |
|\ \ | |||||
| * | | Improve phpdoc | Robin Appelman | 2014-03-31 | 1 | -1/+3 |
| * | | Give storages the option to implement the getById behaviour for View->getPath | Robin Appelman | 2014-03-28 | 2 | -6/+29 |
* | | | Merge pull request #7696 from owncloud/chunk-remainingspacefix | Vincent Petry | 2014-04-01 | 2 | -3/+48 |
|\ \ \ | |||||
| * | | | Fixed chunking and insufficient storage check | Vincent Petry | 2014-03-17 | 2 | -3/+48 |
* | | | | Merge pull request #7975 from owncloud/fix-7973-master-2 | Vincent Petry | 2014-04-01 | 1 | -5/+0 |
|\ \ \ \ | |||||
| * | | | | remove pl_PL - fixes #7973 | Thomas Müller | 2014-03-31 | 1 | -5/+0 |
* | | | | | Merge pull request #7966 from owncloud/url_generation_hack | Morris Jobke | 2014-04-01 | 1 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Check if web root has already been appended | Thomas Tanghus | 2014-03-31 | 1 | -1/+6 |
| |/ / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-01 | 2 | -0/+3 |
* | | | | | select statement always need to contain file_source respectively item_source | Bjoern Schiessle | 2014-03-31 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #7939 from owncloud/wring_redirect_on_login | Vincent Petry | 2014-03-31 | 2 | -6/+6 |
|\ \ \ \ | |||||
| * | | | | Sub-dir was prepended twice | Thomas Tanghus | 2014-03-29 | 1 | -1/+1 |
| * | | | | Sub-dir was prepended twice | Thomas Tanghus | 2014-03-29 | 1 | -2/+1 |
| * | | | | Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936 | Thomas Tanghus | 2014-03-28 | 1 | -4/+5 |
* | | | | | 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 |
* | | | | | Emit event after setting a new expiration for a share | Morris Jobke | 2014-03-28 | 1 | -1/+8 |
* | | | | | Merge pull request #7824 from owncloud/hash-parameter-order | Thomas Müller | 2014-03-28 | 3 | -4/+3 |
|\ \ \ \ \ | |||||
| * | | | | | 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 | 2 | -2/+2 |
* | | | | | | Merge pull request #7879 from owncloud/sharing_cleanup_public_api | Vincent Petry | 2014-03-28 | 6 | -1699/+2019 |
|\ \ \ \ \ \ | |||||
| * | | | | | | finally fix the paths for the OCS Share API | Bjoern Schiessle | 2014-03-25 | 1 | -2/+4 |
| * | | | | | | fix path creation for re-shares, issue #7662 | Bjoern Schiessle | 2014-03-25 | 1 | -2/+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 | 1 | -11/+4 |
| * | | | | | | 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 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | 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 | 3 | -7/+49 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove unused setUserVars utility method | Vincent Petry | 2014-03-26 | 1 | -11/+0 |
| * | | | | | | | Cache folder is now configurable | Vincent Petry | 2014-03-24 | 3 | -7/+60 |
* | | | | | | | | Merge pull request #7107 from owncloud/load-apps-proper-master | Thomas Müller | 2014-03-28 | 3 | -23/+7 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | all authentication apps are loaded at first - everything else relies on these... | Thomas Müller | 2014-03-21 | 1 | -1/+2 |
| * | | | | | | | Merge branch 'master' into load-apps-proper-master | Thomas Müller | 2014-03-21 | 240 | -2341/+3915 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Within OC:init() the minimum set of apps is loaded - which is filesystem, aut... | Thomas Müller | 2014-02-06 | 2 | -13/+4 |
| * | | | | | | | | remove some more global variable $RUNTIME_NOAPPS | Thomas Müller | 2014-02-06 | 2 | -8/+1 |
| * | | | | | | | | remove global variable $RUNTIME_NOAPPS - it's just superfluous | Thomas Müller | 2014-02-06 | 1 | -2/+1 |
* | | | | | | | | | Merge pull request #7902 from owncloud/ext-xsendfileextstoragefix | Vincent Petry | 2014-03-27 | 1 | -1/+2 |
|\ \ \ \ \ \ \ \ \ |