summaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fixing-appframework-masterThomas Müller2013-10-165-13/+48
|\
| * Merge pull request #5067 from owncloud/urlParams_fixThomas Müller2013-10-161-9/+11
| |\
| | * Get urlParams registered before Request is instantiatedThomas Tanghus2013-10-011-9/+11
| * | Merge pull request #5207 from owncloud/fixing-4011-part2-masterThomas Müller2013-10-113-0/+33
| |\ \
| | * | adding additional exceptions for special cases where creating a file might no...Thomas Müller2013-10-073-0/+33
| * | | make sure that we only find file/folder sharesBjoern Schiessle2013-10-091-4/+4
* | | | OCP\AppFramework\Controller\Controller => OCP\AppFramework\ControllerThomas Tanghus2013-10-112-2/+2
* | | | Merge branch 'master' into fixing-appframework-masterThomas Müller2013-10-081-0/+49
|\| | |
| * | | Merge pull request #5072 from owncloud/apache-auth-masterThomas Müller2013-10-071-0/+49
| |\ \ \ | | |/ / | |/| |
| | * | fixing namespace of ApacheBackend - now know as OCP\Authentication\IApacheBac...Thomas Müller2013-10-021-5/+5
| | * | adding PHPDoc commentThomas Müller2013-10-021-1/+3
| | * | adding getCurrentUserId() to ApacheBackendThomas Müller2013-10-011-1/+7
| | * | Squashed commit of the following:Thomas Müller2013-10-011-0/+41
| | |/
* | | removing log(), getTemplate(), getLocalFilePath(), getUrlContent(), getFileIn...Thomas Müller2013-10-071-20/+0
* | | removing all link/url related calls from API classThomas Müller2013-10-071-45/+0
* | | remove getTrans() from API classThomas Müller2013-10-071-8/+0
* | | remove unused classesThomas Müller2013-10-071-2/+0
* | | fixing SecurityMiddleware to use OC6 APIThomas Müller2013-10-073-17/+24
* | | move controller to OCPThomas Müller2013-10-061-0/+147
|/ /
* | Merge pull request #5144 from owncloud/public_middlewareBernhard Posselt2013-10-061-6/+18
|\ \
| * | Remove misleading IMiddleware interfaceThomas Tanghus2013-10-052-89/+1
| * | Make abstract Middleware class publicThomas Tanghus2013-10-051-0/+100
* | | passesCSRFCheck added to OCP\IRequestBart Visscher2013-10-041-0/+5
* | | Add Helper and URLGenerator interfaces to server containerBart Visscher2013-10-043-0/+80
* | | Add L10N interface to server containerBart Visscher2013-10-042-0/+74
|/ /
* | Merge pull request #5068 from owncloud/improved_requestBart Visscher2013-10-041-8/+22
|\ \
| * | Remove getContent() from IRequestThomas Tanghus2013-10-011-8/+0
| * | Implement PUT an PATCH supportThomas Tanghus2013-10-011-1/+1
| * | Add interface docs to IRequest.Thomas Tanghus2013-10-011-0/+22
| |/
* | Merge pull request #5087 from owncloud/templatefunction-relativedateVincent Petry2013-10-041-2/+2
|\ \
| * | Removed $fromTime argument from public template APIVincent Petry2013-10-041-2/+2
| * | Fixed missing default valuesVincent Petry2013-10-031-1/+1
| * | Added unit tests for relative_modified_date, changed method signatureVincent Petry2013-10-031-2/+2
| * | Added dateOnly argument to relative_modified_dateVincent Petry2013-10-021-2/+2
| |/
* | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-0226-86/+1864
|\|
| * Merge branch 'master' into appframework-masterThomas Müller2013-09-272-4/+4
| |\
| | * Merge pull request #4207 from owncloud/search_shared_filesThomas Müller2013-09-271-3/+3
| | |\
| | | * adding PHPDoc comments to getBackendThomas Müller2013-09-241-2/+2
| | | * add initial search in shared filesJörn Friedrich Dreyer2013-09-191-1/+1
| | * | User: move checkPassword from User to Manager to not break APIArthur Schiwon2013-09-241-1/+1
| * | | Merge pull request #4892 from owncloud/vcategories_publicThomas Müller2013-09-253-0/+220
| |\ \ \
| | * | | Add factory class for the server container.Thomas Tanghus2013-09-243-10/+50
| | * | | Updated method names and added a few more tests.Thomas Tanghus2013-09-231-3/+3
| | * | | OC_VCategories=>OC\Tags. Public interface + getter in server containerThomas Tanghus2013-09-232-0/+180
| * | | | class API decommissioning part 1Thomas Müller2013-09-251-88/+1
| * | | | AppFramework:Thomas Müller2013-09-251-0/+12
| * | | | Merge branch 'master' into appframework-masterThomas Müller2013-09-251-10/+25
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge pull request #4856 from owncloud/fix-link-expirationAndreas Fischer2013-09-231-1/+12
| | |\ \ \
| | | * | | Perform expiration date checking before returning share data for token.Andreas Fischer2013-09-161-1/+12
| | | | |/ | | | |/|
| * | | | Remove duplicate method definitionsThomas Tanghus2013-09-241-14/+1