aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #24833 from owncloud/fix_24832Vincent Petry2016-05-251-0/+7
|\ \ \ \ | |_|/ / |/| | |
| * | | don't fail on "bad signature" during login. Most likely this happens becauseBjörn Schießle2016-05-251-0/+7
|/ / /
* | | Merge pull request #24735 from juliushaertl/passwordreset-invalidVincent Petry2016-05-252-18/+139
|\ \ \
| * | | Add more tests for OC\Core\Controller\LostControllerJulius Haertl2016-05-231-3/+104
| * | | Show error messages if a password reset link is invalid or expiredJulius Haertl2016-05-231-15/+35
* | | | Merge pull request #24812 from owncloud/fkammer-enhancement-cache-folder-gc-ttlVincent Petry2016-05-252-1/+17
|\ \ \ \ | |_|_|/ |/| | |
| * | | Changed labels of chunk TTL to mention chunksVincent Petry2016-05-242-3/+3
| * | | Move cache chunk TTL value to FileChunking classVincent Petry2016-05-242-2/+10
| * | | Add config value for cache gc ttlFrederik Kammer2016-05-242-1/+9
* | | | Fix ShareControllerTest (#24824)Joas Schilling2016-05-251-1/+5
* | | | Merge pull request #24444 from owncloud/update-notifications-for-core-and-appsVincent Petry2016-05-2510-1/+911
|\ \ \ \
| * | | | Add a URL to the notificationsJoas Schilling2016-05-242-17/+48
| * | | | The setting only affects available core updatesJoas Schilling2016-05-242-3/+7
| * | | | Add tests for the NotifierJoas Schilling2016-05-242-1/+105
| * | | | Add tests for the background jobJoas Schilling2016-05-244-13/+450
| * | | | Make the group selectableJoas Schilling2016-05-244-2/+37
| * | | | Dismiss the notifications when the update is already installedJoas Schilling2016-05-242-4/+47
| * | | | Add a notifier that parses the notificationsJoas Schilling2016-05-242-0/+79
| * | | | Add a background job that generates notifications when an update is availableJoas Schilling2016-05-243-1/+178
* | | | | 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