Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into type-hinting | Bart Visscher | 2014-03-31 | 63 | -1115/+3277 |
|\ | |||||
| * | 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 | 4 | -0/+1966 |
| |\ \ \ | |||||
| | * | | | 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 |
| | * | | | 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:: 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 | 2 | -5/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into load-apps-proper-master | Thomas Müller | 2014-03-21 | 144 | -1912/+2785 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Within OC:init() the minimum set of apps is loaded - which is filesystem, aut... | Thomas Müller | 2014-02-06 | 1 | -2/+0 |
| | * | | | | | | remove some more global variable $RUNTIME_NOAPPS | Thomas Müller | 2014-02-06 | 1 | -3/+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 | Vincent Petry | 2014-03-26 | 1 | -1/+2 |
| * | | | | | | | | 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 | Thomas Müller | 2014-03-26 | 1 | -1/+1 |
| * | | | | | | | | fix undefined index warning in router | Robin Appelman | 2014-03-26 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge pull request #7748 from owncloud/postgresversionwarning | Thomas Müller | 2014-03-25 | 1 | -0/+35 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | 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 | 3 | -22/+102 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | 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 |
| | * | | | | | | | | Only load core routes for ocs and settings | Robin Appelman | 2014-03-25 | 1 | -1/+2 |
| | * | | | | | | | | Only load core routes when matching a core route | Robin Appelman | 2014-03-24 | 1 | -3/+5 |
| | * | | | | | | | | Cache generated urls for routes | Robin Appelman | 2014-03-24 | 1 | -0/+43 |