Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12488 from owncloud/activity_group_multiple_conditions | Lukas Reschke | 2014-11-28 | 1 | -2/+5 |
|\ | | | | | activitymanager: concatenate queries with 'or' | ||||
| * | concatenate queries with 'or' | Bjoern Schiessle | 2014-11-28 | 1 | -2/+5 |
| | | |||||
* | | Skip lostcontroller sending email test on windows | Joas Schilling | 2014-11-28 | 1 | -0/+5 |
|/ | |||||
* | Merge pull request #12472 from owncloud/modifyCookies | Morris Jobke | 2014-11-28 | 3 | -9/+95 |
|\ | | | | | Add functions to modify cookies to response class | ||||
| * | Add functions to modify cookies to response class | Lukas Reschke | 2014-11-27 | 3 | -9/+95 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there is no AppFramework way to modify cookies, which makes it unusable for quite some use-cases or results in untestable code. This PR adds some basic functionalities to add and invalidate cookies. Usage: ```php $response = new TemplateResponse(...); $response->addCookie('foo', 'bar'); $response->invalidateCookie('foo'); $response->addCookie('bar', 'foo', new \DateTime('2015-01-01 00:00')); ``` Existing cookies can be accessed with the AppFramework using `$this->request->getCookie($name)`. | ||||
* | | Merge pull request #12443 from owncloud/issue/6101-all-classes-autoloadable | Morris Jobke | 2014-11-28 | 1 | -2/+0 |
|\ \ | | | | | | | Issue/6101 Make all interfaces/classes autoloadable | ||||
| * | | Move share interfaces to own files so they can be autoloaded | Joas Schilling | 2014-11-27 | 1 | -2/+0 |
| |/ | |||||
* | | Add storage and cache wrappers to apply a permissions mask to a storage | Robin Appelman | 2014-11-27 | 2 | -0/+199 |
| | | |||||
* | | Add storage and cache wrappers to jail a storage to a subfolder | Robin Appelman | 2014-11-27 | 3 | -4/+126 |
| | | |||||
* | | Correctly namespace and autoload DatabaseException | Joas Schilling | 2014-11-27 | 1 | -2/+2 |
|/ | |||||
* | Merge pull request #12350 from mprokop/link_expiration | Morris Jobke | 2014-11-26 | 1 | -4/+2 |
|\ | | | | | fix calculation of expiration date if there is a default expiration date... | ||||
| * | Consolidate if statement, and update unit test | Miguel Prokop | 2014-11-21 | 1 | -4/+2 |
| | | |||||
* | | Merge pull request #12421 from ↵ | Morris Jobke | 2014-11-26 | 7 | -111/+111 |
|\ \ | | | | | | | | | | | | | owncloud/issue/6101-remove-namespace-permission-constants Issue/6101 remove namespace permission constants | ||||
| * | | Replace deprecated constant with new class constant | Joas Schilling | 2014-11-25 | 7 | -111/+111 |
| | | | |||||
* | | | Merge pull request #12420 from owncloud/sqlite-wal-2 | Morris Jobke | 2014-11-26 | 2 | -19/+18 |
|\ \ \ | | | | | | | | | adding new config parameter for sqlite to specify the journal mode | ||||
| * | | | fix failing unit test for the temp manager - concurrently executed unit ↵ | Thomas Müller | 2014-11-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | tests influence each other | ||||
| * | | | adding new config parameter for sqlite to specify the journal mode | Thomas Müller | 2014-11-25 | 1 | -17/+16 |
| |/ / | |||||
* | | | handle invalid xml file | Thomas Müller | 2014-11-25 | 2 | -0/+27 |
| | | | |||||
* | | | simplify xml parser code | Thomas Müller | 2014-11-25 | 2 | -17/+27 |
| | | | |||||
* | | | Introduce app info xml parser including basic unit test - necessary for #10777 | Thomas Müller | 2014-11-25 | 2 | -0/+79 |
|/ / | |||||
* | | Merge pull request #12380 from owncloud/remove-oc-migrate | Lukas Reschke | 2014-11-25 | 1 | -98/+0 |
|\ \ | | | | | | | Remove OC_Migrate | ||||
| * | | Remove OC_Migrate | Lukas Reschke | 2014-11-24 | 1 | -98/+0 |
| | | | | | | | | | | | | | | | | | | This is unused legacy code. Let it die with ~~~honor~~ fire. Fixes https://github.com/owncloud/core/issues/12346 | ||||
* | | | Merge pull request #12294 from owncloud/route-postfix | Thomas Müller | 2014-11-24 | 1 | -1/+14 |
|\ \ \ | | | | | | | | | Add route postfix to allow url versioning when only the http method changed | ||||
| * | | | add postfix | Bernhard Posselt | 2014-11-19 | 1 | -1/+14 |
| | | | | | | | | | | | | | | | | add postfix | ||||
* | | | | Merge pull request #12084 from owncloud/sharing_fix_shared_with_info | Morris Jobke | 2014-11-24 | 1 | -0/+44 |
|\ \ \ \ | |_|/ / |/| | | | sharing: make sure that we only find the shares from a given owner | ||||
| * | | | also check for the correct owner if it was submitted | Bjoern Schiessle | 2014-11-21 | 1 | -0/+44 |
| | | | | |||||
* | | | | Merge pull request #12348 from owncloud/rename-to-avoid-complaining-ci | Morris Jobke | 2014-11-22 | 2 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Rename providers to not begin with test | ||||
| * | | | | Rename providers to not begin with test | Lukas Reschke | 2014-11-21 | 2 | -4/+4 |
| | |_|/ | |/| | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12347 | ||||
* | | | | Merge pull request #12328 from owncloud/remove-testcleanuplistener | Morris Jobke | 2014-11-22 | 3 | -186/+111 |
|\ \ \ \ | |_|/ / |/| | | | Remove testcleanuplistener | ||||
| * | | | Remove testcleanuplistener.php | Joas Schilling | 2014-11-20 | 2 | -181/+0 |
| | | | | |||||
| * | | | Clean up the test data in tearDownAfterClass() | Joas Schilling | 2014-11-20 | 1 | -5/+111 |
| | | | | | | | | | | | | | | | | The result of the listener should then be empty and can be removed | ||||
* | | | | fix unit tests of mdb2scheamreader | Morris Jobke | 2014-11-20 | 1 | -2/+2 |
| |/ / |/| | | |||||
* | | | Revert "drop OC_Preferences::getUsers and getApps" | Morris Jobke | 2014-11-20 | 1 | -0/+28 |
| | | | | | | | | | | | | This reverts commit 09fd34eed908203674721af86ce889bfd0a0ef8d. | ||||
* | | | drop OC_Preferences::getUsers and getApps | Morris Jobke | 2014-11-20 | 1 | -28/+0 |
|/ / | |||||
* | | Merge pull request #12297 from owncloud/issue/10991-all-testcase | Morris Jobke | 2014-11-20 | 146 | -257/+468 |
|\ \ | | | | | | | Issue/10991 all testcase | ||||
| * | | Make remaining files extend the test base | Joas Schilling | 2014-11-19 | 70 | -117/+191 |
| | | | |||||
| * | | Make root tests extend the \Test\TestCase | Joas Schilling | 2014-11-19 | 46 | -83/+160 |
| | | | |||||
| * | | Make apps/ extend the \Test\TestCase and fix overwritten methods | Joas Schilling | 2014-11-19 | 1 | -1/+1 |
| | | | |||||
| * | | Use base class to reset the file mapper | Joas Schilling | 2014-11-19 | 30 | -56/+116 |
| | | | |||||
* | | | Merge pull request #12253 from owncloud/port-12154 | Vincent Petry | 2014-11-20 | 1 | -2/+6 |
|\ \ \ | |/ / |/| | | Port 12154 | ||||
| * | | Ignore port for trusted domains | Lukas Reschke | 2014-11-18 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain) Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975. Conflicts: lib/private/request.php | ||||
* | | | Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword | Lukas Reschke | 2014-11-19 | 4 | -1/+199 |
|\ \ \ | | | | | | | | | Warn for password reset when files_encryption is enabled | ||||
| * | | | Use correct route instead | Lukas Reschke | 2014-11-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | THX @schiesbn (I should setup a mail server on my local system...) | ||||
| * | | | Fix scrutinizer issues | Lukas Reschke | 2014-11-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Warn for password reset when files_encryption is enabled | Lukas Reschke | 2014-11-17 | 4 | -1/+199 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | This patch wil warn the user of the consequences when resetting the password and requires checking a checkbox (as we had in the past) to reset a password. Furthermore I updated the code to use our new classes and added some unit tests for it :dancers: Fixes https://github.com/owncloud/core/issues/11438 | ||||
* | | | use the new base class for unit tests | Bjoern Schiessle | 2014-11-18 | 1 | -10/+12 |
| | | | |||||
* | | | make sure that we don't find the wrong shares if a user and a group have the ↵ | Bjoern Schiessle | 2014-11-18 | 1 | -0/+41 |
| |/ |/| | | | | | same ID | ||||
* | | Merge pull request #12234 from owncloud/normalizepath-absolute-tests | Lukas Reschke | 2014-11-18 | 1 | -61/+102 |
|\ \ | |/ |/| | Add tests for normalizePath() with absolute paths on windows | ||||
| * | Add tests for absolute paths on windows | Joas Schilling | 2014-11-17 | 1 | -2/+32 |
| | | |||||
| * | Refactor tests to use a dataProvider method | Joas Schilling | 2014-11-17 | 1 | -62/+73 |
| | |