| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | Merge pull request #21289 from owncloud/issue-20399-keep-periodic-background-... | Thomas Müller | 2015-12-21 | 2 | -3/+9 |
|\ \ \ \ \ |
|
| * | | | | | Fix the test to expect the new behaviour | Joas Schilling | 2015-12-18 | 1 | -2/+9 |
| * | | | | | Do not delete background jobs, in case an exception occured | Joas Schilling | 2015-12-18 | 1 | -1/+0 |
* | | | | | | Merge pull request #21308 from owncloud/use-new-apcu-api | Thomas Müller | 2015-12-21 | 1 | -2/+99 |
|\ \ \ \ \ \ |
|
| * | | | | | | Use new APCu API | Lukas Reschke | 2015-12-20 | 1 | -2/+99 |
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-21 | 2 | -0/+2 |
* | | | | | | | Merge pull request #21307 from aspdye/patch-1 | Thomas Müller | 2015-12-20 | 1 | -1/+5 |
|\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | Merge branch 'master' into patch-1 | aspdye | 2015-12-20 | 1 | -0/+0 |
| |\ \ \ \ \ \ \
| |/ / / / / / /
|/| | | | | | | |
|
* | | | | | | | | Merge pull request #21299 from owncloud/symfony-process-2.8.0 | Thomas Müller | 2015-12-20 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \
| |_|/ / / / / /
|/| | | | | | | |
|
| * | | | | | | | [3rdparty] Bump symfony/process to 2.8.0 | Roeland Jago Douma | 2015-12-20 | 1 | -0/+0 |
|/ / / / / / / |
|
| * / / / / / | Update README.md | aspdye | 2015-12-20 | 1 | -1/+5 |
|/ / / / / / |
|
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-20 | 8 | -0/+8 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-12-19 | 10 | -4/+16 |
| |_|_|_|/
|/| | | | |
|
* | | | | | Merge pull request #21281 from owncloud/allow-di-for-background-jobs | Thomas Müller | 2015-12-18 | 5 | -11/+127 |
|\ \ \ \ \ |
|
| * | | | | | Add methods to interface which have always been required | Joas Schilling | 2015-12-18 | 2 | -2/+19 |
| * | | | | | Allow dependency injection for background jobs | Joas Schilling | 2015-12-18 | 1 | -9/+15 |
| * | | | | | Look up services in the app container before trying the core container | Joas Schilling | 2015-12-18 | 1 | -0/+24 |
| * | | | | | Register app containers in the OC container | Joas Schilling | 2015-12-18 | 3 | -1/+70 |
| |/ / / / |
|
* | | | | | Merge pull request #21290 from owncloud/public-api-usage-getversion | Thomas Müller | 2015-12-18 | 17 | -35/+37 |
|\ \ \ \ \ |
|
| * | | | | | Use OCP\Util::getVersion instead of the internal private implementation | Morris Jobke | 2015-12-18 | 17 | -35/+37 |
* | | | | | | Merge pull request #21272 from owncloud/symfony-routing-2.8.0 | Thomas Müller | 2015-12-18 | 1 | -0/+0 |
|\ \ \ \ \ \ |
|
| * | | | | | | [3rdparty] Bump symfony/routing to 2.8.0 | Roeland Jago Douma | 2015-12-18 | 1 | -0/+0 |
* | | | | | | | Merge pull request #21288 from owncloud/deprecated_helper_mimetypes | Thomas Müller | 2015-12-18 | 9 | -79/+10 |
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | | |
|
| * | | | | | | Removed deprecated OC_Helper::mimeTypeIcon function | Roeland Jago Douma | 2015-12-18 | 5 | -32/+7 |
| * | | | | | | Removed deprecated unsused function OC_Helper::getStringMimeType | Roeland Jago Douma | 2015-12-18 | 2 | -21/+0 |
| * | | | | | | Removed deprecated OC_Helper::getSecureMimeType | Roeland Jago Douma | 2015-12-18 | 5 | -26/+3 |
* | | | | | | | Merge pull request #21283 from owncloud/cleanup_config | Thomas Müller | 2015-12-18 | 10 | -128/+56 |
|\ \ \ \ \ \ \ |
|
| * | | | | | | | Use SystemConfig internally | Roeland Jago Douma | 2015-12-18 | 5 | -19/+19 |
| * | | | | | | | Inject Config into SystemConfig | Roeland Jago Douma | 2015-12-18 | 5 | -15/+32 |
| * | | | | | | | Get rid of legacy OC_Config | Roeland Jago Douma | 2015-12-18 | 7 | -118/+29 |
* | | | | | | | | Merge pull request #21280 from owncloud/drop-unused-methods | Thomas Müller | 2015-12-18 | 5 | -182/+15 |
|\ \ \ \ \ \ \ \
| |_|_|_|/ / / /
|/| | | | | | | |
|
| * | | | | | | | Move OC_Helper code to OCP\Util for linkToRemote | Morris Jobke | 2015-12-18 | 3 | -59/+5 |
| * | | | | | | | properly use OCP\Util instead of OC_Helper | Morris Jobke | 2015-12-18 | 5 | -69/+10 |
| * | | | | | | | OC_Helper::makeURLAbsolute is not used anymore | Morris Jobke | 2015-12-18 | 2 | -54/+0 |
| |/ / / / / / |
|
* | | | | | | | Merge pull request #21277 from owncloud/querybuild-joblist | Thomas Müller | 2015-12-18 | 3 | -64/+109 |
|\ \ \ \ \ \ \
| |_|/ / / / /
|/| | | | | | |
|
| * | | | | | | Make sure the interface and the implementation match | Joas Schilling | 2015-12-18 | 2 | -20/+17 |
| * | | | | | | Use the query builder for the joblist queries | Joas Schilling | 2015-12-18 | 2 | -44/+92 |
| | |_|/ / /
| |/| | | | |
|
* | | | | | | Merge pull request #21279 from owncloud/remove-tmp-methods | Thomas Müller | 2015-12-18 | 24 | -65/+30 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | OC_Helper::userAvatarSet is not used anymore | Morris Jobke | 2015-12-18 | 1 | -10/+0 |
| * | | | | | Use TempManager instead of tmpFile | Morris Jobke | 2015-12-18 | 10 | -26/+13 |
| * | | | | | Use TempManager instead of tmpFolder | Morris Jobke | 2015-12-18 | 17 | -29/+17 |
|/ / / / / |
|
* | | | | | Merge pull request #21278 from owncloud/exclude-scrutinizer-autofixer | Thomas Müller | 2015-12-18 | 1 | -1/+1 |
|\ \ \ \ \ |
|
| * | | | | | Exclude scrutinizer-auto-fixer | Lukas Reschke | 2015-12-18 | 1 | -1/+1 |
|/ / / / / |
|
* | | | | | Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeType | Thomas Müller | 2015-12-18 | 8 | -24/+9 |
|\ \ \ \ \ |
|
| * | | | | | Use proper public API for OC_Helper::getFileNameMimeType | Morris Jobke | 2015-12-17 | 8 | -24/+9 |
* | | | | | | Merge pull request #21264 from owncloud/deprecated_oc_user_methods | Thomas Müller | 2015-12-18 | 28 | -198/+125 |
|\ \ \ \ \ \
| |_|/ / / /
|/| | | | | |
|
| * | | | | | Removed deprecated function OC_User::deleteUser | Roeland Jago Douma | 2015-12-17 | 17 | -60/+66 |
| * | | | | | Removed unused deprecated methods | Roeland Jago Douma | 2015-12-17 | 1 | -38/+0 |
| * | | | | | Removed deprecated private OC_User::createUser | Roeland Jago Douma | 2015-12-17 | 17 | -62/+29 |
| * | | | | | Remove deprecated function OC_User::getManager | Roeland Jago Douma | 2015-12-17 | 11 | -41/+33 |