summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move \OC\Memcache to PSR-4Roeland Jago Douma2016-04-1811-0/+0
* Merge pull request #24036 from owncloud/db_psr4Morris Jobke2016-04-1731-0/+0
|\
| * Move \OC\DB to PSR-4Roeland Jago Douma2016-04-1531-0/+0
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-1710-16/+32
* | Merge pull request #23936 from owncloud/update_3rdpartyLukas Reschke2016-04-161-0/+0
|\ \
| * | update 3rdparty to latest JSqueezeGeorg Ehrke2016-04-121-0/+0
* | | Merge pull request #23978 from owncloud/integration-test-remaining-from-qa-26Lukas Reschke2016-04-162-0/+28
|\ \ \
| * | | Added test case about downloading a file inside a folder with rangeSergio Bertolin2016-04-132-0/+28
* | | | Merge pull request #24020 from owncloud/update-sample-commandLukas Reschke2016-04-161-1/+1
|\ \ \ \
| * | | | Fix deprecated usagesJoas Schilling2016-04-151-1/+1
* | | | | Merge pull request #24030 from owncloud/integration-tests-improved-resharingLukas Reschke2016-04-161-0/+14
|\ \ \ \ \
| * | | | | Added test case for QA-94Sergio Bertolin2016-04-151-0/+14
* | | | | | Merge pull request #23939 from owncloud/stricter-csp-for-dav-backendLukas Reschke2016-04-162-2/+7
|\ \ \ \ \ \
| * | | | | | Employ a stricter Content Security Policy on remote.phpLukas Reschke2016-04-122-2/+7
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-162-0/+4
* | | | | | | Merge pull request #24017 from owncloud/share-permissions-namespaceThomas Müller2016-04-152-21/+21
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Move share-permissions property namespaceRoeland Jago Douma2016-04-152-21/+21
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #24031 from owncloud/comments_psr4Thomas Müller2016-04-153-0/+0
|\ \ \ \ \ \
| * | | | | | Move \OC\Comments to PSR-4Roeland Jago Douma2016-04-153-0/+0
|/ / / / / /
* | | | | | Merge pull request #23933 from owncloud/remember-file-sortingThomas Müller2016-04-1510-16/+161
|\ \ \ \ \ \
| * | | | | | fix default value, update js/php testsChristoph Wurst2016-04-136-17/+116
| * | | | | | persist file sorting changesChristoph Wurst2016-04-137-8/+47
| * | | | | | load file sorting mode from the dbChristoph Wurst2016-04-134-2/+9
* | | | | | | Merge pull request #24023 from owncloud/command_psr4Thomas Müller2016-04-156-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Move \OC\Command to PSR-4Roeland Jago Douma2016-04-156-0/+0
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #24024 from owncloud/dropbox-autoloadThomas Müller2016-04-151-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix loading the dropbox autoloaderRobin Appelman2016-04-151-1/+1
|/ / / / / /
* | | | | | Merge pull request #24016 from owncloud/cache_psr4Roeland Douma2016-04-152-0/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Move \OC\Cache to PSR-4Roeland Jago Douma2016-04-152-0/+0
|/ / / / /
* | | | | Merge pull request #24013 from owncloud/session_psr4Thomas Müller2016-04-155-0/+0
|\ \ \ \ \
| * | | | | Move \OC\Session to PSR-4Roeland Jago Douma2016-04-155-0/+0
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-1510-36/+66
|/ / / / /
* | | | | Merge pull request #24007 from owncloud/security_psr4Thomas Müller2016-04-1413-0/+0
|\ \ \ \ \
| * | | | | Move \OC\Security to PSR-4Roeland Jago Douma2016-04-1413-0/+0
* | | | | | Merge pull request #23998 from owncloud/translate-birthdayThomas Müller2016-04-145-17/+54
|\ \ \ \ \ \
| * | | | | | Translate contacts birthday - fixes #23982Thomas Müller2016-04-145-17/+54
* | | | | | | Merge pull request #24005 from owncloud/3rdparty-has-to-be-in-rootThomas Müller2016-04-143-47/+8
|\ \ \ \ \ \ \
| * | | | | | | Kill movable 3rdpartyThomas Müller2016-04-143-47/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #23994 from owncloud/log-in-imageThomas Müller2016-04-142-20/+11
|\ \ \ \ \ \ \
| * | | | | | | use background image for log in viewJan-Christoph Borchardt2016-04-142-20/+11
* | | | | | | | Merge pull request #23561 from owncloud/background-scan-unscannedC. Montero Luque2016-04-141-19/+31
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into background-scan-unscannedC. Montero Luque2016-03-2553-13/+307
| |\ \ \ \ \ \ \
| * | | | | | | | handle completely unscanned storages in the background scannerRobin Appelman2016-03-241-19/+31
* | | | | | | | | Merge pull request #23527 from owncloud/fix-21136C. Montero Luque2016-04-142-2/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | disable Paged Search when chunksize is set to 0, fixes #21136Arthur Schiwon2016-03-232-2/+6
* | | | | | | | | | Merge pull request #23985 from owncloud/ext-fix-namespacesMorris Jobke2016-04-1439-121/+132
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix OCA\Files\External\Api namespaceRobin McCorkell2016-04-143-3/+2
| * | | | | | | | | | Fix storage backend class namespaces and move to subdirRobin McCorkell2016-04-1437-118/+130
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #23991 from owncloud/handle-exceptions-in-templatesThomas Müller2016-04-141-2/+7
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Properly handle exception within templatesMorris Jobke2016-04-141-2/+7