Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | delay middleware registrations | Thomas Müller | 2013-09-27 | 1 | -4/+9 |
| | |||||
* | fixing error in initialization of TagManager | Thomas Müller | 2013-09-27 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-27 | 8 | -42/+48 |
|\ | |||||
| * | Merge pull request #4207 from owncloud/search_shared_files | Thomas Müller | 2013-09-27 | 1 | -3/+3 |
| |\ | | | | | | | add initial search in shared files | ||||
| | * | adding PHPDoc comments to getBackend | Thomas Müller | 2013-09-24 | 1 | -2/+2 |
| | | | | | | | | | | | | ensure getChildren() is called on an instance of Share_Backend_Collection | ||||
| | * | add initial search in shared files | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #5001 from owncloud/fixing-user-external-backends-master | Morris Jobke | 2013-09-27 | 1 | -0/+1 |
| |\ \ | | | | | | | | | prelogin apps have to be loaded within setupBackend() otherwise required... | ||||
| | * | | prelogin apps have to be loaded within setupBackend() otherwise required ↵ | Thomas Müller | 2013-09-26 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | classes cannot be loaded | ||||
| * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-27 | 1 | -0/+3 |
| | | | | |||||
| * | | | manager checkPassword now returns User object, adjust internal user class ↵ | Arthur Schiwon | 2013-09-25 | 1 | -1/+1 |
| |/ / | | | | | | | | | | accordingly. | ||||
| * | | Merge pull request #4968 from owncloud/user_checkpwd | Thomas Müller | 2013-09-25 | 6 | -39/+41 |
| |\ \ | | | | | | | | | User: move checkPassword from User to Manager to not break API | ||||
| | * | | Adjust Tests and satisfy them | Arthur Schiwon | 2013-09-24 | 1 | -4/+6 |
| | | | | |||||
| | * | | Fix doc | Arthur Schiwon | 2013-09-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix return value from User object to User ID | Arthur Schiwon | 2013-09-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | === not == | Arthur Schiwon | 2013-09-24 | 1 | -1/+1 |
| | | | | |||||
| | * | | User: move checkPassword from User to Manager to not break API | Arthur Schiwon | 2013-09-24 | 6 | -38/+38 |
| | | | | |||||
* | | | | Merge pull request #4892 from owncloud/vcategories_public | Thomas Müller | 2013-09-25 | 7 | -822/+945 |
|\ \ \ \ | | | | | | | | | | | OC_VCategories => OC\Tags. Public interface and getter in server container | ||||
| * | | | | Add factory class for the server container. | Thomas Tanghus | 2013-09-24 | 6 | -19/+140 |
| | | | | | |||||
| * | | | | Fix conflict | Thomas Tanghus | 2013-09-23 | 1 | -3/+4 |
| |\ \ \ \ | |||||
| | * | | | | Use fetchOne() instead of numRows() when doing a COUNT(*). | Thomas Tanghus | 2013-09-23 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Forgot to return false if add() didn't add anything. | Thomas Tanghus | 2013-09-23 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Added more error checking in add() | Thomas Tanghus | 2013-09-23 | 1 | -5/+13 |
| | | | | | | |||||
| | * | | | | Updated method names and added a few more tests. | Thomas Tanghus | 2013-09-19 | 2 | -9/+9 |
| | | | | | | |||||
| | * | | | | fixing namespaces and rename hasCategory to hasTag | Thomas Müller | 2013-09-18 | 1 | -9/+9 |
| | | | | | | |||||
| | * | | | | Merge branch 'appframework-master' into vcategories_public | Thomas Müller | 2013-09-18 | 17 | -94/+311 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/server.php | ||||
| | * | | | | | OC_VCategories=>OC\Tags. Public interface + getter in server container | Thomas Tanghus | 2013-09-18 | 5 | -833/+813 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'appframework-master' into vcategories_public | Thomas Tanghus | 2013-09-17 | 93 | -483/+6833 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | More trimming | Thomas Tanghus | 2013-09-04 | 1 | -3/+15 |
| | | | | | | | | |||||
| * | | | | | | | Use fetchOne() instead of numRows() when doing a COUNT(*). | Thomas Tanghus | 2013-09-23 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Forgot to return false if add() didn't add anything. | Thomas Tanghus | 2013-09-23 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | Added more error checking in add() | Thomas Tanghus | 2013-09-23 | 1 | -5/+13 |
| | | | | | | | | |||||
| * | | | | | | | Updated method names and added a few more tests. | Thomas Tanghus | 2013-09-23 | 2 | -9/+9 |
| | | | | | | | | |||||
| * | | | | | | | fixing namespaces and rename hasCategory to hasTag | Thomas Müller | 2013-09-23 | 1 | -9/+9 |
| | | | | | | | | |||||
| * | | | | | | | OC_VCategories=>OC\Tags. Public interface + getter in server container | Thomas Tanghus | 2013-09-23 | 5 | -835/+815 |
| | | | | | | | | |||||
| * | | | | | | | More trimming | Thomas Tanghus | 2013-09-23 | 1 | -3/+15 |
| | | | | | | | | |||||
* | | | | | | | | stripos return value check | Thomas Müller | 2013-09-25 | 1 | -1/+1 |
| | | | | | | | | |||||
* | | | | | | | | class API decommissioning part 1 | Thomas Müller | 2013-09-25 | 2 | -285/+21 |
| | | | | | | | | |||||
* | | | | | | | | AppFramework: | Thomas Müller | 2013-09-25 | 2 | -25/+37 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - get request from the server container - implement registerMiddleWare() - adding getAppName() to app container | ||||
* | | | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-25 | 31 | -110/+478 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php | ||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-24 | 1 | -0/+2 |
| | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData). | Andreas Fischer | 2013-09-24 | 1 | -27/+27 |
| | | | | | | | |||||
| * | | | | | | clear permissions cache when scanning a file | Robin Appelman | 2013-09-24 | 1 | -3/+12 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #4869 from owncloud/fixing-4866-master | Thomas Müller | 2013-09-23 | 2 | -2/+25 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | recreate an etag within the scanner if the cache contains an empty etag | ||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'owncloud/master' into fixing-4866-master | Andreas Fischer | 2013-09-23 | 29 | -99/+424 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * owncloud/master: (98 commits) [tx-robot] updated from transifex files: when filtering search results, ensure results are children of the fakeroot not just path starting the same setting a default on filecache column unencrypted_size [tx-robot] updated from transifex remove unneccessary lib in namespace namespaces use upcasefirst parts when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic! initialize variable calculate correct permissions while toggle the password protection make sure that both $permissions and $oldPermissions have the same type Add copyright, remove starting blank line update inherit docs comment Fix insert/update/delete helper functions for oracle Add missing return true statements to legacy preferences functions Add missing static Convert OC_Preference to object interface fix race condition in lazy preview loading use {count} instead of 'One' for more versatile translation fix double translation of error message use n to translate title fixing typos and l10n ... Conflicts: tests/lib/files/cache/scanner.php | ||||
| | * | | | | | | | Move bool to int conversion to buildParts(), so it also happens for update(). | Andreas Fischer | 2013-09-21 | 1 | -1/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Only update the etag. Do not re-submit any other unchanged data. | Andreas Fischer | 2013-09-20 | 1 | -2/+3 |
| | | | | | | | | | |||||
| | * | | | | | | | Use update() instead of put(). | Andreas Fischer | 2013-09-20 | 1 | -3/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | when storing back the data field 'encrypted' it is necessary to cast the ↵ | Thomas Müller | 2013-09-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boolean to an integer to make pg happy | ||||
| | * | | | | | | | etag changes are now propagated up the file tree | Thomas Müller | 2013-09-16 | 1 | -0/+14 |
| | | | | | | | | | |||||
| | * | | | | | | | recreate an etag within the scanner if the cache contains an empty etag | Thomas Müller | 2013-09-16 | 1 | -1/+7 |
| | | | | | | | | |