summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9240 from owncloud/enc_check_if_file_existsBjörn Schießle2014-06-302-38/+237
|\
| * improved error messageBjoern Schiessle2014-06-301-7/+8
| * unit testsBjoern Schiessle2014-06-271-19/+192
| * check if file exists before deleting keys, and add debug output for everyBjoern Schiessle2014-06-271-15/+40
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-302-38/+39
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-291-0/+1
* | Merge pull request #9265 from owncloud/fix-whitespaceMorris Jobke2014-06-281-4/+4
|\ \
| * | fix trailing whitespace noted by ScrutinizerJan-Christoph Borchardt2014-06-271-4/+4
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-281-1/+1
* | | normalize path before comparison to make sure that we always find the mount p...Bjoern Schiessle2014-06-271-1/+2
|/ /
* / [tx-robot] updated from transifexJenkins for ownCloud2014-06-271-1/+2
|/
* Merge pull request #9171 from owncloud/enc_always_use_oc_viewBjörn Schießle2014-06-265-109/+98
|\
| * fix unit testsBjoern Schiessle2014-06-251-2/+2
| * always use a \OC\Files\ViewBjoern Schiessle2014-06-254-77/+59
| * always use oc filesystem for rename operationBjoern Schiessle2014-06-252-34/+41
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-261-0/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-251-0/+1
|/
* add unit testsBjoern Schiessle2014-06-242-2/+30
* always use '/' as directory seperatorBjoern Schiessle2014-06-241-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-242-0/+2
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-231-0/+1
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-221-0/+1
* [tx-robot] updated from transifexJenkins for ownCloud2014-06-192-0/+3
* 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