Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Correctly read the full stream in file_get_contents | Vincent Petry | 2014-04-01 | 1 | -5/+2 |
| | | | | | | | | | | | When using user-defined stream wrappers, PHP will return a maximum of 8192 bytes even if more was requested. This fix uses stream_get_contents to make sure the full stream is read and not only the first 8 KB. Added unit test with a bigger test file to cover this case. | ||||
* | Merge pull request #7939 from owncloud/wring_redirect_on_login | Vincent Petry | 2014-03-31 | 2 | -6/+6 |
|\ | | | | | Use UrlGenerator in OC\Util::redirectToDefaultPage(). Fix #7936 | ||||
| * | 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 ... | ||||
| * | adding @method annotation to declare methods which can be called on the ↵ | Thomas Müller | 2014-03-28 | 1 | -3/+11 |
| | | | | | | | | wrapped statement object | ||||
* | | Emit event after setting a new expiration for a share | Morris Jobke | 2014-03-28 | 1 | -1/+8 |
| | | | | | | | | | | all credits to @frisco82 https://github.com/owncloud/core/pull/5335 | ||||
* | | Merge pull request #7824 from owncloud/hash-parameter-order | Thomas Müller | 2014-03-28 | 3 | -4/+3 |
|\ \ | | | | | | | Fix parameter order for Storage\Local::hash | ||||
| * | | 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 |
|\ \ \ | | | | | | | | | sharing api cleanup, first step | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | to a "constants" class | ||||
| * | | | 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::$WEBROOT to URLGenerator::getAbsoluteURL() | ||||
| * | | | Add \OC:: to URLGenerator::getAbsoluteURL() | Thomas Tanghus | 2014-03-06 | 1 | -1/+2 |
| | | | | |||||
* | | | | Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction ↵ | Thomas Müller | 2014-03-28 | 1 | -4/+45 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled. Squashed commit of the following: commit eaf4f43f687db59137a0b00bc0e12ed4eb0d0943 Merge: 1e9c5be 1e7d7bd Author: Thomas Müller <thomas.mueller@tmit.eu> Date: Fri Mar 28 11:49:04 2014 +0100 Merge branch 'master' of https://github.com/kev300/core into kev300-master commit 1e7d7bdd8b5c7f301501cb822cdf2ef0ad3f2872 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:11:42 2013 +0100 Update util.php commit 3f0723f054a27a506be7f26932ccb54fff6f2be9 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:09:15 2013 +0100 Update util.php commit 512176abdcfbe5b2b060b91033abc9608912d1f8 Author: kev300 <admin@gadeco.de> Date: Tue Dec 17 14:02:04 2013 +0100 Update util.php commit 6cbefd080188d287024e0b047b88dd4525d6c2c1 Author: kev300 <admin@gadeco.de> Date: Mon Dec 16 16:44:46 2013 +0100 Update util.php Fix CURLOPT_FOLLOWLOCATION bug with open_basedir or safe_mode restriction enabled. | ||||
* | | | | Merge pull request #7829 from owncloud/cachefolderlocation | Vincent Petry | 2014-03-28 | 3 | -7/+49 |
|\ \ \ \ | | | | | | | | | | | Cache folder is now configurable | ||||
| * | | | | Remove unused setUserVars utility method | Vincent Petry | 2014-03-26 | 1 | -11/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | That method was moved to the external storage recently so isn't needed here any more. | ||||
| * | | | | Cache folder is now configurable | Vincent Petry | 2014-03-24 | 3 | -7/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using an external cache folder, it is automatically mounted in FileSystem::initFileSystem so that any app can use it transparently by creating a view on the "/$user/cache" directory. | ||||
* | | | | | Merge pull request #7107 from owncloud/load-apps-proper-master | Thomas Müller | 2014-03-28 | 3 | -23/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Load apps proper master | ||||
| * | | | | | all authentication apps are loaded at first - everything else relies on ↵ | Thomas Müller | 2014-03-21 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | these apps | ||||
| * | | | | | Merge branch 'master' into load-apps-proper-master | Thomas Müller | 2014-03-21 | 240 | -2341/+3915 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/ajax/rawlist.php cron.php ocs/v1.php | ||||
| * | | | | | | Within OC:init() the minimum set of apps is loaded - which is filesystem, ↵ | Thomas Müller | 2014-02-06 | 2 | -13/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | authentication and logging | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use the correct resolve method to resolve file storage (x-sendfile) | ||||
| * | | | | | | | Use the correct resolve method to resolve file storage | Vincent Petry | 2014-03-26 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When detecting whether the file to be downloaded is on external storage, the correct path needs to be used. It turns out that \OC\Files\View is needed to resolve the path correctly relative to the user's home. | ||||
* | | | | | | | | Merge pull request #7893 from owncloud/no-routed-link-for-css-files | Thomas Müller | 2014-03-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | css files are not to be routed through index.php anymore | ||||
| * | | | | | | | css files are not to be routed through index.php anymore | Thomas Müller | 2014-03-26 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | fix undefined index warning in router | Robin Appelman | 2014-03-26 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-26 | 1 | -0/+8 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #7748 from owncloud/postgresversionwarning | Thomas Müller | 2014-03-25 | 1 | -0/+35 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added PostgreSQL version warning on upgrade | ||||
| * | | | | | | | fixing code style | Thomas Müller | 2014-03-25 | 1 | -2/+1 |
| | | | | | | | | |||||
| * | | | | | | | Log exception when PostgreSQL version check failed | Vincent Petry | 2014-03-24 | 1 | -1/+3 |
| | | | | | | | | |||||
| * | | | | | | | Added PostgreSQL version warning on upgrade | Vincent Petry | 2014-03-17 | 1 | -0/+34 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #7864 from owncloud/routing-performance | Thomas Müller | 2014-03-25 | 4 | -25/+103 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Routing performance | ||||
| * | | | | | | | | Fix routes getting lost when loading app routes twice | Robin Appelman | 2014-03-25 | 1 | -7/+9 |
| | | | | | | | | | |||||
| * | | | | | | | | fix incorect array | Robin Appelman | 2014-03-25 | 1 | -1/+1 |
| | | | | | | | | |