summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-303-6/+20
* 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 keyfilesBjoern Schiessle2013-09-271-8/+12
* | Merge pull request #4459 from owncloud/appframework-masterThomas Müller2013-09-3065-990/+5505
|\ \
| * \ Merge branch 'master' into appframework-masterThomas Müller2013-09-306-14/+77
| |\ \
| * | | initialize $middleWaresThomas Müller2013-09-281-1/+1
| * | | 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 #4892 from owncloud/vcategories_publicThomas Müller2013-09-257-822/+945
| |\ \ \ \
| | * | | | 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
| | | |\ \ \ \
| | | * | | | | 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
| * | | | | | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-2531-110/+478
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Remove duplicate method definitionsThomas Tanghus2013-09-241-14/+1
| * | | | | | | | | Merge branch 'server_folder_methods' of github.com:owncloud/core into server_...Thomas Tanghus2013-09-242-0/+14
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix syntax errorThomas Tanghus2013-09-191-1/+1
| | * | | | | | | | | Merge branch 'appframework-master' into server_folder_methodsThomas Tanghus2013-09-1912-26/+207
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | |
| | * | | | | | | | | 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
| | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Add missing implements and fix parameters in IConfigBart Visscher2013-09-205-11/+19
| * | | | | | | | | PHPDoc & get UserManager from container for RooFolderThomas Müller2013-09-201-2/+6
| * | | | | | | | | fixing typos + adding missing filed $activeEntryThomas Müller2013-09-202-3/+4
| * | | | | | | | | fixing PHPDocThomas Müller2013-09-201-8/+8
| * | | | | | | | | fixing typosThomas Müller2013-09-202-8/+8
| * | | | | | | | | Add Config container class to server containerBart Visscher2013-09-204-0/+151
| * | | | | | | | | Add Navigation class to server containerBart Visscher2013-09-205-19/+117
| * | | | | | | | | Add DBConnection to server containerBart Visscher2013-09-204-1/+87
| * | | | | | | | | Add UserSession to server containerBart Visscher2013-09-204-41/+94
| | |/ / / / / / / | |/| | | | | | |