summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* delay middleware registrationsThomas Müller2013-09-271-4/+9
|
* fixing error in initialization of TagManagerThomas Müller2013-09-271-1/+1
|
* Merge branch 'master' into appframework-masterThomas Müller2013-09-278-42/+48
|\
| * Merge pull request #4207 from owncloud/search_shared_filesThomas Müller2013-09-271-3/+3
| |\ | | | | | | add initial search in shared files
| | * adding PHPDoc comments to getBackendThomas Müller2013-09-241-2/+2
| | | | | | | | | | | | ensure getChildren() is called on an instance of Share_Backend_Collection
| | * add initial search in shared filesJörn Friedrich Dreyer2013-09-191-1/+1
| | |
| * | Merge pull request #5001 from owncloud/fixing-user-external-backends-masterMorris Jobke2013-09-271-0/+1
| |\ \ | | | | | | | | prelogin apps have to be loaded within setupBackend() otherwise required...
| | * | prelogin apps have to be loaded within setupBackend() otherwise required ↵Thomas Müller2013-09-261-0/+1
| | | | | | | | | | | | | | | | classes cannot be loaded
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-271-0/+3
| | | |
| * | | manager checkPassword now returns User object, adjust internal user class ↵Arthur Schiwon2013-09-251-1/+1
| |/ / | | | | | | | | | accordingly.
| * | Merge pull request #4968 from owncloud/user_checkpwdThomas Müller2013-09-256-39/+41
| |\ \ | | | | | | | | User: move checkPassword from User to Manager to not break API
| | * | Adjust Tests and satisfy themArthur Schiwon2013-09-241-4/+6
| | | |
| | * | Fix docArthur Schiwon2013-09-241-1/+1
| | | |
| | * | Fix return value from User object to User IDArthur Schiwon2013-09-241-1/+1
| | | |
| | * | === not ==Arthur Schiwon2013-09-241-1/+1
| | | |
| | * | User: move checkPassword from User to Manager to not break APIArthur Schiwon2013-09-246-38/+38
| | | |
* | | | Merge pull request #4892 from owncloud/vcategories_publicThomas Müller2013-09-257-822/+945
|\ \ \ \ | | | | | | | | | | OC_VCategories => OC\Tags. Public interface and getter in server container
| * | | | Add factory class for the server container.Thomas Tanghus2013-09-246-19/+140
| | | | |
| * | | | Fix conflictThomas Tanghus2013-09-231-3/+4
| |\ \ \ \
| | * | | | Use fetchOne() instead of numRows() when doing a COUNT(*).Thomas Tanghus2013-09-231-1/+1
| | | | | |
| | * | | | Forgot to return false if add() didn't add anything.Thomas Tanghus2013-09-231-0/+1
| | | | | |
| | * | | | Added more error checking in add()Thomas Tanghus2013-09-231-5/+13
| | | | | |
| | * | | | Updated method names and added a few more tests.Thomas Tanghus2013-09-192-9/+9
| | | | | |
| | * | | | fixing namespaces and rename hasCategory to hasTagThomas Müller2013-09-181-9/+9
| | | | | |
| | * | | | Merge branch 'appframework-master' into vcategories_publicThomas Müller2013-09-1817-94/+311
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/server.php
| | * | | | | OC_VCategories=>OC\Tags. Public interface + getter in server containerThomas Tanghus2013-09-185-833/+813
| | | | | | |
| | * | | | | Merge branch 'appframework-master' into vcategories_publicThomas Tanghus2013-09-1793-483/+6833
| | |\ \ \ \ \
| | * | | | | | More trimmingThomas Tanghus2013-09-041-3/+15
| | | | | | | |
| * | | | | | | Use fetchOne() instead of numRows() when doing a COUNT(*).Thomas Tanghus2013-09-231-1/+1
| | | | | | | |
| * | | | | | | Forgot to return false if add() didn't add anything.Thomas Tanghus2013-09-231-0/+1
| | | | | | | |
| * | | | | | | Added more error checking in add()Thomas Tanghus2013-09-231-5/+13
| | | | | | | |
| * | | | | | | Updated method names and added a few more tests.Thomas Tanghus2013-09-232-9/+9
| | | | | | | |
| * | | | | | | fixing namespaces and rename hasCategory to hasTagThomas Müller2013-09-231-9/+9
| | | | | | | |
| * | | | | | | OC_VCategories=>OC\Tags. Public interface + getter in server containerThomas Tanghus2013-09-235-835/+815
| | | | | | | |
| * | | | | | | More trimmingThomas Tanghus2013-09-231-3/+15
| | | | | | | |
* | | | | | | | stripos return value checkThomas Müller2013-09-251-1/+1
| | | | | | | |
* | | | | | | | class API decommissioning part 1Thomas Müller2013-09-252-285/+21
| | | | | | | |
* | | | | | | | AppFramework:Thomas Müller2013-09-252-25/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - get request from the server container - implement registerMiddleWare() - adding getAppName() to app container
* | | | | | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-2531-110/+478
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-241-0/+2
| | |_|_|_|/ / | |/| | | | |
| * | | | | | Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData).Andreas Fischer2013-09-241-27/+27
| | | | | | |
| * | | | | | clear permissions cache when scanning a fileRobin Appelman2013-09-241-3/+12
| | | | | | |
| * | | | | | Merge pull request #4869 from owncloud/fixing-4866-masterThomas Müller2013-09-232-2/+25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | recreate an etag within the scanner if the cache contains an empty etag
| | * \ \ \ \ \ Merge remote-tracking branch 'owncloud/master' into fixing-4866-masterAndreas Fischer2013-09-2329-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 Fischer2013-09-211-1/+3
| | | | | | | | |
| | * | | | | | | Only update the etag. Do not re-submit any other unchanged data.Andreas Fischer2013-09-201-2/+3
| | | | | | | | |
| | * | | | | | | Use update() instead of put().Andreas Fischer2013-09-201-3/+1
| | | | | | | | |
| | * | | | | | | when storing back the data field 'encrypted' it is necessary to cast the ↵Thomas Müller2013-09-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | boolean to an integer to make pg happy
| | * | | | | | | etag changes are now propagated up the file treeThomas Müller2013-09-161-0/+14
| | | | | | | | |
| | * | | | | | | recreate an etag within the scanner if the cache contains an empty etagThomas Müller2013-09-161-1/+7
| | | | | | | | |