summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-05-24324-1138/+1244
|
* Merge pull request #24748 from owncloud/login-explicitlyVincent Petry2016-05-2421-47/+117
|\ | | | | Log in explicitly, save login name when generating browser/device tokens
| * when generating browser/device token, save the login name for later password ↵Christoph Wurst2016-05-2421-38/+106
| | | | | | | | checks
| * generate device token for UID, not login nameChristoph Wurst2016-05-241-2/+3
| | | | | | | | fixes #24785
| * 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 storage
| * | Added object cache for Swift ext storageVincent Petry2016-05-241-17/+71
| | | | | | | | | | | | | | | This avoid calling the remote API for repeated calls to is_dir, filetype, etc
* | | Merge pull request #24760 from owncloud/objectstore_multibucketVincent Petry2016-05-244-2/+409
|\ \ \ | | | | | | | | Objectstore multibucket
| * | | 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
|\ \ \ \ | | | | | | | | | | Update google-api-php-client to 1.1.7
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed group share searching for members of multiple group. Issue #11808. * Fixed group share searching, continued. Avoid searching for empty group list in getItemSharedWithUser(). Broke tests in previous commit, #12030. * Simler check for group count. * Fix for https://github.com/owncloud/core/issues/24783 , described there * Now it's #24272, 24783 was a duplicate. Previous change was also not very good. Now we don't create ZIP with a single file inside.
* | | | Merge pull request #24809 from owncloud/remove-console-logVincent Petry2016-05-241-1/+0
|\ \ \ \ | | | | | | | | | | remove debug console.log
| * | | | remove debug console.logChristoph Wurst2016-05-241-1/+0
| | | | |
* | | | | Merge pull request #24346 from lenz1111/fix_24331Vincent Petry2016-05-243-5/+8
|\ \ \ \ \ | |_|/ / / |/| | | | Fix: Bugs in shared link with video #24331
| * | | | 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 ↵Vincent Petry2016-05-241-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-path-to-3rdparty-after-move-to-lib-Lib Fix import path for 3rdparty dropbox autoloader
| * | | | | Fix import path for 3rdparty dropbox autoloaderJoas Schilling2016-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | We moved the file by one level
* | | | | | Merge pull request #22929 from owncloud/bugfix-removequota-subadminsVincent Petry2016-05-241-5/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Bugfix removequota subadmins
| * | | | | 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Move files_external to PSR-4
| * | | | | 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 onResize
| * | | | | dont update search onResizeFabian2016-05-171-2/+0
| | | | | | | | | | | | | | | | | | this.updateSearch() sets the current file list instance and clears the box. This is unnecessary and makes the search box unsuable on some mobile devices where a keyboard fade-in causes a onResize trigger, which would then clear and blur the box.
* | | | | | Merge pull request #24788 from owncloud/config-filesystem_check_changesVincent Petry2016-05-241-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | clarify filesystem_check_changes in config.sample.php
| * | | | | | 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 updated
| * | | | | | | 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 MySQL
| * | | | | | | Speedup schema cloning for MySQLVictor Dubiniuk2016-05-231-0/+23
| | |_|_|_|_|/ | |/| | | | |