summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Remove last occurence of `forcessl`Lukas Reschke2015-08-261-2/+2
* Merge pull request #18553 from owncloud/write-l10n-on-loginThomas Müller2015-08-261-4/+12
|\
| * Save detected l10n of browser on loginMorris Jobke2015-08-251-4/+12
* | Merge pull request #17662 from owncloud/locking-dbThomas Müller2015-08-266-43/+292
|\ \
| * | Adding path to log messageThomas Müller2015-08-251-1/+1
| * | log a warning while trying to acquire a db lock from within a transactionRobin Appelman2015-08-102-5/+17
| * | add method to check if we're inside a transactionRobin Appelman2015-08-102-0/+19
| * | cleanup empty locksRobin Appelman2015-08-101-0/+14
| * | more phpdocRobin Appelman2015-08-031-1/+1
| * | more phpdocRobin Appelman2015-08-031-1/+9
| * | rename path field to keyRobin Appelman2015-08-031-8/+13
| * | initialize unused (for now) ttl field to 0Robin Appelman2015-08-031-1/+1
| * | Fix db schemaRobin Appelman2015-08-032-10/+8
| * | 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-031-0/+131
| * | split off keeping track of acquire locksRobin Appelman2015-08-032-36/+100
* | | Explicitly specify status code 200 as response codeLukas Reschke2015-08-251-0/+1
| |/ |/|
* | 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-243-10/+4
|/ /
* | Fix master againLukas Reschke2015-08-241-0/+1
* | Merge pull request #18482 from owncloud/encrypt-session-dataMorris Jobke2015-08-243-1/+283
|\ \
| * | 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-213-28/+235
* | | Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxyVincent Petry2015-08-241-0/+5
|\ \ \
| * | | Use IClientService to check for remote ownCloud instancesLukas Reschke2015-08-221-0/+5
| |/ /
* | | 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-243-3/+28
|\ \ \ \ | |_|/ / |/| | |
| * | | Add mitigation against BREACHLukas Reschke2015-08-143-3/+28
* | | | 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-202-39/+343
|\ \ \ \ \
| * | | | | Expand the doc blocks on the new methodsJoas Schilling2015-08-201-0/+15
| * | | | | 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-192-24/+315
| * | | | | Extend the interfaces IManager and IConsumer to allow passing in the objectJoas Schilling2015-08-191-25/+30
| |/ / / /
* | | | | 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-201-0/+69
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Additions to update pageVincent Petry2015-08-201-2/+4
| * | | | | Display app names in update page for app updatesVincent Petry2015-08-191-0/+67
* | | | | | 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
|\ \ \ \ \