summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | Fix db schemaRobin Appelman2015-08-033-10/+9
| * | | | use the database backend for locking if no memcache is configured for itRobin Appelman2015-08-031-4/+2
| * | | | Add database backend for high level lockingRobin Appelman2015-08-032-1/+131
| * | | | split off keeping track of acquire locksRobin Appelman2015-08-032-36/+100
* | | | | Merge pull request #18562 from owncloud/explicit-use-statuscode-200Morris Jobke2015-08-251-0/+1
|\ \ \ \ \
| * | | | | Explicitly specify status code 200 as response codeLukas Reschke2015-08-251-0/+1
| | |/ / / | |/| | |
* / | | | [tx-robot] updated from transifexJenkins for ownCloud2015-08-2510-2/+46
|/ / / /
* | | | Merge pull request #18523 from owncloud/crazy-scannerThomas Müller2015-08-251-4/+14
|\ \ \ \
| * | | | Prevent scanner going crazy with unavailable storagesVincent Petry2015-08-241-4/+14
* | | | | Remove DEBUG constant and use config valueMorris Jobke2015-08-244-14/+9
|/ / / /
* | | | Fix master againLukas Reschke2015-08-241-0/+1
* | | | Merge pull request #18482 from owncloud/encrypt-session-dataMorris Jobke2015-08-244-6/+290
|\ \ \ \ | |_|_|/ |/| | |
| * | | Handle failures gracefully, remove switchLukas Reschke2015-08-213-22/+97
| * | | Add a session wrapper to encrypt the data before storing it on diskJoas Schilling2015-08-214-33/+242
* | | | Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxyVincent Petry2015-08-242-0/+10
|\ \ \ \
| * | | | Use IClientService to check for remote ownCloud instancesLukas Reschke2015-08-222-0/+10
| |/ / /
* | | | Merge pull request #17501 from tbartenstein/patch-1Vincent Petry2015-08-241-1/+1
|\ \ \ \
| * | | | Update fileinfo.phptbartenstein2015-07-081-1/+1
* | | | | Merge pull request #18254 from owncloud/mitigate-breachMorris Jobke2015-08-244-15/+29
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add mitigation against BREACHLukas Reschke2015-08-144-15/+29
* | | | | Merge pull request #18426 from owncloud/joblist-next-non-existingMorris Jobke2015-08-211-2/+15
|\ \ \ \ \
| * | | | | handle non existing job classes in $jobList->getNextRobin Appelman2015-08-191-2/+15
| | |_|_|/ | |/| | |
* | | | | Merge pull request #18372 from owncloud/issue-18358-object-type-and-id-for-ac...Joas Schilling2015-08-205-75/+601
|\ \ \ \ \
| * | | | | 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-201-6/+6
| * | | | | Use an IEvent object instead of a huge parameter listJoas Schilling2015-08-195-42/+533
| * | | | | Extend the interfaces IManager and IConsumer to allow passing in the objectJoas Schilling2015-08-193-61/+71
| |/ / / /
* | | | | Merge pull request #18439 from owncloud/fix-appmanagement-installMorris Jobke2015-08-201-1/+1
|\ \ \ \ \
| * | | | | [app management] fix dependency check on installMorris Jobke2015-08-191-1/+1
* | | | | | Merge pull request #17434 from owncloud/update-showappnameonappupdateMorris Jobke2015-08-202-21/+105
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Additions to update pageVincent Petry2015-08-202-6/+9
| * | | | | Display app names in update page for app updatesVincent Petry2015-08-192-21/+102
* | | | | | Merge pull request #18432 from owncloud/ext-backends.simpleMorris Jobke2015-08-192-6/+5
|\ \ \ \ \ \
| * | | | | | Revert "Fix mounting wrapped storages resulting in many-layered wrapping"Robin McCorkell2015-08-191-6/+1
| * | | | | | Implement password authentication mechanismsRobin McCorkell2015-08-191-0/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #18427 from owncloud/fix-format-ocsThomas Müller2015-08-191-1/+2
|\ \ \ \ \ \
| * | | | | | Fix format of log/private/ocs.phpMorris Jobke2015-08-191-1/+2
| |/ / / / /
* / / / / / Add warning for not existing CA bundle when updatingLukas Reschke2015-08-191-0/+7
|/ / / / /
* | | | | Merge pull request #18374 from owncloud/router-appsMorris Jobke2015-08-192-0/+16
|\ \ \ \ \
| * | | | | Only load app routes if the app has already been loadedRobin McCorkell2015-08-182-0/+16
* | | | | | Merge pull request #14314 from owncloud/clean-up-ocs-codeBernhard Posselt2015-08-183-64/+6
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Cleanup OCS codeLukas Reschke2015-08-143-64/+6
* | | | | | Merge pull request #17182 from owncloud/user_ini_upload_sizeRobin McCorkell2015-08-171-34/+57
|\ \ \ \ \ \
| * | | | | | Unit test OC_Files::setUploadLimit()Robin McCorkell2015-07-201-14/+11
| * | | | | | Update .user.ini when setting upload size limitRobin McCorkell2015-07-201-22/+48
* | | | | | | Degrade log message about missing app in appstore to debugMorris Jobke2015-08-171-1/+1
* | | | | | | Adding EventDispatcher to IServerContainerThomas Müller2015-08-142-2/+24
| |/ / / / / |/| | | | |
* | | | | | With V2 we should ensure that the status codes are kept in syncThomas Müller2015-08-133-7/+9
| |_|/ / / |/| | | |
* | | | | Merge pull request #17982 from owncloud/appframework-sanitize-nameThomas Müller2015-08-121-0/+10
|\ \ \ \ \