aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
...
* Merge pull request #9093 from owncloud/remove_unused_codeMorris Jobke2014-06-195-11/+6
|\
| * remove unused codeBjoern Schiessle2014-06-185-11/+6
* | Merge pull request #9068 from owncloud/trashbin_unittests_masterBjörn Schießle2014-06-181-1/+1
|\ \ | |/ |/|
| * adjust encryption tests to the trash bin changesBjoern Schiessle2014-06-181-1/+1
* | fix rename of encryption keysBjoern Schiessle2014-06-182-8/+9
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-182-0/+2
* | Merge pull request #8399 from owncloud/server-server-sharingicewind19912014-06-173-5/+41
|\ \
| * | Fix moving movablemount over webdavRobin Appelman2014-06-171-1/+2
| * | Fix checking for external share in encryptionRobin Appelman2014-06-141-1/+4
| * | if file doesn't exist, check parent folderBjoern Schiessle2014-06-141-0/+6
| * | exclude mounted server-to-server shares from encryptionBjoern Schiessle2014-06-141-4/+28
| * | make sure to enable incognito mode when mounting a public link and update ini...Bjoern Schiessle2014-06-141-0/+2
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-172-0/+2
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-164-1/+4
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-157-0/+7
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-1443-79/+0
* fix some minor issuesVolkan Gezer2014-06-132-4/+4
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-121-1/+2
* 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