summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24760 from owncloud/objectstore_multibucketVincent Petry2016-05-244-2/+409
|\
| * Store user bucket in preferencesRoeland Jago Douma2016-05-233-20/+98
| * Fix NameRoeland Jago Douma2016-05-233-7/+11
| * Add unit tests for ObjectHomeMountProviderRoeland Jago Douma2016-05-231-0/+170
| * Add mapper unit testsRoeland Jago Douma2016-05-231-0/+50
| * Allow multibucket in objectstoreRoeland Jago Douma2016-05-232-2/+107
* | Merge pull request #24799 from owncloud/altyr-117-upstreamVincent Petry2016-05-24136-1738/+232415
|\ \
| * | fix phpdocRobin Appelman2016-05-241-1/+1
| * | Fix cert bundle pathRobin Appelman2016-05-241-1/+1
| * | Fix autoloading for new google SDK libVincent Petry2016-05-242-3/+1
| * | Add new filesFrancesco Rovelli2016-05-24101-0/+228841
| * | enable autoload of lib in google storageFrancesco Rovelli2016-05-241-0/+1
| * | Update google-api-php-client from 1.0.6-beta to 1.1.7Francesco Rovelli2016-05-2433-1733/+3570
* | | skip google map files (#24807)Vincent Petry2016-05-241-4/+7
* | | My fix for #24272, #23613, File not found when single file in a folder (#24800)Dmitry Popov2016-05-241-1/+1
* | | Merge pull request #24809 from owncloud/remove-console-logVincent Petry2016-05-241-1/+0
|\ \ \
| * | | remove debug console.logChristoph Wurst2016-05-241-1/+0
* | | | Merge pull request #24346 from lenz1111/fix_24331Vincent Petry2016-05-243-5/+8
|\ \ \ \ | |_|/ / |/| | |
| * | | bug fixPiotr Filiciak2016-05-241-1/+1
| * | | video posterPiotr Filiciak2016-05-243-6/+7
| * | | Fix: Bugs in shared link with video #24331Piotr Filiciak2016-05-152-4/+6
* | | | Merge pull request #24806 from owncloud/fix-path-to-3rdparty-after-move-to-li...Vincent Petry2016-05-241-1/+1
|\ \ \ \
| * | | | Fix import path for 3rdparty dropbox autoloaderJoas Schilling2016-05-241-1/+1
* | | | | Merge pull request #22929 from owncloud/bugfix-removequota-subadminsVincent Petry2016-05-241-5/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix default quota field from reviewsVincent Petry2016-05-201-2/+2
| * | | | Removed default quota for subadminsprastut2016-03-081-1/+6
| * | | | Removed default quota for subadminsprastut2016-03-081-6/+2
* | | | | Merge pull request #24619 from owncloud/files_external-psr4Vincent Petry2016-05-24120-182/+118
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix missing importsJoas Schilling2016-05-241-0/+3
| * | | | Move remaining classes to PSR-4Joas Schilling2016-05-2447-52/+47
| * | | | Move Lib\Storage to PSR-4Joas Schilling2016-05-2419-0/+0
| * | | | Move Config to PSR-4Joas Schilling2016-05-241-0/+0
| * | | | Move Lib\Backend to PSR-4Joas Schilling2016-05-2416-0/+0
| * | | | Move Lib\Auth to PSR-4Joas Schilling2016-05-2413-1/+0
| * | | | Move stuff from outside lib/ to PSR-4Joas Schilling2016-05-2449-129/+68
* | | | | Merge pull request #24682 from f4bsch/masterVincent Petry2016-05-241-2/+0
|\ \ \ \ \
| * | | | | dont update search onResizeFabian2016-05-171-2/+0
* | | | | | Merge pull request #24788 from owncloud/config-filesystem_check_changesVincent Petry2016-05-241-2/+3
|\ \ \ \ \ \
| * | | | | | clarify filesystem_check_changes in config.sample.phpCarla Schroder2016-05-231-2/+3
* | | | | | | Merge pull request #24787 from owncloud/fix-update-issue-on-masterVincent Petry2016-05-241-2/+7
|\ \ \ \ \ \ \
| * | | | | | | Add the background jobs after the table was updatedJoas Schilling2016-05-231-2/+7
* | | | | | | | Merge pull request #23395 from owncloud/mysql-check-speedupVincent Petry2016-05-241-0/+23
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Speedup schema cloning for MySQLVictor Dubiniuk2016-05-231-0/+23
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #24750 from owncloud/lenz1111-share_download_range_request...Vincent Petry2016-05-235-15/+221
|\ \ \ \ \ \ \
| * | | | | | | Code style and doc fixPiotr Filiciak2016-05-233-10/+11
| * | | | | | | Http Range requests support in downloadsPiotr Filiciak2016-05-205-15/+220
* | | | | | | | Merge pull request #24729 from owncloud/try-token-login-firstVincent Petry2016-05-231-5/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | try token login firstChristoph Wurst2016-05-201-5/+13
* | | | | | | | | Merge pull request #24658 from owncloud/invalidate-disabled-user-sessionVincent Petry2016-05-232-3/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | invalidate user session if the user is disabledChristoph Wurst2016-05-232-3/+51