aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Miscellaneous text fixes for core appsRobin McCorkell2014-03-261-1/+1
| | |
* | | merge master into webdav-injectionRobin Appelman2014-03-2660-79/+236
|\| |
| * | [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 folder
| | * | Fixed warning when browsing Shared folderVincent Petry2014-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | The virtual "Shared" folder doesn't have an unencrypted_size field. This fix adds a check to prevent warnings in the log.
| * | | Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-192-0/+2
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: apps/files/ajax/upgrade.php
| | * | [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
| | | | | | | | | | | | This fixes the "used space" to be based on the unencrypted size, not encrypted size, to be consistent with how quota/space is handled when encryption is enabled
* | merge master into webdav-injectionRobin Appelman2014-03-066-32/+48
|\|
| * 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
| |\ | | | | | | [enc] remember original fopen access type in pre-proxy
| | * remember original fopen access type in pre-proxy because sometimes they changeBjoern Schiessle2014-02-272-6/+29
| | | | | | | | | | | | during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
| * | Fixed wrong field nameVincent Petry2014-02-271-1/+1
| | | | | | | | | | | | | | | | | | | | | This re-fixes an issue where the unencrypted size isn't updated correctly when saving a text file in the UI multiple times. Fixes #7467
| * | Merge pull request #7446 from owncloud/etag_assert_fixesThomas Müller2014-02-271-2/+2
| |\ \ | | |/ | |/| use assertSame and assertNotSame for etag checks
| | * 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
| |\ | | | | | | Add option to change email settings in admin section
| | * Remove duplicated definition and move OC.msg to js/js.jsJoas Schilling2014-02-191-22/+0
| | | | | | | | | | | | Fix issue #7166
* | | Fix encryption webdav testsRobin Appelman2014-03-052-6/+19
|/ /
* | 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
| | | | | | | | | | | | | | | | | | | | | | This patch was automatically generated as part of the following inspection: https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720 Enabled analysis tools: - PHP Analyzer - JSHint - PHP Copy/Paste Detector - PHP PDepend
* | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-1814-72/+203
|\ \ | | | | | | | | | | | | Conflicts: lib/private/migration/content.php
| * \ Merge pull request #7190 from owncloud/appconfig-legacy-appsThomas Müller2014-02-187-19/+26
| |\ \ | | | | | | | | Remove usage of legacy OC_Appconfig
| | * | Remove usage of legacy OC_AppconfigRobin Appelman2014-02-137-19/+26
| | |/
| * | Merge pull request #7176 from owncloud/styleLukas Reschke2014-02-181-1/+1
| |\ \ | | | | | | | | Some style fixes
| | * | Style fixesBart Visscher2014-02-121-1/+1
| | |/
| * | don't block login forever if we are stuck in the middle of the initial ↵Bjoern Schiessle2014-02-175-10/+24
| | | | | | | | | | | | encryption
| * | catch errors during decryptionBjoern Schiessle2014-02-172-16/+105
| | |
| * | catch errors during initial encryptionBjoern Schiessle2014-02-172-26/+47
| | |
* | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-146-19/+26
|\| | | | | | | | | | | | | | Conflicts: lib/private/appconfig.php
| * | fileinfo is no longer a arrayBjoern Schiessle2014-02-141-1/+1
| | |
| * | Merge pull request #6748 from owncloud/fileinfoicewind19912014-02-144-15/+15
| |\ \ | | |/ | |/| Add a FileInfo class which holds all info of a file ...
| | * merge master into fileinfoRobin Appelman2014-01-2910-81/+76
| | |\
| | * \ Merge branch 'master' into fileinfoRobin Appelman2014-01-172-3/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/files/cache/cache.php
| | * | | remove more is_array from encryptionRobin Appelman2014-01-173-13/+13
| | | | |
| | * | | Don't use is_array on FileInfoRobin Appelman2014-01-172-3/+3
| | | | |
| * | | | refuse login as long as the initial encryption is runningBjoern Schiessle2014-02-101-1/+8
| | | | |
| * | | | name users after testBjoern Schiessle2014-02-071-2/+2
| | | | |
* | | | | Fix more documentation failesJoas Schilling2014-02-081-2/+1
| | | | | | | | | | | | | | | | | | | | Issue #7111
* | | | | polish documentation based on scrutinizer patchesJörn Friedrich Dreyer2014-02-069-21/+30
|/ / / /
* | | | add function to extract filename from sharekey name + testsBjoern Schiessle2014-02-032-1/+37
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-06-09 02:44:05 +0000