Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5678 from owncloud/fix-api-documentation | Thomas Müller | 2013-11-03 | 50 | -391/+842 |
|\ | | | | | Fix api documentation | ||||
| * | unify license headers for public API files | Morris Jobke | 2013-11-03 | 45 | -382/+676 |
| | | |||||
| * | fix "No page-level DocBlock" | Morris Jobke | 2013-11-03 | 23 | -9/+166 |
| | | |||||
* | | Merge pull request #5671 from owncloud/fixing-5668-master | Morris Jobke | 2013-11-03 | 2 | -2/+2 |
|\ \ | |/ |/| | replace template function link_to_docs() with \OC_Helper::linkToDocs() | ||||
| * | replace template function link_to_docs() with \OC_Helper::linkToDocs() | Thomas Mueller | 2013-11-02 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #4961 from owncloud/unshare-over-delete | Morris Jobke | 2013-11-03 | 2 | -54/+85 |
|\ \ | | | | | | | Use OCP\Share::unshare() instead of directly using OCP\Share::delete() | ||||
| * | | Always select item_source. | Andreas Fischer | 2013-11-03 | 1 | -3/+3 |
| | | | |||||
| * | | Deduplicate expiration date check into a method. | Andreas Fischer | 2013-11-03 | 1 | -15/+21 |
| | | | |||||
| * | | Use unshareItem() when unsharing expired shares. | Andreas Fischer | 2013-11-03 | 1 | -2/+2 |
| | | | |||||
| * | | Use unshareItem() in unshareAll(). | Andreas Fischer | 2013-11-03 | 1 | -1/+1 |
| | | | |||||
| * | | Extract unshare() code into unshareItem(). | Andreas Fischer | 2013-11-03 | 1 | -17/+1 |
| | | | |||||
| * | | OCP\Share::unshareAll(): Deduplicate hook parameters. | Andreas Fischer | 2013-11-03 | 1 | -8/+26 |
| | | | |||||
| * | | Add tests for OCP\Share::unshareAll(). | Andreas Fischer | 2013-11-03 | 1 | -10/+33 |
|/ / | |||||
* | | Merge pull request #5672 from owncloud/fixing-5668-master-2 | VicDeo | 2013-11-03 | 1 | -1/+1 |
|\ \ | |/ |/| | fixing Specified key was too long; max key length is 767 bytes | ||||
| * | fixing Specified key was too long; max key length is 767 bytes | Thomas Mueller | 2013-11-02 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #5652 from owncloud/front-port-5647-master | Thomas Müller | 2013-11-01 | 1 | -15/+26 |
|\ | | | | | [WIP] extend unit test to directories starting or ending in whitespace | ||||
| * | extend unit test to directories starting or ending in whitespace | Jörn Friedrich Dreyer | 2013-10-31 | 1 | -15/+26 |
| | | |||||
* | | Merge pull request #5443 from owncloud/fix-autoloader-caching | Bart Visscher | 2013-11-01 | 2 | -24/+33 |
|\ \ | | | | | | | Remove Autoloader Cache Hack. Do not use Cache on Install. | ||||
| * | | Allow null as cache parameter (if no cache was found) and for cache removal. | Andreas Fischer | 2013-10-22 | 1 | -1/+1 |
| | | | |||||
| * | | Only write-back on cache miss. | Andreas Fischer | 2013-10-22 | 1 | -3/+3 |
| | | | |||||
| * | | Only use autoloader cache when 'instanceid' is available. | Andreas Fischer | 2013-10-22 | 1 | -5/+9 |
| | | | |||||
| * | | Inject memoryCache into Autoloader. Remove recursion-prevention hack. | Andreas Fischer | 2013-10-22 | 2 | -28/+33 |
| | | | |||||
* | | | Merge pull request #5658 from owncloud/session-error-full-sentence | Morris Jobke | 2013-11-01 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | [Trivial] Make "Please contact your system administrator" a full sentence. | ||||
| * | | | Make "Please contact your system administrator" a full sentence. | Andreas Fischer | 2013-11-01 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #5653 from owncloud/fix-api-documentation | Morris Jobke | 2013-11-01 | 8 | -417/+413 |
|\ \ \ \ | |/ / / |/| | | | fix documentation stuff | ||||
| * | | | fix documentation stuff | Morris Jobke | 2013-10-31 | 8 | -417/+413 |
| | | | | |||||
* | | | | Merge pull request #5551 from owncloud/fix-5202-master | Morris Jobke | 2013-10-31 | 1 | -1/+5 |
|\ \ \ \ | | | | | | | | | | | When updating an appstore app, execute a database update | ||||
| * | | | | When updating an appstore app, execute a database update | Bart Visscher | 2013-10-25 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | See #5202 | ||||
* | | | | | Merge pull request #5637 from owncloud/fix_privatedata | Jörn Friedrich Dreyer | 2013-10-31 | 5 | -51/+265 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix privatedata | ||||
| * | | | | | Get rid of the SELECT query. Try UPDATE, on failure INSERT. | Andreas Fischer | 2013-10-31 | 1 | -8/+4 |
| | | | | | | |||||
| * | | | | | testing update and delete | Thomas Müller | 2013-10-31 | 1 | -0/+39 |
| | | | | | | |||||
| * | | | | | fixing undefined index in delete() | Thomas Müller | 2013-10-31 | 1 | -5/+7 |
| | | | | | | |||||
| * | | | | | adding unit tests for delete | Thomas Müller | 2013-10-31 | 1 | -0/+16 |
| | | | | | | |||||
| * | | | | | PHPDoc comment updated - checkLoggedIn() removed | Thomas Müller | 2013-10-31 | 1 | -9/+10 |
| | | | | | | |||||
| * | | | | | unit tests for set added | Thomas Müller | 2013-10-31 | 1 | -5/+38 |
| | | | | | | |||||
| * | | | | | no need to check if the user is logged in | Thomas Müller | 2013-10-31 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | fixing php notice: Undefined index key | Thomas Müller | 2013-10-31 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | first two tests | Thomas Müller | 2013-10-31 | 1 | -0/+53 |
| | | | | | | |||||
| * | | | | | no need to check if the user is logged in - this is already done in the ocs ↵ | Thomas Müller | 2013-10-31 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dispatcher itself adding @return | ||||
| * | | | | | Merge branch 'master' into fix_privatedata | Thomas Müller | 2013-10-31 | 8 | -61/+81 |
| |\ \ \ \ \ | |||||
| * | | | | | | increase version number to trigger db migration | Frank Karlitschek | 2013-10-30 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fix the privatedata key value store | Frank Karlitschek | 2013-10-30 | 3 | -43/+118 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #5591 from owncloud/home-storage | Jörn Friedrich Dreyer | 2013-10-31 | 4 | -2/+123 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Make home folders movable without requiring rescans | ||||
| * | | | | | | Merge branch 'master' into home-storage | Thomas Müller | 2013-10-30 | 738 | -6458/+15220 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | dont use the home storage for non-existing users | Robin Appelman | 2013-10-29 | 1 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | use the new home storage backend when no existing local storage backend ↵ | Robin Appelman | 2013-10-29 | 2 | -2/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exists for the user's home | ||||
| * | | | | | | | add specialized storage backend for home folders | Robin Appelman | 2013-10-29 | 2 | -0/+102 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #5648 from owncloud/files-fixhidecontrolsinviewermode | Morris Jobke | 2013-10-31 | 1 | -0/+3 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Corretly hide "no permissions" message in controls in viewer mode | ||||
| * | | | | | | | | Corretly hide "no permissions" message in controls in viewer mode | Vincent Petry | 2013-10-31 | 1 | -0/+3 |
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes #5622 | ||||
* | | | | | | | | prefer closest over parent | Jörn Friedrich Dreyer | 2013-10-31 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | closest will search up the tree |