Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4877 from owncloud/ocs_share_api | Björn Schießle | 2013-10-04 | 1 | -0/+1 |
|\ | | | | | OCS Share API | ||||
| * | Merge branch 'master' into ocs_share_api | Bjoern Schiessle | 2013-09-26 | 21 | -118/+2367 |
| |\ | |||||
| * | | some unit test for the new ocs share api | Bjoern Schiessle | 2013-09-19 | 1 | -0/+1 |
| | | | |||||
* | | | Added unit tests for relative_modified_date, changed method signature | Vincent Petry | 2013-10-03 | 1 | -1/+189 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | fix unit tests | Morris Jobke | 2013-10-02 | 1 | -3/+3 |
| | | | |||||
* | | | move the private namespace OC into lib/private - OCP will stay in lib/public | Thomas Müller | 2013-09-30 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | Conflicts: lib/private/vcategories.php | ||||
* | | | Merge pull request #4459 from owncloud/appframework-master | Thomas Müller | 2013-09-30 | 21 | -143/+2401 |
|\ \ \ | | | | | | | | | Public API for OC6+ (includes AppFramework) | ||||
| * \ \ | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-30 | 4 | -1/+148 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-28 | 1 | -0/+14 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-27 | 5 | -64/+98 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge pull request #4892 from owncloud/vcategories_public | Thomas Müller | 2013-09-25 | 2 | -128/+166 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | OC_VCategories => OC\Tags. Public interface and getter in server container | ||||
| | * | | | | | | Add factory class for the server container. | Thomas Tanghus | 2013-09-24 | 1 | -50/+42 |
| | | | | | | | | |||||
| | * | | | | | | Moar tests. | Thomas Tanghus | 2013-09-23 | 1 | -3/+7 |
| | | | | | | | | |||||
| | * | | | | | | Add another test. | Thomas Tanghus | 2013-09-23 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | Updated method names and added a few more tests. | Thomas Tanghus | 2013-09-23 | 1 | -11/+48 |
| | | | | | | | | |||||
| | * | | | | | | OC_VCategories=>OC\Tags. Public interface + getter in server container | Thomas Tanghus | 2013-09-23 | 2 | -128/+133 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-25 | 5 | -11/+304 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php | ||||
| * | | | | | | | updating php docs | Thomas Müller | 2013-09-18 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'appframework-master' into public_cache | Thomas Tanghus | 2013-09-18 | 1 | -5/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/public/iservercontainer.php lib/server.php | ||||
| | * | | | | | | | Still some session leftovers. | Thomas Tanghus | 2013-09-17 | 1 | -5/+0 |
| | | | | | | | | | |||||
| * | | | | | | | | OC_Cache namespace changes and add UserCache to server container. | Thomas Tanghus | 2013-09-17 | 2 | -14/+84 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Refs #4863 | ||||
| * | | | | | | | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-17 | 4 | -10/+215 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-15 | 2 | -0/+26 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-13 | 5 | -0/+1701 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into appframework-master | Thomas Müller | 2013-09-13 | 7 | -44/+201 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into appframework-master | Thomas Müller | 2013-08-31 | 2 | -5/+106 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into appframework-master | Thomas Müller | 2013-08-26 | 8 | -6/+277 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | cleanup of tests | Thomas Müller | 2013-08-21 | 2 | -13/+14 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | kill superfluent classloader from tests - this approach might be of interest ↵ | Thomas Müller | 2013-08-21 | 17 | -94/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | within the apps | ||||
| * | | | | | | | | | | | | | reducing controller annotations to: | Thomas Müller | 2013-08-20 | 1 | -122/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | @PublicPage - No user logon is expected @NoAdminRequired - the login user requires no admin rights @NoCSRFRequired - the incoming request will not check for CSRF token | ||||
| * | | | | | | | | | | | | | Introducing IContainer into public api | Thomas Müller | 2013-08-20 | 1 | -0/+9 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | fixing broken test | Thomas Müller | 2013-08-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | fixing require to Pimple | Thomas Müller | 2013-08-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | initial import of appframework | Thomas Müller | 2013-08-17 | 17 | -0/+2294 |
| | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | Merge branch 'master' into move-aborted-upload-detection-into-plugin-master | Thomas Müller | 2013-09-30 | 7 | -3/+205 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #4969 from owncloud/fixing-4043-master | Thomas Müller | 2013-09-30 | 1 | -0/+87 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | adding privilege check on move and rename operations | ||||
| | * | | | | | | | | | | | | | code cleanup | Thomas Müller | 2013-09-27 | 1 | -39/+22 |
| | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | adding unit tests for ObjectTree::move() | Thomas Müller | 2013-09-26 | 1 | -0/+104 |
| | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge pull request #4966 from owncloud/text_preview_blacklist | Andreas Fischer | 2013-09-29 | 3 | -1/+61 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add blacklist to txt preview backend * owncloud/text_preview_blacklist: rename variable in testIsTransparent rename testTxtBlacklist to txtBlacklist move fileView object initialization to testIsTransparent use dataProvider for txt blacklist test add test for txt blacklist add test data for cal and contact preview add blacklist to txt preview backend | ||||
| | * | | | | | | | | | | | | rename variable in testIsTransparent | Georg Ehrke | 2013-09-27 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | rename testTxtBlacklist to txtBlacklist | Georg Ehrke | 2013-09-27 | 1 | -3/+3 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | move fileView object initialization to testIsTransparent | Georg Ehrke | 2013-09-27 | 1 | -10/+10 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | use dataProvider for txt blacklist test | Georg Ehrke | 2013-09-27 | 1 | -25/+28 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | add test for txt blacklist | Georg Ehrke | 2013-09-25 | 1 | -0/+38 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | add test data for cal and contact preview | Georg Ehrke | 2013-09-24 | 2 | -0/+19 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | phpunit.xml: Port code coverage excludes from autotest to dist. | Andreas Fischer | 2013-09-26 | 1 | -0/+14 |
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master | Morris Jobke | 2013-09-26 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | run unit tests for apps as well | ||||
| | * | | | | | | | | | | | | Remove $RUNTIME_NOAPPS - setting to false was not enough | Thomas Müller | 2013-09-26 | 1 | -2/+0 |
| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | run unit tests for apps as well | Thomas Müller | 2013-09-26 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| * / | | | | | | | | | | | Missing Test for the previous commit | Arthur Schiwon | 2013-09-25 | 1 | -0/+43 |
| |/ / / / / / / / / / / |