summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Add database update routine and bump version to 0.6.2Lennart Rosam2015-08-192-1/+16
| * | | Remove another occurance of ldap_nocaseLennart Rosam2015-08-191-14/+0
| * | | Fix 17677Lennart Rosam2015-08-123-5/+1
* | | | Merge pull request #18513 from owncloud/fix-master-againVincent Petry2015-08-241-0/+1
|\ \ \ \
| * | | | Fix master againLukas Reschke2015-08-241-0/+1
* | | | | Merge pull request #18477 from owncloud/fed-alwaysdetectremotechangesVincent Petry2015-08-241-0/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Always detect remote changes for fed sharingVincent Petry2015-08-211-0/+2
| | |/ / | |/| |
* | | | Merge pull request #18482 from owncloud/encrypt-session-dataMorris Jobke2015-08-248-7/+430
|\ \ \ \
| * | | | Handle failures gracefully, remove switchLukas Reschke2015-08-214-25/+101
| * | | | Add a session wrapper to encrypt the data before storing it on diskJoas Schilling2015-08-218-34/+381
| |/ / /
* | | | Merge pull request #18121 from owncloud/enc_improve_privkey_encryptionLukas Reschke2015-08-2411-37/+343
|\ \ \ \
| * | | | use uid as additional information for saltBjoern Schiessle2015-08-075-17/+17
| * | | | use password hash instead of the plain password to encrypt the private keyBjoern Schiessle2015-08-0711-29/+335
* | | | | Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxyVincent Petry2015-08-248-53/+258
|\ \ \ \ \
| * | | | | Add CORS header to status.php so that we can migrate to a JS based check in t...Lukas Reschke2015-08-221-0/+1
| * | | | | Use IClientService to check for remote ownCloud instancesLukas Reschke2015-08-227-53/+257
| | |/ / / | |/| | |
* | | | | Merge pull request #18505 from owncloud/fix-personal-scrollbarMorris Jobke2015-08-241-0/+1
|\ \ \ \ \
| * | | | | fix horizontal scrollbar in personal settings caused by federated cloud ID se...Jan-Christoph Borchardt2015-08-241-0/+1
* | | | | | Merge pull request #18498 from owncloud/remove-csrf-check-for-avatarVincent Petry2015-08-243-3/+4
|\ \ \ \ \ \
| * | | | | | Remove requesttoken for avatarsLukas Reschke2015-08-233-3/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #17501 from tbartenstein/patch-1Vincent Petry2015-08-242-2/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | fix unit test for folder renaming (icon)tbartenstein2015-08-211-1/+1
| * | | | | Update fileinfo.phptbartenstein2015-07-081-1/+1
* | | | | | Merge pull request #18254 from owncloud/mitigate-breachMorris Jobke2015-08-2417-32/+160
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove search box $_POST since it is unusedLukas Reschke2015-08-141-1/+1
| * | | | | Add mitigation against BREACHLukas Reschke2015-08-1416-31/+159
* | | | | | Merge pull request #18472 from owncloud/ext-array-filterRobin McCorkell2015-08-211-10/+15
|\ \ \ \ \ \
| * | | | | | Replace array_filter() with foreach for PHP <5.6Robin McCorkell2015-08-211-10/+15
* | | | | | | Merge pull request #18395 from owncloud/hide-empty-security-warningRobin McCorkell2015-08-213-0/+12
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | add success messageMorris Jobke2015-08-213-1/+9
| * | | | | | [admin settings] hide security warnings if emptyMorris Jobke2015-08-181-0/+4
* | | | | | | Merge pull request #18456 from owncloud/fix-unrelated-cron-errorsThomas Müller2015-08-211-0/+2
|\ \ \ \ \ \ \
| * | | | | | | Clear cron errors on change of background job modeMorris Jobke2015-08-201-0/+2
* | | | | | | | Merge pull request #18471 from hasso/shorts-fixVincent Petry2015-08-213-3/+73
|\ \ \ \ \ \ \ \
| * | | | | | | | Make short versions of weekday/month names translatableHasso Tepper2015-08-213-3/+73
* | | | | | | | | Merge pull request #18426 from owncloud/joblist-next-non-existingMorris Jobke2015-08-212-2/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | handle non existing job classes in $jobList->getNextRobin Appelman2015-08-192-2/+41
* | | | | | | | | | Merge pull request #18468 from owncloud/sharing_availability_fixMorris Jobke2015-08-212-0/+26
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add availability methods to files_external FailedStorageRobin McCorkell2015-08-201-0/+8
| * | | | | | | | | Prevent shares being added to oc_storages via availabilityRobin McCorkell2015-08-201-0/+18
* | | | | | | | | | Merge pull request #18457 from owncloud/test-traitsRobin McCorkell2015-08-204-44/+127
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | add test mountprovider logic to a traitRobin Appelman2015-08-202-31/+60
| * | | | | | | | | allow moving common test logic into traitsRobin Appelman2015-08-203-14/+68
* | | | | | | | | | Merge pull request #18459 from owncloud/files-detailtabview-namespaceThomas Müller2015-08-201-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add namespace in case the file is loaded individuallyVincent Petry2015-08-201-0/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #18372 from owncloud/issue-18358-object-type-and-id-for-ac...Joas Schilling2015-08-207-82/+813
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Expand the doc blocks on the new methodsJoas Schilling2015-08-202-0/+32
| * | | | | | | | | | Remove unnecessary codeJoas Schilling2015-08-201-7/+0
| * | | | | | | | | | Add test coverage for Activity Event and ManagerJoas Schilling2015-08-202-7/+202
| * | | | | | | | | | Use an IEvent object instead of a huge parameter listJoas Schilling2015-08-196-48/+549