aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* move the private namespace OC into lib/private - OCP will stay in lib/publicThomas Müller2013-09-30310-10/+10
| | | | | Conflicts: lib/private/vcategories.php
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-3058-430/+583
|
* Merge pull request #5012 from owncloud/check_keyfiles_existsMorris Jobke2013-09-301-8/+12
|\ | | | | check not only if the keyfile folder exists but also if it contains keyfiles
| * check not only if the keyfile folder exists but also if it contains keyfilesBjoern Schiessle2013-09-271-8/+12
| |
* | Merge pull request #4459 from owncloud/appframework-masterThomas Müller2013-09-3091-1140/+7913
|\ \ | | | | | | Public API for OC6+ (includes AppFramework)
| * \ Merge branch 'master' into appframework-masterThomas Müller2013-09-3010-15/+225
| |\ \
| * \ \ Merge branch 'master' into appframework-masterThomas Müller2013-09-2924-123/+156
| |\ \ \
| * | | | initialize $middleWaresThomas Müller2013-09-281-1/+1
| | | | |
| * | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-284-2/+21
| |\ \ \ \
| * | | | | 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-2749-251/+388
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #4892 from owncloud/vcategories_publicThomas Müller2013-09-259-950/+1111
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | OC_VCategories => OC\Tags. Public interface and getter in server container
| | * | | | | | Add factory class for the server container.Thomas Tanghus2013-09-247-69/+182
| | | | | | | |
| | * | | | | | Fix conflictThomas Tanghus2013-09-231-3/+4
| | |\ \ \ \ \ \
| | | * | | | | | Moar tests.Thomas Tanghus2013-09-231-3/+7
| | | | | | | | |
| | | * | | | | | 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
| | | | | | | | |
| | | * | | | | | Add another test.Thomas Tanghus2013-09-191-1/+1
| | | | | | | | |
| | | * | | | | | Updated method names and added a few more tests.Thomas Tanghus2013-09-193-20/+57
| | | | | | | | |
| | | * | | | | | fixing namespaces and rename hasCategory to hasTagThomas Müller2013-09-181-9/+9
| | | | | | | | |
| | | * | | | | | Merge branch 'appframework-master' into vcategories_publicThomas Müller2013-09-1821-114/+396
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/server.php
| | | * | | | | | | OC_VCategories=>OC\Tags. Public interface + getter in server containerThomas Tanghus2013-09-187-961/+946
| | | | | | | | | |
| | | * | | | | | | Merge branch 'appframework-master' into vcategories_publicThomas Tanghus2013-09-17848-10804/+39337
| | | |\ \ \ \ \ \ \
| | | * | | | | | | | More trimmingThomas Tanghus2013-09-041-3/+15
| | | | | | | | | | |
| | * | | | | | | | | Moar tests.Thomas Tanghus2013-09-231-3/+7
| | | | | | | | | | |
| | * | | | | | | | | 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
| | | | | | | | | | |
| | * | | | | | | | | Add another test.Thomas Tanghus2013-09-231-1/+1
| | | | | | | | | | |
| | * | | | | | | | | Updated method names and added a few more tests.Thomas Tanghus2013-09-233-20/+57
| | | | | | | | | | |
| | * | | | | | | | | 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-237-963/+948
| | | | | | | | | | |
| | * | | | | | | | | 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-25639-8315/+21411
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php
| * \ \ \ \ \ \ \ \ \ \ Merge pull request #4898 from owncloud/server_folder_methodsThomas Müller2013-09-242-0/+51
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | Server folder methods
| | * | | | | | | | | | Remove duplicate method definitionsThomas Tanghus2013-09-241-14/+1
| | | | | | | | | | | |
| | * | | | | | | | | | Merge branch 'server_folder_methods' of github.com:owncloud/core into ↵Thomas Tanghus2013-09-242-0/+14
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server_folder_methods Conflicts: lib/public/iservercontainer.php lib/server.php
| | | * | | | | | | | | | Fix syntax errorThomas Tanghus2013-09-191-1/+1
| | | | | | | | | | | | |
| | | * | | | | | | | | | Merge branch 'appframework-master' into server_folder_methodsThomas Tanghus2013-09-1915-41/+292
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | Don't try to be cleverThomas Tanghus2013-09-181-15/+18
| | | | | | | | | | | | |
| | | * | | | | | | | | | Update to adhere to the coding guidelines.Thomas Tanghus2013-09-181-10/+7
| | | | | | | | | | | | |
| | | * | | | | | | | | | Add getUserFolder/getAppFolder to Server.Thomas Tanghus2013-09-182-0/+49
| | | | | | | | | | | | |
| | * | | | | | | | | | | Don't try to be cleverThomas Tanghus2013-09-241-0/+36
| | | | | | | | | | | | |
| | * | | | | | | | | | | Add getUserFolder/getAppFolder to Server.Thomas Tanghus2013-09-231-0/+14
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #4928 from owncloud/interfacesThomas Tanghus2013-09-2313-72/+473
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | Add a couple of interface definitions
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 12:58:33 +0000