summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* disable failing testsBjoern Schiessle2014-06-111-0/+6
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-111-0/+7
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-101-0/+9
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-091-0/+1
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-081-0/+1
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-071-0/+1
* remove unused variableBjoern Schiessle2014-06-061-1/+1
* remove encryption keys if user unshares a fileBjoern Schiessle2014-06-063-3/+60
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-061-0/+2
* adding unit tests for encryption data migrationThomas Müller2014-06-054-14/+224
* use oc_preferences instead of oc_encryption to store encyption settingsBjoern Schiessle2014-06-059-184/+69
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-051-0/+1
* Upgrade SabreDAV to 1.8.10Thomas Müller2014-06-041-4/+4
* Merge pull request #8662 from owncloud/f-lockThomas Müller2014-06-044-13/+21
|\
| * workaround to get the unit test goingThomas Müller2014-06-041-4/+6
| * get the storage from the viewBjoern Schiessle2014-06-041-4/+5
| * don't ask for fileInfo if we already have oneBjoern Schiessle2014-06-041-5/+4
| * make sure to close the stream at the end of each testBjoern Schiessle2014-06-041-0/+6
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-043-8/+10
|/
* Merge pull request #8729 from owncloud/add-phpseclib-masterThomas Müller2014-06-034-16/+9
|\
| * use phpseclib from 3rdpartyThomas Müller2014-06-034-16/+9
* | Merge pull request #8676 from owncloud/encryption_improvementsMorris Jobke2014-06-024-155/+102
|\ \
| * | ceanup encryption code, improved return codesBjoern Schiessle2014-06-024-155/+102
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-011-0/+1
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-314-0/+5
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-302-0/+2
* | Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanagerRobin McCorkell2014-05-292-18/+9
|\ \
| * | get mount point from mount managerBjoern Schiessle2014-05-282-18/+9
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-05-2910-1/+17
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-2833-33/+0
* | Merge pull request #8713 from owncloud/typo-files-encrThomas Müller2014-05-271-2/+2
|\ \
| * | fix grammarVolkan Gezer2014-05-251-2/+2
* | | Adjust core apps to use "requiremin" instead of "require"Vincent Petry2014-05-271-1/+1
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2014-05-261-13/+13
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-251-1/+1
* Merge pull request #8637 from owncloud/enc_improved_error_handlingVincent Petry2014-05-212-3/+49
|\
| * only start migration if the encryption was initialized; allow to overwrite ke...Bjoern Schiessle2014-05-192-3/+49
* | Remove all occurences of @brief and @returns from PHPDocMorris Jobke2014-05-1921-149/+149
|/
* Fix whitespace issuesRobin McCorkell2014-05-162-2/+2
* Fix more missing or broken PHPDocRobin McCorkell2014-05-162-2/+2
* Fix PHPDoc in /appsRobin McCorkell2014-05-1610-45/+43
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-162-0/+5
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-151-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2014-05-141-7/+38
* @returns -> @returnThomas Müller2014-05-132-11/+11
* Merge pull request #8398 from owncloud/enc_backup_keysBjörn Schießle2014-05-132-2/+13
|\
| * backup the encryption key after the encryption was disabled so that the userBjoern Schiessle2014-05-132-2/+13
* | remove legacy aka deprecated code: OC_FilesystemViewThomas Müller2014-05-1221-80/+80
* | remove legacy aka deprecated code: OC_FilesystemThomas Müller2014-05-123-5/+5
|/
* only update the values which really changedBjoern Schiessle2014-04-301-8/+6