Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15598 from owncloud/fix-enc-file-size-master | Björn Schießle | 2015-04-14 | 1 | -8/+0 |
|\ | | | | | Fix file size of encrypted files | ||||
| * | remove calculateUnencryptedSize() - not needed | Thomas Müller | 2015-04-14 | 1 | -8/+0 |
| | | |||||
* | | Move cross storage copy logic to the storage | Robin Appelman | 2015-04-13 | 1 | -0/+16 |
|/ | |||||
* | Merge pull request #15511 from owncloud/fix-typos | Lukas Reschke | 2015-04-09 | 3 | -4/+9 |
|\ | | | | | Fix typos and some other adjustments | ||||
| * | Fix typos and some other adjustments | Lukas Reschke | 2015-04-09 | 3 | -4/+9 |
| | | |||||
* | | Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting | Thomas Müller | 2015-04-09 | 1 | -4/+4 |
|\ \ | |/ |/| | Check if the key exists, before trying to delete it | ||||
| * | Check if the key exists, before trying to delete it | Joas Schilling | 2015-04-09 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #15314 from owncloud/app-categories-15274 | Lukas Reschke | 2015-04-09 | 1 | -0/+5 |
|\ \ | |/ |/| | Add different trust levels to AppStore interface | ||||
| * | Add experimental applications switch | Lukas Reschke | 2015-04-03 | 1 | -0/+5 |
| | | | | | | | | Allows administrators to disable or enabled experimental applications as well as show the trust level. | ||||
* | | Merge pull request #15196 from owncloud/limit-file-activities-to-favorites | Morris Jobke | 2015-04-09 | 3 | -2/+12 |
|\ \ | | | | | | | Limit file activities to favorites | ||||
| * | | Make scrutinizer happy | Joas Schilling | 2015-04-01 | 2 | -2/+2 |
| | | | |||||
| * | | Add logic for getting the user from the rss token to the Manager | Joas Schilling | 2015-03-30 | 1 | -0/+10 |
| | | | |||||
* | | | Merge pull request #14987 from rullzer/ocs_password_fix2 | Morris Jobke | 2015-04-08 | 1 | -0/+14 |
|\ \ \ | | | | | | | | | OCS Fixes to allow setting of password without removing additional settings | ||||
| * | | | OCS Fixes to allow setting of password without removing additional settings | Roeland Jago Douma | 2015-03-30 | 1 | -0/+14 |
| |/ / | | | | | | | | | | | | | | | | - Added setPassword to share.php - Fixed OCS API call - Added unit tests | ||||
* | | | fixing license headers - encryption code related | Thomas Müller | 2015-04-07 | 6 | -59/+55 |
| | | | |||||
* | | | PHPDoc cleanup - clean code \o/ | Thomas Müller | 2015-04-07 | 1 | -6/+7 |
| | | | |||||
* | | | implement webdav copy | Bjoern Schiessle | 2015-04-07 | 1 | -3/+9 |
| | | | |||||
* | | | cleaning up exception mess | Thomas Müller | 2015-04-07 | 1 | -0/+34 |
| | | | |||||
* | | | PHPDoc | Thomas Müller | 2015-04-07 | 1 | -2/+2 |
| | | | |||||
* | | | add helper class accessible for encryption modules to ask for a list of ↵ | Bjoern Schiessle | 2015-04-07 | 3 | -3/+42 |
| | | | | | | | | | | | | users with access to a file, needed to apply the recovery key to all files | ||||
* | | | Adding renameKeys to IStorage | Thomas Müller | 2015-04-07 | 1 | -1/+10 |
| | | | |||||
* | | | Removing left overs from old encryption app | Thomas Müller | 2015-04-07 | 1 | -1/+3 |
| | | | |||||
* | | | adding function getSecureRandom(); to IServerContainer | Thomas Müller | 2015-04-07 | 1 | -1/+7 |
| | | | |||||
* | | | make recovery settings work | Bjoern Schiessle | 2015-04-07 | 1 | -0/+12 |
| | | | |||||
* | | | core: documentation fixes | Bjoern Schiessle | 2015-04-07 | 1 | -1/+1 |
| | | | |||||
* | | | add deleteKey methods to key storage | Bjoern Schiessle | 2015-04-07 | 1 | -0/+1 |
| | | | |||||
* | | | fix keystorage and add unit tests | Bjoern Schiessle | 2015-04-07 | 2 | -94/+1 |
| | | | |||||
* | | | Initial commit | Clark Tomlinson | 2015-04-07 | 1 | -12/+18 |
| | | | |||||
* | | | create basic interfaces and wrapper to make encryption more modular | Bjoern Schiessle | 2015-04-07 | 1 | -0/+87 |
| | | | |||||
* | | | When guessing the timezone, the offset might only be valid on a given timestamp | Joas Schilling | 2015-04-07 | 1 | -1/+2 |
| | | | |||||
* | | | Merge pull request #15229 from owncloud/response-setContentLengthHeader | Thomas Müller | 2015-04-03 | 1 | -0/+8 |
|\ \ \ | |_|/ |/| | | Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround... | ||||
| * | | Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround. | Andreas Fischer | 2015-03-26 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not send Content-Length headers with a value larger than PHP_INT_MAX (2147483647) on Apache PHP SAPI 32-bit. PHP will eat them and send 2147483647 instead. When X-Sendfile is enabled, Apache will send a correct Content-Length header, even for files larger than 2147483647 bytes. When X-Sendfile is not enabled, ownCloud will not send a Content-Length header. This prevents progress bars from working, but allows the actual transfer to work properly. | ||||
* | | | Deprecate functions that only call the urlgenerator anyway | Roeland Jago Douma | 2015-04-01 | 1 | -0/+3 |
| |/ |/| | |||||
* | | Revert "Deprecated \OCP\IAppConfig - add missing methods to IConfig" | Vincent Petry | 2015-03-27 | 2 | -44/+0 |
| | | | | | | | | This reverts commit 012016d3311a13c3c1e9d60778dc6fbd6be0204e. | ||||
* | | Merge pull request #13938 from owncloud/deprecate-iappconfig | Thomas Müller | 2015-03-27 | 2 | -0/+44 |
|\ \ | | | | | | | Deprecated \OCP\IAppConfig - add missing methods to IConfig | ||||
| * | | Deprecated \OCP\IAppConfig - add missing methods to IConfig | Morris Jobke | 2015-03-17 | 2 | -0/+44 |
| | | | |||||
* | | | add deleteAllFileKeys to public interface and add "uid" as parameter for the | Bjoern Schiessle | 2015-03-27 | 2 | -1/+10 |
| | | | | | | | | | | | | update call | ||||
* | | | Merge pull request #15234 from owncloud/encryption2_core | Thomas Müller | 2015-03-26 | 3 | -0/+324 |
|\ \ \ | | | | | | | | | core part of encryption 2.0 | ||||
| * | | | implement basic encryption functionallity in core to enable multiple ↵ | Bjoern Schiessle | 2015-03-26 | 3 | -0/+324 |
| | | | | | | | | | | | | | | | | encryption modules | ||||
* | | | | Update license headers | Jenkins for ownCloud | 2015-03-26 | 137 | -1245/+2172 |
| |_|/ |/| | | |||||
* | | | Add wrapper for Guzzle | Lukas Reschke | 2015-03-25 | 4 | -0/+247 |
| | | | |||||
* | | | Merge pull request #15153 from owncloud/uniquename-node | Lukas Reschke | 2015-03-24 | 1 | -0/+9 |
|\ \ \ | | | | | | | | | Add `getNonExistingName()` to the node api | ||||
| * | | | Add `getNonExistingName()` to the node api | Robin Appelman | 2015-03-24 | 1 | -0/+9 |
| |/ / | |||||
* / / | Properly catch whether a share is `null` | Lukas Reschke | 2015-03-24 | 1 | -0/+43 |
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Despite it's PHPDoc the function might return `null` which was not properly catched and thus in some situations the share was resolved to the sharing users root directory. To test this perform the following steps: * Share file in owncloud 7 (7.0.4.2) * Delete the parent folder of the shared file * The share stays is in the DB and the share via the sharelink is inaccessible. (which is good) * Upgrade to owncloud 8 (8.0.2) (This step is crucial. The bug is not reproduceable without upgrading from 7 to 8. It seems like the old tokens are handled different than the newer ones) * Optional Step: Logout, Reset Browser Session, etc. * Access the share via the old share url: almost empty page, but there is a dowload button which adds a "/download" to the URL. * Upon clicking, a download.zip is downloaded which contains EVERYTHING from the owncloud directory (of the user who shared the file) * No exception is thrown and no error is logged. This will add a check whether the share is a valid one and also adds unit tests to prevent further regressions in the future. Needs to be backported to ownCloud 8. Adding a proper clean-up of the orphaned shares is out-of-scope and would probably require some kind of FK or so. Fixes https://github.com/owncloud/core/issues/15097 | ||||
* | | Merge pull request #14857 from owncloud/preview-provider-registration-in-manager | Thomas Müller | 2015-03-20 | 4 | -8/+215 |
|\ \ | | | | | | | Preview provider registration in manager | ||||
| * | | Remove load*() methods from public interface | Joas Schilling | 2015-03-16 | 1 | -48/+1 |
| | | | | | | | | | | | | We shall add a factory for that in the future | ||||
| * | | Create an interface for OC_Image and OCP\Image for the public API | Joas Schilling | 2015-03-16 | 4 | -6/+197 |
| | | | |||||
| * | | Add more type hinting | Joas Schilling | 2015-03-16 | 2 | -2/+2 |
| | | | |||||
| * | | Add an interface for the preview providers | Joas Schilling | 2015-03-16 | 1 | -0/+41 |
| | | | |||||
| * | | Clean up some docs | Joas Schilling | 2015-03-16 | 1 | -3/+3 |
| | | |