aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #12896 from owncloud/drop-deprecatedJörn Friedrich Dreyer2014-12-182-9/+14
|\
| * first step to drop \OCP\Config:: in favour of IConfigMorris Jobke2014-12-172-9/+14
* | [tx-robot] updated from transifexJenkins for ownCloud2014-12-172-6/+6
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-104-8/+12
* Merge pull request #12568 from owncloud/autoload-encryption-classesJoas Schilling2014-12-0938-701/+678
|\
| * Correctly namespace encryption testsJoas Schilling2014-12-0912-185/+181
| * Use self:: instead of the class name in encryption testsJoas Schilling2014-12-0910-361/+361
| * Update OCA\Encryption to OCA\Files_Encryption in the encryption app itselfJoas Schilling2014-12-0934-252/+248
| * Fix namespace of files_encryption classes and autoload themJoas Schilling2014-12-0913-27/+12
* | Merge pull request #12715 from owncloud/fix-broken-personal-pageLukas Reschke2014-12-091-1/+0
|\ \ | |/ |/|
| * remove duplicate loaded personal.js - fixes #12674Morris Jobke2014-12-091-1/+0
* | reduce OC_Preferences, OC_Config and \OCP\Config usageMorris Jobke2014-12-083-7/+19
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-082-0/+2
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-078-0/+8
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-0614-0/+14
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-0574-82/+14
* update error messageBjoern Schiessle2014-12-041-1/+1
* OC8 and later requires PHP >= 5.4, so we can remove the check from the encryp...Bjoern Schiessle2014-12-041-5/+1
* fix typoBjoern Schiessle2014-12-031-1/+1
* small fixesBjoern Schiessle2014-12-021-2/+2
* delete old keys if file was moved to a different mount pointBjoern Schiessle2014-12-021-4/+10
* upgrade to new folder structureBjoern Schiessle2014-12-0218-341/+483
* change private/public key names for consistency reasonsBjoern Schiessle2014-11-2611-226/+202
* harmonize copyright noticeBjoern Schiessle2014-11-267-18/+28
* new folder structure for keysBjoern Schiessle2014-11-2614-1010/+497
* Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permissio...Morris Jobke2014-11-262-12/+12
|\
| * Replace deprecated constant with new class constantJoas Schilling2014-11-252-12/+12
* | replace \OC:: with \OC::->getSession()Bjoern Schiessle2014-11-251-2/+2
* | don't store private public-share-key in sessionBjoern Schiessle2014-11-251-17/+10
* | remove unused variableBjoern Schiessle2014-11-251-1/+0
|/
* use login name to verify passwordBjoern Schiessle2014-11-241-1/+2
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-222-2/+4
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-212-0/+64
* Fix file upload to ext storage when recovery key is enabledVincent Petry2014-11-202-9/+58
* Merge pull request #12325 from owncloud/removeunneccessarylangLukas Reschke2014-11-202-64/+0
|\
| * cleanup languages. closes #11274Volkan Gezer2014-11-202-64/+0
* | Make apps/ extend the \Test\TestCase and fix overwritten methodsJoas Schilling2014-11-191-3/+7
|/
* Merge pull request #11696 from owncloud/addWarningToEncryptionLostPasswordLukas Reschke2014-11-193-0/+26
|\
| * listen to the post_passwordReset hook, backup the old keys and create a new k...Bjoern Schiessle2014-11-173-0/+26
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-182-0/+16
|/
* Merge pull request #12218 from owncloud/issue/10991-fixesMorris Jobke2014-11-1712-259/+383
|\
| * Fix single run of encryption tests and usages of uniqid() and fopen()Joas Schilling2014-11-1712-259/+376
| * Skip some more tests on Windows which just can not work at allJoas Schilling2014-11-171-0/+7
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-172-14/+20
* | Merge pull request #9177 from owncloud/jsdocexperimentVincent Petry2014-11-131-0/+4
|\ \
| * | Improved Javascript docs for JSDocVincent Petry2014-10-311-0/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-132-6/+6
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-128-2/+20
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-112-4/+4
* | | Merge pull request #12027 from owncloud/cleanup_exceptionsVincent Petry2014-11-108-93/+155
|\ \ \