summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-031-0/+1
* Merge pull request #7978 from owncloud/enc_cleanupVincent Petry2014-04-021-45/+0
|\
| * there is no need to re-calculate the shares after a touchBjoern Schiessle2014-03-311-45/+0
* | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabledMorris Jobke2014-04-022-10/+8
|\ \
| * | always encrypt files to ownerBjoern Schiessle2014-03-312-10/+8
| |/
* | [tx-robot] updated from transifexJenkins for ownCloud2014-04-021-0/+1
* | Merge pull request #7997 from owncloud/correct-remember-trashbin-stateBart Visscher2014-04-011-3/+3
|\ \
| * | Remember before change works betterBart Visscher2014-04-011-3/+3
| |/
* | Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hookBjörn Schießle2014-04-013-87/+66
|\ \
| * | don't call getFileInfo() to avoid to open the same file twiceBjoern Schiessle2014-03-311-12/+16
| * | move check if a file should be encrypted to the pre hookBjoern Schiessle2014-03-312-75/+50
* | | Merge pull request #7915 from owncloud/replace-personalblockVincent Petry2014-04-012-119/+113
|\ \ \
| * \ \ external storage: fix merge conflict, indentationJan-Christoph Borchardt2014-03-312-0/+3
| |\ \ \ | | | |/ | | |/|
| * | | replace personalblock fieldset with section class in files appsJan-Christoph Borchardt2014-03-272-119/+113
| | |/ | |/|
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-011-0/+1
| |/ |/|
* | don't write file if opening a stream to encrypt the data failsBjoern Schiessle2014-03-281-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-281-0/+1
|/
* Miscellaneous text fixes for core appsRobin McCorkell2014-03-261-1/+1
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-241-0/+1
* Merge pull request #7655 from owncloud/shared-unencryptedsizeVincent Petry2014-03-211-1/+1
|\
| * Fixed warning when browsing Shared folderVincent Petry2014-03-101-1/+1
* | Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-192-0/+2
|\ \
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-03-192-0/+2
* | | Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-1757-76/+198
|\| |
| * | clearify the use-case of this appFrank Karlitschek2014-03-171-1/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-03-152-0/+2
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-03-133-0/+46
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-03-132-0/+2
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-03-128-1/+9
| * | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1155-74/+138
| |/
* / in case of phpunit executions calling header() and exit() is too badThomas Müller2014-03-141-3/+8
|/
* Return unencrypted_size of folder when queriedVincent Petry2014-03-072-0/+27
* don't create files folder, let ownCloud core handle itBjoern Schiessle2014-03-051-1/+0
* Merge pull request #7454 from owncloud/enc_remember_fopen_modeBjörn Schießle2014-02-282-6/+29
|\
| * remember original fopen access type in pre-proxy because sometimes they changeBjoern Schiessle2014-02-272-6/+29
* | Fixed wrong field nameVincent Petry2014-02-271-1/+1
* | Merge pull request #7446 from owncloud/etag_assert_fixesThomas Müller2014-02-271-2/+2
|\ \ | |/ |/|
| * use assertSame and assertNotSame for etag checksJörn Friedrich Dreyer2014-02-271-2/+2
* | close encryption session after decryption was finishedBjoern Schiessle2014-02-262-0/+16
|/
* Merge pull request #7174 from owncloud/issue/7166Jan-Christoph Borchardt2014-02-261-22/+0
|\
| * Remove duplicated definition and move OC.msg to js/js.jsJoas Schilling2014-02-191-22/+0
* | add test case if a file gets moved out from the shared folderBjoern Schiessle2014-02-242-0/+125
* | don't overwrite keys if rename was done by a stream copyBjoern Schiessle2014-02-241-4/+13
* | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-191-1/+1
* | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1814-72/+203
|\ \
| * \ Merge pull request #7190 from owncloud/appconfig-legacy-appsThomas Müller2014-02-187-19/+26
| |\ \
| | * | Remove usage of legacy OC_AppconfigRobin Appelman2014-02-137-19/+26
| | |/
| * | Merge pull request #7176 from owncloud/styleLukas Reschke2014-02-181-1/+1
| |\ \
| | * | Style fixesBart Visscher2014-02-121-1/+1
| | |/
| * | don't block login forever if we are stuck in the middle of the initial encryp...Bjoern Schiessle2014-02-175-10/+24
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-14 23:39:53 +0000