Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12896 from owncloud/drop-deprecated | Jörn Friedrich Dreyer | 2014-12-18 | 2 | -9/+14 |
|\ | | | | | first step to drop \OCP\Config:: in favour of IConfig | ||||
| * | first step to drop \OCP\Config:: in favour of IConfig | Morris Jobke | 2014-12-17 | 2 | -9/+14 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-17 | 2 | -6/+6 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-10 | 4 | -8/+12 |
| | |||||
* | Merge pull request #12568 from owncloud/autoload-encryption-classes | Joas Schilling | 2014-12-09 | 38 | -701/+678 |
|\ | | | | | Fix namespaces of encryption classes and encryption tests | ||||
| * | Correctly namespace encryption tests | Joas Schilling | 2014-12-09 | 12 | -185/+181 |
| | | |||||
| * | Use self:: instead of the class name in encryption tests | Joas Schilling | 2014-12-09 | 10 | -361/+361 |
| | | |||||
| * | Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself | Joas Schilling | 2014-12-09 | 34 | -252/+248 |
| | | |||||
| * | Fix namespace of files_encryption classes and autoload them | Joas Schilling | 2014-12-09 | 13 | -27/+12 |
| | | |||||
* | | Merge pull request #12715 from owncloud/fix-broken-personal-page | Lukas Reschke | 2014-12-09 | 1 | -1/+0 |
|\ \ | |/ |/| | remove duplicate loaded personal.js - fixes #12674 | ||||
| * | remove duplicate loaded personal.js - fixes #12674 | Morris Jobke | 2014-12-09 | 1 | -1/+0 |
| | | |||||
* | | reduce OC_Preferences, OC_Config and \OCP\Config usage | Morris Jobke | 2014-12-08 | 3 | -7/+19 |
|/ | | | | | | | | | | * files_encryption * files_versions * files_trashbin * tests * status.php * core * server container | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-08 | 2 | -0/+2 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-07 | 8 | -0/+8 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-06 | 14 | -0/+14 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-05 | 74 | -82/+14 |
| | |||||
* | update error message | Bjoern Schiessle | 2014-12-04 | 1 | -1/+1 |
| | |||||
* | OC8 and later requires PHP >= 5.4, so we can remove the check from the ↵ | Bjoern Schiessle | 2014-12-04 | 1 | -5/+1 |
| | | | | encryption app | ||||
* | fix typo | Bjoern Schiessle | 2014-12-03 | 1 | -1/+1 |
| | |||||
* | small fixes | Bjoern Schiessle | 2014-12-02 | 1 | -2/+2 |
| | |||||
* | delete old keys if file was moved to a different mount point | Bjoern Schiessle | 2014-12-02 | 1 | -4/+10 |
| | |||||
* | upgrade to new folder structure | Bjoern Schiessle | 2014-12-02 | 18 | -341/+483 |
| | |||||
* | change private/public key names for consistency reasons | Bjoern Schiessle | 2014-11-26 | 11 | -226/+202 |
| | |||||
* | harmonize copyright notice | Bjoern Schiessle | 2014-11-26 | 7 | -18/+28 |
| | |||||
* | new folder structure for keys | Bjoern Schiessle | 2014-11-26 | 14 | -1010/+497 |
| | | | | | | all keys are now in files_encryption/key/path_to_file/filename/ share keys are named: user.shareKey file key is named: fileKey | ||||
* | Merge pull request #12421 from ↵ | Morris Jobke | 2014-11-26 | 2 | -12/+12 |
|\ | | | | | | | | | owncloud/issue/6101-remove-namespace-permission-constants Issue/6101 remove namespace permission constants | ||||
| * | Replace deprecated constant with new class constant | Joas Schilling | 2014-11-25 | 2 | -12/+12 |
| | | |||||
* | | replace \OC:: with \OC::->getSession() | Bjoern Schiessle | 2014-11-25 | 1 | -2/+2 |
| | | |||||
* | | don't store private public-share-key in session | Bjoern Schiessle | 2014-11-25 | 1 | -17/+10 |
| | | |||||
* | | remove unused variable | Bjoern Schiessle | 2014-11-25 | 1 | -1/+0 |
|/ | |||||
* | use login name to verify password | Bjoern Schiessle | 2014-11-24 | 1 | -1/+2 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-22 | 2 | -2/+4 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-21 | 2 | -0/+64 |
| | |||||
* | Fix file upload to ext storage when recovery key is enabled | Vincent Petry | 2014-11-20 | 2 | -9/+58 |
| | | | | | | | | Fixes an issue when uploading files to external storage when recovery keys are enabled The Util class only works with real users, so instantiating it with the virtual recovery key user or public key user can cause issues. | ||||
* | Merge pull request #12325 from owncloud/removeunneccessarylang | Lukas Reschke | 2014-11-20 | 2 | -64/+0 |
|\ | | | | | cleanup languages. closes #11274 | ||||
| * | cleanup languages. closes #11274 | Volkan Gezer | 2014-11-20 | 2 | -64/+0 |
| | | |||||
* | | Make apps/ extend the \Test\TestCase and fix overwritten methods | Joas Schilling | 2014-11-19 | 1 | -3/+7 |
|/ | |||||
* | Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword | Lukas Reschke | 2014-11-19 | 3 | -0/+26 |
|\ | | | | | Warn for password reset when files_encryption is enabled | ||||
| * | listen to the post_passwordReset hook, backup the old keys and create a new ↵ | Bjoern Schiessle | 2014-11-17 | 3 | -0/+26 |
| | | | | | | | | key pair for the user | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-18 | 2 | -0/+16 |
|/ | |||||
* | Merge pull request #12218 from owncloud/issue/10991-fixes | Morris Jobke | 2014-11-17 | 12 | -259/+383 |
|\ | | | | | Issue/10991 Make unit tests pass on windows | ||||
| * | Fix single run of encryption tests and usages of uniqid() and fopen() | Joas Schilling | 2014-11-17 | 12 | -259/+376 |
| | | |||||
| * | Skip some more tests on Windows which just can not work at all | Joas Schilling | 2014-11-17 | 1 | -0/+7 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-17 | 2 | -14/+20 |
| | | |||||
* | | Merge pull request #9177 from owncloud/jsdocexperiment | Vincent Petry | 2014-11-13 | 1 | -0/+4 |
|\ \ | | | | | | | Improved JS Docs + added build script for JS Docs | ||||
| * | | Improved Javascript docs for JSDoc | Vincent Petry | 2014-10-31 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | Added namespaces so that JSDoc can find them. Fixed a few warnings. Improved some comments. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-13 | 2 | -6/+6 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-12 | 8 | -2/+20 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-11 | 2 | -4/+4 |
| | | | |||||
* | | | Merge pull request #12027 from owncloud/cleanup_exceptions | Vincent Petry | 2014-11-10 | 8 | -93/+155 |
|\ \ \ | | | | | | | | | [encryption] clean up encryption exceptions |