Thomas Müller
c216c4777b
Merge branch 'master' into close-session-faster-master
...
Conflicts:
apps/files/ajax/upgrade.php
2014-03-19 11:44:21 +01:00
Jenkins for ownCloud
7b1d52f5b9
[tx-robot] updated from transifex
2014-03-19 01:55:39 -04:00
Thomas Müller
153eadd753
Merge branch 'master' into close-session-faster-master
2014-03-17 21:57:48 +01:00
Frank Karlitschek
8a24e1eb96
clearify the use-case of this app
2014-03-17 12:29:17 +01:00
Jenkins for ownCloud
b2e929d580
[tx-robot] updated from transifex
2014-03-15 02:14:22 -04:00
Thomas Müller
bbbbb033f3
in case of phpunit executions calling header() and exit() is too bad
2014-03-14 18:20:33 +01:00
Jenkins for ownCloud
4b802aa7cb
[tx-robot] updated from transifex
2014-03-13 17:12:37 -04:00
Jenkins for ownCloud
1295e54173
[tx-robot] updated from transifex
2014-03-13 01:55:50 -04:00
Jenkins for ownCloud
8320b8eb7a
[tx-robot] updated from transifex
2014-03-12 01:57:17 -04:00
Jenkins for ownCloud
b0ec38e202
[tx-robot] updated from transifex
2014-03-11 01:59:39 -04:00
Vincent Petry
48d63a6278
Return unencrypted_size of folder when queried
...
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
2014-03-07 14:59:09 +01:00
Bjoern Schiessle
fbd8c00a89
don't create files folder, let ownCloud core handle it
2014-03-05 12:44:02 +01:00
Björn Schießle
61bc76fdd6
Merge pull request #7454 from owncloud/enc_remember_fopen_mode
...
[enc] remember original fopen access type in pre-proxy
2014-02-28 09:57:58 +01:00
Vincent Petry
fefd724858
Fixed wrong field name
...
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
2014-02-27 23:53:29 +01:00
Bjoern Schiessle
4ace1a273d
remember original fopen access type in pre-proxy because sometimes they change
...
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
2014-02-27 14:16:03 +01:00
Thomas Müller
ba4b593f84
Merge pull request #7446 from owncloud/etag_assert_fixes
...
use assertSame and assertNotSame for etag checks
2014-02-27 13:51:14 +01:00
Jörn Friedrich Dreyer
39f2f564a9
use assertSame and assertNotSame for etag checks
2014-02-27 09:39:34 +01:00
Bjoern Schiessle
86b3cdc132
close encryption session after decryption was finished
2014-02-26 17:18:38 +01:00
Jan-Christoph Borchardt
d9a153dbe9
Merge pull request #7174 from owncloud/issue/7166
...
Add option to change email settings in admin section
2014-02-26 14:41:07 +01:00
Bjoern Schiessle
d3a24e945b
add test case if a file gets moved out from the shared folder
2014-02-24 17:56:00 +01:00
Bjoern Schiessle
ebd73aee8f
don't overwrite keys if rename was done by a stream copy
2014-02-24 17:24:43 +01:00
Joas Schilling
fdb0d2067f
Remove duplicated definition and move OC.msg to js/js.js
...
Fix issue #7166
2014-02-19 10:20:52 +01:00
Scrutinizer Auto-Fixer
adaee6a5a1
Scrutinizer Auto-Fixes
...
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
2014-02-19 09:31:54 +01:00
Thomas Müller
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
Thomas Müller
1e84d6b14b
Merge pull request #7190 from owncloud/appconfig-legacy-apps
...
Remove usage of legacy OC_Appconfig
2014-02-18 18:10:22 +01:00
Lukas Reschke
3b1083f46e
Merge pull request #7176 from owncloud/style
...
Some style fixes
2014-02-18 17:30:26 +01:00
Bjoern Schiessle
6778dc5a4a
don't block login forever if we are stuck in the middle of the initial encryption
2014-02-17 10:03:57 +01:00
Bjoern Schiessle
f2f5769df7
catch errors during decryption
2014-02-17 10:03:57 +01:00
Bjoern Schiessle
2ab062193a
catch errors during initial encryption
2014-02-17 09:58:46 +01:00
Thomas Müller
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
Bjoern Schiessle
2933668355
fileinfo is no longer a array
2014-02-14 18:05:59 +01:00
icewind1991
2a7509ee50
Merge pull request #6748 from owncloud/fileinfo
...
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
Robin Appelman
181bbd4325
Remove usage of legacy OC_Appconfig
2014-02-13 16:28:49 +01:00
Bart Visscher
1fb5f96c37
Style fixes
2014-02-12 09:09:51 +01:00
Bjoern Schiessle
050e84a08f
refuse login as long as the initial encryption is running
2014-02-10 10:56:11 +01:00
Joas Schilling
b330d07b51
Fix more documentation failes
...
Issue #7111
2014-02-08 11:47:55 +01:00
Bjoern Schiessle
91254c304d
name users after test
2014-02-07 18:07:38 +01:00
Jörn Friedrich Dreyer
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
Bjoern Schiessle
97921d0c25
add function to extract filename from sharekey name + tests
2014-02-03 13:39:05 +01:00
Bjoern Schiessle
fe5f512272
added tests for the delete hooks if the trash bin is disabled
2014-02-01 20:08:23 +01:00
Bjoern Schiessle
bef58f5361
don't expect OC_FilesystemView, this is depreciated
2014-01-31 20:39:52 +01:00
Bjoern Schiessle
4d1086c35f
better error detection and don't use glob()
2014-01-31 20:39:11 +01:00
Bjoern Schiessle
5610842e56
move unlink proxy to a hook which handles pre and post conditions
2014-01-31 20:38:35 +01:00
Robin Appelman
4e2b52a376
merge master into fileinfo
2014-01-29 16:33:27 +01:00
Bjoern Schiessle
83878b9a7d
only update file cache with the unenecrypted size when the file was written
2014-01-24 16:01:00 +01:00
Bjoern Schiessle
b489d6b0af
fix infinite loop if folder and subfolder has the same name
2014-01-22 17:15:01 +01:00
Vincent Petry
f09c19c316
Replaced time() with uniqid() to make sure the file name is unique
...
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.
2014-01-21 16:31:58 +01:00
Bjoern Schiessle
1df6bf997a
add link to documentation
2014-01-17 14:56:15 +01:00
Robin Appelman
5cb08bb9cb
Merge branch 'master' into fileinfo
...
Conflicts:
tests/lib/files/cache/cache.php
2014-01-17 14:47:29 +01:00
Robin Appelman
299bb4d99d
remove more is_array from encryption
2014-01-17 14:38:14 +01:00