summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \
| * | | clean up encryption exceptionsBjoern Schiessle2014-11-078-93/+155
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-104-0/+8
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0910-6/+36
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0818-4/+56
* | | | only set the values we need and make sure that we write the file info for bothBjoern Schiessle2014-11-071-3/+7
* | | | also try to get file info from part fileBjoern Schiessle2014-11-071-2/+2
|/ / /
* | | Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_...Lukas Reschke2014-11-074-2/+15
|\ \ \
| * | | throw exception if private key is missingBjoern Schiessle2014-11-053-0/+14
| * | | still try to encrypt files, even if the session is not initialized. The strea...Bjoern Schiessle2014-11-041-2/+1
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-0780-80/+0
* | | check if the provided password is really the current log-in passwordBjoern Schiessle2014-11-061-1/+15
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2014-11-052-0/+12
|/
* Merge pull request #11876 from owncloud/remove-pointless-requiresLukas Reschke2014-10-3110-71/+0
|\
| * remove unnecessary require calls - the ownCloud class loader is supposed to t...Thomas Müller2014-10-3010-71/+0
* | Merge pull request #11659 from jknockaert/masterVincent Petry2014-10-301-38/+54
|\ \ | |/ |/|
| * initialisation of cipherjknockaert2014-10-281-1/+1
| * small fixjknockaert2014-10-201-0/+1
| * bugfixesjknockaert2014-10-201-5/+6
| * ok; still some bugs that had to be fixedjknockaert2014-10-201-39/+35
| * small fixjknockaert2014-10-191-1/+2
| * rework getFileSizejknockaert2014-10-191-28/+45
* | Properly register sharing hooks and proxiesVincent Petry2014-10-301-1/+7
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-306-6/+48
* | Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolderMorris Jobke2014-10-292-34/+41
|\ \
| * | Added encryption test when moving file as non-ownerVincent Petry2014-10-291-2/+15
| * | Fix moving share keys as non-owner to subdirVincent Petry2014-10-291-32/+26
* | | update all translation files to js and jsonThomas Müller2014-10-29198-2050/+4058
* | | Added OC.L10N namespace with translation functionsVincent Petry2014-10-291-0/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-10-291-0/+6
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-282-3/+18
* | Add type hinting to functionsLukas Reschke2014-10-241-4/+6
* | Make files non executableLukas Reschke2014-10-243-0/+0
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-241-0/+6
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-221-1/+42
* | [tx-robot] updated from transifexJenkins for ownCloud2014-10-212-2/+8
* | make tests compatible with hook based skeleton generationJörn Friedrich Dreyer2014-10-2011-8/+85