Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-09-30 | 3 | -6/+20 |
* | Merge pull request #5012 from owncloud/check_keyfiles_exists | Morris Jobke | 2013-09-30 | 1 | -8/+12 |
|\ | |||||
| * | check not only if the keyfile folder exists but also if it contains keyfiles | Bjoern Schiessle | 2013-09-27 | 1 | -8/+12 |
* | | Merge pull request #4459 from owncloud/appframework-master | Thomas Müller | 2013-09-30 | 65 | -990/+5505 |
|\ \ | |||||
| * \ | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-30 | 6 | -14/+77 |
| |\ \ | |||||
| * | | | initialize $middleWares | Thomas Müller | 2013-09-28 | 1 | -1/+1 |
| * | | | 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 #4892 from owncloud/vcategories_public | Thomas Müller | 2013-09-25 | 7 | -822/+945 |
| |\ \ \ \ | |||||
| | * | | | | 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 |
| | | |\ \ \ \ | |||||
| | | * | | | | | 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 |
| * | | | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-25 | 31 | -110/+478 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove duplicate method definitions | Thomas Tanghus | 2013-09-24 | 1 | -14/+1 |
| * | | | | | | | | | Merge branch 'server_folder_methods' of github.com:owncloud/core into server_... | Thomas Tanghus | 2013-09-24 | 2 | -0/+14 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Fix syntax error | Thomas Tanghus | 2013-09-19 | 1 | -1/+1 |
| | * | | | | | | | | | Merge branch 'appframework-master' into server_folder_methods | Thomas Tanghus | 2013-09-19 | 12 | -26/+207 |
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | | | | | |||||
| | * | | | | | | | | | Don't try to be clever | Thomas Tanghus | 2013-09-18 | 1 | -15/+18 |
| | * | | | | | | | | | Update to adhere to the coding guidelines. | Thomas Tanghus | 2013-09-18 | 1 | -10/+7 |
| | * | | | | | | | | | Add getUserFolder/getAppFolder to Server. | Thomas Tanghus | 2013-09-18 | 2 | -0/+49 |
| * | | | | | | | | | | Don't try to be clever | Thomas Tanghus | 2013-09-24 | 1 | -0/+36 |
| * | | | | | | | | | | Add getUserFolder/getAppFolder to Server. | Thomas Tanghus | 2013-09-23 | 1 | -0/+14 |
| | |_|_|/ / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Add missing implements and fix parameters in IConfig | Bart Visscher | 2013-09-20 | 5 | -11/+19 |
| * | | | | | | | | | PHPDoc & get UserManager from container for RooFolder | Thomas Müller | 2013-09-20 | 1 | -2/+6 |
| * | | | | | | | | | fixing typos + adding missing filed $activeEntry | Thomas Müller | 2013-09-20 | 2 | -3/+4 |
| * | | | | | | | | | fixing PHPDoc | Thomas Müller | 2013-09-20 | 1 | -8/+8 |
| * | | | | | | | | | fixing typos | Thomas Müller | 2013-09-20 | 2 | -8/+8 |
| * | | | | | | | | | Add Config container class to server container | Bart Visscher | 2013-09-20 | 4 | -0/+151 |
| * | | | | | | | | | Add Navigation class to server container | Bart Visscher | 2013-09-20 | 5 | -19/+117 |
| * | | | | | | | | | Add DBConnection to server container | Bart Visscher | 2013-09-20 | 4 | -1/+87 |
| * | | | | | | | | | Add UserSession to server container | Bart Visscher | 2013-09-20 | 4 | -41/+94 |
| | |/ / / / / / / | |/| | | | | | | |