| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #8006 from wakeup/master | Morris Jobke | 2014-04-02 | 1 | -1/+1 |
| |\ | | | | | Fix admin-dir_permissions redirection when cannot write warning is shown. | ||||
| | * | Fix admin-dir_permissions redirection when cannot write warning | Volkan Gezer | 2014-04-02 | 1 | -1/+1 |
| | | | | | | | | | is shown. | ||||
| * | | Merge pull request #7968 from owncloud/core-overwritewebrootwithroot | Vincent Petry | 2014-04-02 | 1 | -2/+3 |
| |\ \ | | | | | | | Allow using "/" in "overwritewebroot" | ||||
| | * | | Allow using "/" in "overwritewebroot" | Vincent Petry | 2014-03-31 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | Whenever the reverse proxy is using "/" as the webroot, it is now possible to set that value in "overwritewebroot" | ||||
| * | | | Merge pull request #7979 from owncloud/core-fixfilegetcontentsloop | Vincent Petry | 2014-04-02 | 1 | -6/+6 |
| |\ \ \ | | | | | | | | | Correctly read the full stream in file_get_contents | ||||
| | * | | | Added missing fclose in file_get_contents and file_put_contents | Vincent Petry | 2014-04-01 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | 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 #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 | ||||
| | * | | | 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 |
| |\ \ \ \ | |_|_|/ |/| | | | Make getPath work for shared files | ||||
| | * | | | 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 | ||||
| | * | | | | Fixed chunking and insufficient storage check | Vincent Petry | 2014-03-17 | 2 | -3/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed free space detection based on the already uploaded chunks - now deleting chunks as soon as it is read out before writing it into the part file, which reduces the space needed when assembling part files | ||||
| * | | | | | 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 | ||||
| | * | | | | | Check if web root has already been appended | Thomas Tanghus | 2014-03-31 | 1 | -1/+6 |
| | | |_|_|/ | |/| | | | |||||
| * / | | | | 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 |
| |\ \ \ \ | | | | | | | | | | | 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 | 4 | -0/+1966 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | 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 | 1 | -18/+0 |
| | | | | | | | | |||||
| | * | | | | | | add a "helper" and a "hooks" class. Move constants needed by multiple classes | Bjoern Schiessle | 2014-03-25 | 4 | -302/+372 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to a "constants" class | ||||
| | * | | | | | | added private share api | Bjoern Schiessle | 2014-03-25 | 1 | -0/+1886 |
| | | | | | | | | |||||
| * | | | | | | | 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 | 2 | -5/+1 |
| |\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | Load apps proper master | ||||
| | * | | | | | | | Merge branch 'master' into load-apps-proper-master | Thomas Müller | 2014-03-21 | 144 | -1912/+2785 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | authentication and logging | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |