summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #24798 from owncloud/fix-class-name-in-hookVincent Petry2016-05-251-1/+1
|\ \ \ \ \
| * | | | | Fix class name in hook registrationJoas Schilling2016-05-241-1/+1
| |/ / / /
* | | | | Merge pull request #24814 from owncloud/fix-psr4-external-masteVincent Petry2016-05-252-0/+0
|\ \ \ \ \
| * | | | | Move Stuff to PSR-4 againJoas Schilling2016-05-242-0/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #24811 from owncloud/client-login-token-2faVincent Petry2016-05-256-25/+152
|\ \ \ \ \
| * | | | | add default token auth config on install, upgrade and add it to sample configChristoph Wurst2016-05-242-0/+10
| * | | | | do not allow client password logins if token auth is enforced or 2FA is enabledChristoph Wurst2016-05-245-25/+142
* | | | | | Merge pull request #24804 from owncloud/move-search-to-psr4Vincent Petry2016-05-253-0/+0
|\ \ \ \ \ \
| * | | | | | Move public search namespace to PSR-4Joas Schilling2016-05-243-0/+0
| | |_|/ / / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-25194-0/+348
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-24324-1138/+1244
| |/ / / / |/| | | |
* | | | | Merge pull request #24748 from owncloud/login-explicitlyVincent Petry2016-05-2421-47/+117
|\ \ \ \ \
| * | | | | when generating browser/device token, save the login name for later password ...Christoph Wurst2016-05-2421-38/+106
| * | | | | generate device token for UID, not login nameChristoph Wurst2016-05-241-2/+3
| * | | | | login explicitlyChristoph Wurst2016-05-243-9/+10
* | | | | | Merge pull request #7897 from owncloud/ext-swiftcachingVincent Petry2016-05-241-17/+71
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Added object cache for Swift ext storageVincent Petry2016-05-241-17/+71
* | | | | | 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