Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-12 | 8 | -1/+9 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-11 | 55 | -74/+138 |
| | |||||
* | Return unencrypted_size of folder when queried | Vincent Petry | 2014-03-07 | 2 | -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 | ||||
* | don't create files folder, let ownCloud core handle it | Bjoern Schiessle | 2014-03-05 | 1 | -1/+0 |
| | |||||
* | Merge pull request #7454 from owncloud/enc_remember_fopen_mode | Björn Schießle | 2014-02-28 | 2 | -6/+29 |
|\ | | | | | [enc] remember original fopen access type in pre-proxy | ||||
| * | remember original fopen access type in pre-proxy because sometimes they change | Bjoern Schiessle | 2014-02-27 | 2 | -6/+29 |
| | | | | | | | | during the fopen call, e.g. 'r' becomes 'r+' if we open an URL | ||||
* | | Fixed wrong field name | Vincent Petry | 2014-02-27 | 1 | -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_fixes | Thomas Müller | 2014-02-27 | 1 | -2/+2 |
|\ \ | |/ |/| | use assertSame and assertNotSame for etag checks | ||||
| * | use assertSame and assertNotSame for etag checks | Jörn Friedrich Dreyer | 2014-02-27 | 1 | -2/+2 |
| | | |||||
* | | close encryption session after decryption was finished | Bjoern Schiessle | 2014-02-26 | 2 | -0/+16 |
|/ | |||||
* | Merge pull request #7174 from owncloud/issue/7166 | Jan-Christoph Borchardt | 2014-02-26 | 1 | -22/+0 |
|\ | | | | | Add option to change email settings in admin section | ||||
| * | Remove duplicated definition and move OC.msg to js/js.js | Joas Schilling | 2014-02-19 | 1 | -22/+0 |
| | | | | | | | | Fix issue #7166 | ||||
* | | add test case if a file gets moved out from the shared folder | Bjoern Schiessle | 2014-02-24 | 2 | -0/+125 |
| | | |||||
* | | don't overwrite keys if rename was done by a stream copy | Bjoern Schiessle | 2014-02-24 | 1 | -4/+13 |
| | | |||||
* | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2014-02-19 | 1 | -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_patches | Thomas Müller | 2014-02-18 | 14 | -72/+203 |
|\ \ | | | | | | | | | | | | | Conflicts: lib/private/migration/content.php | ||||
| * \ | Merge pull request #7190 from owncloud/appconfig-legacy-apps | Thomas Müller | 2014-02-18 | 7 | -19/+26 |
| |\ \ | | | | | | | | | Remove usage of legacy OC_Appconfig | ||||
| | * | | Remove usage of legacy OC_Appconfig | Robin Appelman | 2014-02-13 | 7 | -19/+26 |
| | |/ | |||||
| * | | Merge pull request #7176 from owncloud/style | Lukas Reschke | 2014-02-18 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Some style fixes | ||||
| | * | | Style fixes | Bart Visscher | 2014-02-12 | 1 | -1/+1 |
| | |/ | |||||
| * | | don't block login forever if we are stuck in the middle of the initial ↵ | Bjoern Schiessle | 2014-02-17 | 5 | -10/+24 |
| | | | | | | | | | | | | encryption | ||||
| * | | catch errors during decryption | Bjoern Schiessle | 2014-02-17 | 2 | -16/+105 |
| | | | |||||
| * | | catch errors during initial encryption | Bjoern Schiessle | 2014-02-17 | 2 | -26/+47 |
| | | | |||||
* | | | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-14 | 6 | -19/+26 |
|\| | | | | | | | | | | | | | | Conflicts: lib/private/appconfig.php | ||||
| * | | fileinfo is no longer a array | Bjoern Schiessle | 2014-02-14 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #6748 from owncloud/fileinfo | icewind1991 | 2014-02-14 | 4 | -15/+15 |
| |\ \ | | |/ | |/| | Add a FileInfo class which holds all info of a file ... | ||||
| | * | merge master into fileinfo | Robin Appelman | 2014-01-29 | 10 | -81/+76 |
| | |\ | |||||
| | * \ | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-17 | 2 | -3/+3 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/files/cache/cache.php | ||||
| | * | | | remove more is_array from encryption | Robin Appelman | 2014-01-17 | 3 | -13/+13 |
| | | | | | |||||
| | * | | | Don't use is_array on FileInfo | Robin Appelman | 2014-01-17 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | refuse login as long as the initial encryption is running | Bjoern Schiessle | 2014-02-10 | 1 | -1/+8 |
| | | | | | |||||
| * | | | | name users after test | Bjoern Schiessle | 2014-02-07 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Fix more documentation failes | Joas Schilling | 2014-02-08 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | Issue #7111 | ||||
* | | | | | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 9 | -21/+30 |
|/ / / / | |||||
* | | | | add function to extract filename from sharekey name + tests | Bjoern Schiessle | 2014-02-03 | 2 | -1/+37 |
| | | | | |||||
* | | | | added tests for the delete hooks if the trash bin is disabled | Bjoern Schiessle | 2014-02-01 | 3 | -65/+300 |
| | | | | |||||
* | | | | don't expect OC_FilesystemView, this is depreciated | Bjoern Schiessle | 2014-01-31 | 1 | -1/+1 |
| | | | | |||||
* | | | | better error detection and don't use glob() | Bjoern Schiessle | 2014-01-31 | 1 | -12/+27 |
| | | | | |||||
* | | | | move unlink proxy to a hook which handles pre and post conditions | Bjoern Schiessle | 2014-01-31 | 3 | -41/+66 |
| |_|/ |/| | | |||||
* | | | only update file cache with the unenecrypted size when the file was written | Bjoern Schiessle | 2014-01-24 | 1 | -7/+24 |
| | | | |||||
* | | | fix infinite loop if folder and subfolder has the same name | Bjoern Schiessle | 2014-01-22 | 1 | -39/+13 |
| | | | |||||
* | | | Replaced time() with uniqid() to make sure the file name is unique | Vincent Petry | 2014-01-21 | 7 | -35/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The cache isn't cleared properly because unlink() doesn't remove the cache entry which caused side-effects when reusing the same file name (which randomly happens when time() returns the same value) This fix first makes sure the unit tests don't fail any more. The unlink() case with the cache will be investigated separately. | ||||
* | | | add link to documentation | Bjoern Schiessle | 2014-01-17 | 1 | -0/+4 |
| |/ |/| | |||||
* | | updated description of the files encryption app | Bjoern Schiessle | 2014-01-17 | 1 | -1/+1 |
| | | |||||
* | | don't try to encrypt/decrypt cache chunks or files in the trash bin | Bjoern Schiessle | 2014-01-15 | 1 | -2/+2 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-08 | 1 | -1/+36 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-02 | 1 | -0/+44 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-29 | 1 | -1/+19 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-28 | 1 | -0/+10 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-27 | 1 | -19/+24 |
| |