summaryrefslogtreecommitdiffstats
path: root/lib/public/iservercontainer.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into activities-apiThomas Müller2013-10-091-0/+17
|\
| * Add Helper and URLGenerator interfaces to server containerBart Visscher2013-10-041-0/+10
| |
| * Add L10N interface to server containerBart Visscher2013-10-041-0/+7
| |
* | Merge branch 'appframework-master' into activities-apiThomas Müller2013-09-291-0/+46
|\| | | | | | | | | Conflicts: lib/public/iservercontainer.php
| * Merge pull request #4892 from owncloud/vcategories_publicThomas Müller2013-09-251-0/+8
| |\ | | | | | | OC_VCategories => OC\Tags. Public interface and getter in server container
| | * Add factory class for the server container.Thomas Tanghus2013-09-241-1/+2
| | |
| | * OC_VCategories=>OC\Tags. Public interface + getter in server containerThomas Tanghus2013-09-231-0/+7
| | |
| * | Remove duplicate method definitionsThomas Tanghus2013-09-241-14/+1
| | |
| * | Merge branch 'server_folder_methods' of github.com:owncloud/core into ↵Thomas Tanghus2013-09-241-0/+13
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | server_folder_methods Conflicts: lib/public/iservercontainer.php lib/server.php
| | * \ Merge branch 'appframework-master' into server_folder_methodsThomas Tanghus2013-09-191-0/+7
| | |\ \
| | * | | Add getUserFolder/getAppFolder to Server.Thomas Tanghus2013-09-181-0/+14
| | | | |
| * | | | Add getUserFolder/getAppFolder to Server.Thomas Tanghus2013-09-231-0/+14
| | |_|/ | |/| |
| * | | Add Config container class to server containerBart Visscher2013-09-201-0/+5
| | | |
| * | | Add Navigation class to server containerBart Visscher2013-09-201-0/+5
| | | |
| * | | Add DBConnection to server containerBart Visscher2013-09-201-0/+7
| | | |
| * | | Add UserSession to server containerBart Visscher2013-09-201-0/+7
| | |/ | |/|
* / | adding basic interfaces for the activities apiThomas Müller2013-09-201-0/+7
|/ /
* | Merge branch 'appframework-master' into public_cacheThomas Tanghus2013-09-181-0/+7
|\| | | | | | | | | | | Conflicts: lib/public/iservercontainer.php lib/server.php
| * Add interface for Session and add getter in server container.Thomas Tanghus2013-09-171-0/+7
| |
* | OC_Cache namespace changes and add UserCache to server container.Thomas Tanghus2013-09-171-0/+7
|/ | | | Refs #4863
* adding getRootFolder() to server container and hooking up the new files apiThomas Müller2013-09-151-0/+8
|
* adding public interface for previewThomas Müller2013-09-041-0/+6
|
* move new interfaces into lib/public and OCPThomas Müller2013-08-311-0/+51