Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-27 | 6 | -0/+6 |
| | |||||
* | Remove last occurence of `forcessl` | Lukas Reschke | 2015-08-26 | 1 | -2/+2 |
| | | | | This shoudl have been adjusted as well, now it's consistent with `setMagicInCookie`. While it does not have a security impact directly some automated scanners reported this all the time. | ||||
* | Remove languages which are no longer maintained on transifex | Thomas Müller | 2015-08-26 | 34 | -342/+0 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-26 | 12 | -0/+14 |
| | |||||
* | Merge pull request #18553 from owncloud/write-l10n-on-login | Thomas Müller | 2015-08-26 | 1 | -4/+12 |
|\ | | | | | Save detected l10n of browser on login | ||||
| * | Save detected l10n of browser on login | Morris Jobke | 2015-08-25 | 1 | -4/+12 |
| | | | | | | | | * fixes owncloud/activity#373 | ||||
* | | Merge pull request #17662 from owncloud/locking-db | Thomas Müller | 2015-08-26 | 7 | -43/+300 |
|\ \ | | | | | | | Database backend for locking | ||||
| * | | Adding path to log message | Thomas Müller | 2015-08-25 | 1 | -1/+1 |
| | | | |||||
| * | | log a warning while trying to acquire a db lock from within a transaction | Robin Appelman | 2015-08-10 | 2 | -5/+17 |
| | | | |||||
| * | | add method to check if we're inside a transaction | Robin Appelman | 2015-08-10 | 3 | -0/+27 |
| | | | |||||
| * | | cleanup empty locks | Robin Appelman | 2015-08-10 | 1 | -0/+14 |
| | | | |||||
| * | | more phpdoc | Robin Appelman | 2015-08-03 | 1 | -1/+1 |
| | | | |||||
| * | | more phpdoc | Robin Appelman | 2015-08-03 | 1 | -1/+9 |
| | | | |||||
| * | | rename path field to key | Robin Appelman | 2015-08-03 | 1 | -8/+13 |
| | | | |||||
| * | | initialize unused (for now) ttl field to 0 | Robin Appelman | 2015-08-03 | 1 | -1/+1 |
| | | | |||||
| * | | Fix db schema | Robin Appelman | 2015-08-03 | 3 | -10/+9 |
| | | | |||||
| * | | use the database backend for locking if no memcache is configured for it | Robin Appelman | 2015-08-03 | 1 | -4/+2 |
| | | | |||||
| * | | Add database backend for high level locking | Robin Appelman | 2015-08-03 | 2 | -1/+131 |
| | | | |||||
| * | | split off keeping track of acquire locks | Robin Appelman | 2015-08-03 | 2 | -36/+100 |
| | | | |||||
* | | | Merge pull request #18562 from owncloud/explicit-use-statuscode-200 | Morris Jobke | 2015-08-25 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Explicitly specify status code 200 as response code | ||||
| * | | | Explicitly specify status code 200 as response code | Lukas Reschke | 2015-08-25 | 1 | -0/+1 |
| | |/ | |/| | | | | | | | Potentially fixes https://github.com/owncloud/core/issues/17586 | ||||
* / | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-08-25 | 10 | -2/+46 |
|/ / | |||||
* | | Merge pull request #18523 from owncloud/crazy-scanner | Thomas Müller | 2015-08-25 | 1 | -4/+14 |
|\ \ | | | | | | | Prevent bkg scanner going crazy with unavailable storages (ajax/scan.php) | ||||
| * | | Prevent scanner going crazy with unavailable storages | Vincent Petry | 2015-08-24 | 1 | -4/+14 |
| | | | |||||
* | | | Remove DEBUG constant and use config value | Morris Jobke | 2015-08-24 | 4 | -14/+9 |
|/ / | | | | | | | | | * introduces config.php option 'debug' that defaults to false * migrate DEBUG constant to config value | ||||
* | | Fix master again | Lukas Reschke | 2015-08-24 | 1 | -0/+1 |
| | | | | | | | | Caused due to merge of two PRs | ||||
* | | Merge pull request #18482 from owncloud/encrypt-session-data | Morris Jobke | 2015-08-24 | 4 | -6/+290 |
|\ \ | | | | | | | Add a session wrapper to encrypt the data before storing it on disk | ||||
| * | | Handle failures gracefully, remove switch | Lukas Reschke | 2015-08-21 | 3 | -22/+97 |
| | | | |||||
| * | | Add a session wrapper to encrypt the data before storing it on disk | Joas Schilling | 2015-08-21 | 4 | -33/+242 |
| | | | |||||
* | | | Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxy | Vincent Petry | 2015-08-24 | 2 | -0/+10 |
|\ \ \ | | | | | | | | | Use client service to work behind proxy for checks for remote ownCloud instances | ||||
| * | | | Use IClientService to check for remote ownCloud instances | Lukas Reschke | 2015-08-22 | 2 | -0/+10 |
| |/ / | | | | | | | | | | | | | | | | | | | 1. Allows to set a timeout (though still not perfect but way better than before) 2. Allows to have unit tests 3. I also added unit tests for the existing controller code 4. Corrected PHPDoc on IClient | ||||
* | | | Merge pull request #17501 from tbartenstein/patch-1 | Vincent Petry | 2015-08-24 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Update fileinfo.php | ||||
| * | | | Update fileinfo.php | tbartenstein | 2015-07-08 | 1 | -1/+1 |
| | | | | | | | | | | | | Edits isMounted() to remove the check for 'local' prefix, so that folder icons are displayed correctly (see issue #10712) | ||||
* | | | | Merge pull request #18254 from owncloud/mitigate-breach | Morris Jobke | 2015-08-24 | 4 | -15/+29 |
|\ \ \ \ | |_|/ / |/| | | | Add mitigation against BREACH | ||||
| * | | | Add mitigation against BREACH | Lukas Reschke | 2015-08-14 | 4 | -15/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While BREACH requires the following three factors to be effectively exploitable we should add another mitigation: 1. Application must support HTTP compression 2. Response most reflect user-controlled input 3. Response should contain sensitive data Especially part 2 is with ownCloud not really given since user-input is usually only echoed if a CSRF token has been passed. To reduce the risk even further it is however sensible to encrypt the CSRF token with a shared secret. Since this will change on every request an attack such as BREACH is not feasible anymore against the CSRF token at least. | ||||
* | | | | Merge pull request #18426 from owncloud/joblist-next-non-existing | Morris Jobke | 2015-08-21 | 1 | -2/+15 |
|\ \ \ \ | | | | | | | | | | | handle non existing job classes in $jobList->getNext | ||||
| * | | | | handle non existing job classes in $jobList->getNext | Robin Appelman | 2015-08-19 | 1 | -2/+15 |
| | | | | | |||||
* | | | | | Merge pull request #18372 from ↵ | Joas Schilling | 2015-08-20 | 5 | -75/+601 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-18358-object-type-and-id-for-activities Issue 18358 object type and id for activities | ||||
| * | | | | | Expand the doc blocks on the new methods | Joas Schilling | 2015-08-20 | 2 | -0/+32 |
| | | | | | | |||||
| * | | | | | Remove unnecessary code | Joas Schilling | 2015-08-20 | 1 | -7/+0 |
| | | | | | | |||||
| * | | | | | Add test coverage for Activity Event and Manager | Joas Schilling | 2015-08-20 | 1 | -6/+6 |
| | | | | | | |||||
| * | | | | | Use an IEvent object instead of a huge parameter list | Joas Schilling | 2015-08-19 | 5 | -42/+533 |
| | | | | | | |||||
| * | | | | | Extend the interfaces IManager and IConsumer to allow passing in the object | Joas Schilling | 2015-08-19 | 3 | -61/+71 |
| |/ / / / | |||||
* | | | | | Merge pull request #18439 from owncloud/fix-appmanagement-install | Morris Jobke | 2015-08-20 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | [app management] fix dependency check on install | ||||
| * | | | | | [app management] fix dependency check on install | Morris Jobke | 2015-08-19 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge pull request #17434 from owncloud/update-showappnameonappupdate | Morris Jobke | 2015-08-20 | 2 | -21/+105 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Display app names in update page for app updates | ||||
| * | | | | | Additions to update page | Vincent Petry | 2015-08-20 | 2 | -6/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps to update and to disable will always be shown. Main title changes only when apps need updated, not core. Added bullet style. Exclude incompatible apps from updated apps list. | ||||
| * | | | | | Display app names in update page for app updates | Vincent Petry | 2015-08-19 | 2 | -21/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever the update page is displayed for apps, show app names instead of the core update text. | ||||
* | | | | | | Merge pull request #18432 from owncloud/ext-backends.simple | Morris Jobke | 2015-08-19 | 2 | -6/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Migrate simple external storage backends to new registration API [part 1] | ||||
| * | | | | | | Revert "Fix mounting wrapped storages resulting in many-layered wrapping" | Robin McCorkell | 2015-08-19 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 75a5e6e12b18a9f5b7b113cd7e2c9c56c204084d. |