Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | remove unused classes | Thomas Müller | 2013-10-07 | 1 | -2/+0 |
| | |||||
* | fixing SecurityMiddleware to use OC6 API | Thomas Müller | 2013-10-07 | 3 | -17/+24 |
| | |||||
* | move controller to OCP | Thomas Müller | 2013-10-06 | 1 | -0/+147 |
| | |||||
* | Merge pull request #5144 from owncloud/public_middleware | Bernhard Posselt | 2013-10-06 | 1 | -6/+18 |
|\ | | | | | Make abstract Middleware class public | ||||
| * | Remove misleading IMiddleware interface | Thomas Tanghus | 2013-10-05 | 2 | -89/+1 |
| | | |||||
| * | Make abstract Middleware class public | Thomas Tanghus | 2013-10-05 | 1 | -0/+100 |
| | | | | | | | | | | It doesn't make sense for subclasses to have to implement all methods. | ||||
* | | passesCSRFCheck added to OCP\IRequest | Bart Visscher | 2013-10-04 | 1 | -0/+5 |
| | | |||||
* | | Add Helper and URLGenerator interfaces to server container | Bart Visscher | 2013-10-04 | 3 | -0/+80 |
| | | |||||
* | | Add L10N interface to server container | Bart Visscher | 2013-10-04 | 2 | -0/+74 |
|/ | |||||
* | Merge pull request #5068 from owncloud/improved_request | Bart Visscher | 2013-10-04 | 1 | -8/+22 |
|\ | | | | | Improved request | ||||
| * | Remove getContent() from IRequest | Thomas Tanghus | 2013-10-01 | 1 | -8/+0 |
| | | |||||
| * | Implement PUT an PATCH support | Thomas Tanghus | 2013-10-01 | 1 | -1/+1 |
| | | |||||
| * | Add interface docs to IRequest. | Thomas Tanghus | 2013-10-01 | 1 | -0/+22 |
| | | |||||
* | | Merge pull request #5087 from owncloud/templatefunction-relativedate | Vincent Petry | 2013-10-04 | 1 | -2/+2 |
|\ \ | | | | | | | Added dateOnly argument to relative_modified_date | ||||
| * | | Removed $fromTime argument from public template API | Vincent Petry | 2013-10-04 | 1 | -2/+2 |
| | | | |||||
| * | | Fixed missing default values | Vincent Petry | 2013-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Added default value for $fromTime to prevent missing argument errors and keep backward compatible. | ||||
| * | | Added unit tests for relative_modified_date, changed method signature | Vincent Petry | 2013-10-03 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Changed method signature of relative_modified_date template method to make it possible to add a fromTime to compare with, mostly to make it possible to test it. Added unit test for date and time cases. | ||||
| * | | Added dateOnly argument to relative_modified_date | Vincent Petry | 2013-10-02 | 1 | -2/+2 |
| |/ | | | | | | | | | | | Improved the template function relative_modified_date by adding an optional dateOnly argument which will output "today" or "yesterday" or "x days ago". | ||||
* | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-02 | 26 | -86/+1864 |
|\| | | | | | | | | | Conflicts: lib/private/util.php | ||||
| * | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-27 | 2 | -4/+4 |
| |\ | |||||
| | * | Merge pull request #4207 from owncloud/search_shared_files | Thomas Müller | 2013-09-27 | 1 | -3/+3 |
| | |\ | | | | | | | | | add initial search in shared files | ||||
| | | * | adding PHPDoc comments to getBackend | Thomas Müller | 2013-09-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | ensure getChildren() is called on an instance of Share_Backend_Collection | ||||
| | | * | add initial search in shared files | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | User: move checkPassword from User to Manager to not break API | Arthur Schiwon | 2013-09-24 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #4892 from owncloud/vcategories_public | Thomas Müller | 2013-09-25 | 3 | -0/+220 |
| |\ \ \ | | | | | | | | | | | OC_VCategories => OC\Tags. Public interface and getter in server container | ||||
| | * | | | Add factory class for the server container. | Thomas Tanghus | 2013-09-24 | 3 | -10/+50 |
| | | | | | |||||
| | * | | | Updated method names and added a few more tests. | Thomas Tanghus | 2013-09-23 | 1 | -3/+3 |
| | | | | | |||||
| | * | | | OC_VCategories=>OC\Tags. Public interface + getter in server container | Thomas Tanghus | 2013-09-23 | 2 | -0/+180 |
| | | | | | |||||
| * | | | | class API decommissioning part 1 | Thomas Müller | 2013-09-25 | 1 | -88/+1 |
| | | | | | |||||
| * | | | | AppFramework: | Thomas Müller | 2013-09-25 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - get request from the server container - implement registerMiddleWare() - adding getAppName() to app container | ||||
| * | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-25 | 1 | -10/+25 |
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php | ||||
| | * | | | Merge pull request #4856 from owncloud/fix-link-expiration | Andreas Fischer | 2013-09-23 | 1 | -1/+12 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token) * owncloud/fix-link-expiration: Perform expiration date checking before returning share data for token. Tests whether expired/valid link share is still accessible. | ||||
| | | * | | | Perform expiration date checking before returning share data for token. | Andreas Fischer | 2013-09-16 | 1 | -1/+12 |
| | | | |/ | | | |/| | |||||
| * | | | | Remove duplicate method definitions | Thomas Tanghus | 2013-09-24 | 1 | -14/+1 |
| | | | | | |||||
| * | | | | Merge branch 'server_folder_methods' of github.com:owncloud/core into ↵ | Thomas Tanghus | 2013-09-24 | 1 | -0/+13 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server_folder_methods Conflicts: lib/public/iservercontainer.php lib/server.php | ||||
| | * \ \ \ | Merge branch 'appframework-master' into server_folder_methods | Thomas Tanghus | 2013-09-19 | 2 | -0/+62 |
| | |\ \ \ \ | |||||
| | * | | | | | Add getUserFolder/getAppFolder to Server. | Thomas Tanghus | 2013-09-18 | 1 | -0/+14 |
| | | | | | | | |||||
| * | | | | | | 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 | 2 | -8/+17 |
| | | | | | | |||||
| * | | | | | fixing typos + adding missing filed $activeEntry | Thomas Müller | 2013-09-20 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | fixing PHPDoc | Thomas Müller | 2013-09-20 | 1 | -8/+8 |
| | | | | | | |||||
| * | | | | | fixing typos | Thomas Müller | 2013-09-20 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Add Config container class to server container | Bart Visscher | 2013-09-20 | 2 | -0/+64 |
| | | | | | | |||||
| * | | | | | Add Navigation class to server container | Bart Visscher | 2013-09-20 | 2 | -0/+32 |
| | | | | | | |||||
| * | | | | | Add DBConnection to server container | Bart Visscher | 2013-09-20 | 2 | -0/+78 |
| | | | | | | |||||
| * | | | | | Add UserSession to server container | Bart Visscher | 2013-09-20 | 2 | -0/+37 |
| | |/ / / | |/| | | | |||||
| * | | | | updating php docs | Thomas Müller | 2013-09-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'appframework-master' into public_cache | Thomas Tanghus | 2013-09-18 | 3 | -9/+63 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/public/iservercontainer.php lib/server.php | ||||
| | * | | | Add some docs to the sessions interface. | Thomas Tanghus | 2013-09-18 | 1 | -2/+14 |
| | | | | | |||||
| | * | | | Purge session from Request - and fix some styles | Thomas Tanghus | 2013-09-17 | 1 | -9/+0 |
| | | | | |