a5154450cf
[tx-robot] updated from transifex
2014-06-26 01:54:40 -04:00
d3d1955ef4
fix unit tests
2014-06-25 12:38:26 +02:00
b1116880f8
[tx-robot] updated from transifex
2014-06-25 06:33:53 -04:00
3d0805f27d
always use a \OC\Files\View
2014-06-25 12:27:30 +02:00
709691548d
always use oc filesystem for rename operation
2014-06-25 12:27:30 +02:00
9c45a3196b
add unit tests
2014-06-24 10:43:07 +02:00
6b85fe819c
always use '/' as directory seperator
2014-06-24 09:29:11 +02:00
6a4a474aa9
[tx-robot] updated from transifex
2014-06-24 01:54:39 -04:00
b8b7c97a41
[tx-robot] updated from transifex
2014-06-23 01:54:38 -04:00
2b4c2a7b14
[tx-robot] updated from transifex
2014-06-22 01:54:36 -04:00
e1fd10f226
[tx-robot] updated from transifex
2014-06-19 01:55:38 -04:00
1973fdb11d
Merge pull request #9093 from owncloud/remove_unused_code
...
remove unused code
2014-06-19 01:17:36 +02:00
edbc6b5db1
Merge pull request #9068 from owncloud/trashbin_unittests_master
...
fix trash bin expire operation and add unit tests
2014-06-18 15:32:16 +02:00
bcc88be4c7
adjust encryption tests to the trash bin changes
2014-06-18 14:41:16 +02:00
e20bb71a42
remove unused code
2014-06-18 13:26:42 +02:00
a921ad8925
fix rename of encryption keys
2014-06-18 12:19:33 +02:00
baf46c74cd
[tx-robot] updated from transifex
2014-06-18 01:55:13 -04:00
8d1cf79152
Merge pull request #8399 from owncloud/server-server-sharing
...
Add server<->server sharing
2014-06-17 17:40:05 +02:00
07fdeba50b
Fix moving movablemount over webdav
2014-06-17 14:10:11 +02:00
ce179dcdcb
[tx-robot] updated from transifex
2014-06-17 01:55:43 -04:00
ec5448bf7d
[tx-robot] updated from transifex
2014-06-16 01:54:35 -04:00
4d6fc6f309
[tx-robot] updated from transifex
2014-06-15 01:55:06 -04:00
790d51ea1e
Fix checking for external share in encryption
2014-06-14 10:14:07 +02:00
277f25222a
if file doesn't exist, check parent folder
2014-06-14 10:14:07 +02:00
c580aeb455
exclude mounted server-to-server shares from encryption
2014-06-14 10:14:07 +02:00
961317d911
make sure to enable incognito mode when mounting a public link and update init status of the encryption app
2014-06-14 10:14:07 +02:00
4a26219ecf
[tx-robot] updated from transifex
2014-06-14 01:55:24 -04:00
cea2c77fd2
fix some minor issues
2014-06-13 00:16:36 +02:00
55b5ddd735
[tx-robot] updated from transifex
2014-06-12 01:54:34 -04:00
4cef7f9d4b
disable failing tests
2014-06-11 17:21:57 +02:00
f769c52522
[tx-robot] updated from transifex
2014-06-11 01:55:07 -04:00
6546b589ce
[tx-robot] updated from transifex
2014-06-10 01:54:54 -04:00
e5c47a5e30
[tx-robot] updated from transifex
2014-06-09 01:54:32 -04:00
1f2722053f
[tx-robot] updated from transifex
2014-06-08 01:56:13 -04:00
e0446a1df5
[tx-robot] updated from transifex
2014-06-07 01:56:13 -04:00
cf5eb0fef5
remove unused variable
2014-06-06 09:56:00 +02:00
329bfd81c3
remove encryption keys if user unshares a file
2014-06-06 09:55:59 +02:00
ca739a59f0
[tx-robot] updated from transifex
2014-06-06 01:57:10 -04:00
e9011a8c55
adding unit tests for encryption data migration
2014-06-05 16:54:04 +02:00
eb29b2984c
use oc_preferences instead of oc_encryption to store encyption settings
2014-06-05 16:54:04 +02:00
cb61d8a226
[tx-robot] updated from transifex
2014-06-05 01:57:20 -04:00
76e04027bc
Upgrade SabreDAV to 1.8.10
...
Updating SabreDAV namespaces
2014-06-04 12:22:23 +02:00
4ab77f90d2
Merge pull request #8662 from owncloud/f-lock
...
f-lock
2014-06-04 10:26:02 +02:00
917f389747
workaround to get the unit test going
2014-06-04 08:21:28 +02:00
f5c4754c2b
[tx-robot] updated from transifex
2014-06-04 01:57:48 -04:00
2c8288d8f9
get the storage from the view
2014-06-04 07:55:46 +02:00
3a698bce6e
don't ask for fileInfo if we already have one
2014-06-04 07:55:45 +02:00
e6712bc12e
make sure to close the stream at the end of each test
2014-06-04 07:55:45 +02:00
d3e830e938
Merge pull request #8729 from owncloud/add-phpseclib-master
...
use phpseclib from 3rdparty
2014-06-03 12:19:04 +02:00
17cbfc714a
use phpseclib from 3rdparty
...
rename class Crypt_Blowfish to Legacy_Crypt_Blowfish
2014-06-03 12:18:30 +02:00
390d8e53b4
Merge pull request #8676 from owncloud/encryption_improvements
...
cleanup encryption code, improved return codes
2014-06-02 18:28:18 +02:00
b16b17f920
ceanup encryption code, improved return codes
2014-06-02 13:15:11 +02:00
36b0c599f5
[tx-robot] updated from transifex
2014-06-01 01:55:19 -04:00
cff9440a37
[tx-robot] updated from transifex
2014-05-31 01:55:46 -04:00
929882a32a
[tx-robot] updated from transifex
2014-05-30 01:55:11 -04:00
32a50563d3
Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager
...
get mount point from mount manager
2014-05-29 17:52:28 +01:00
368006c7af
[tx-robot] updated from transifex
2014-05-29 01:54:40 -04:00
9ed5083efd
get mount point from mount manager
2014-05-28 17:28:31 +02:00
80641cae72
[tx-robot] updated from transifex
2014-05-28 01:56:09 -04:00
4e2cdb2f8a
Merge pull request #8713 from owncloud/typo-files-encr
...
fix grammar
2014-05-27 23:03:32 +02:00
c64e920b4d
Adjust core apps to use "requiremin" instead of "require"
...
Also added a few missing authors.
2014-05-27 11:54:44 +02:00
790c0e8e7c
[tx-robot] updated from transifex
2014-05-26 01:55:36 -04:00
59125cb796
fix grammar
2014-05-25 20:42:52 +02:00
3029029afd
[tx-robot] updated from transifex
2014-05-25 01:54:35 -04:00
9b23a210c9
Merge pull request #8637 from owncloud/enc_improved_error_handling
...
[encryption] improved error handling during password change
2014-05-21 09:57:45 +02:00
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
d9f715bdad
only start migration if the encryption was initialized; allow to overwrite keys if no files exists
2014-05-19 15:53:50 +02:00
e7aebc5c32
Fix whitespace issues
2014-05-16 22:23:36 +01:00
6930ae22e4
Fix more missing or broken PHPDoc
2014-05-16 22:21:57 +01:00
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
43d6650d19
[tx-robot] updated from transifex
2014-05-16 01:55:55 -04:00
d9d684197a
[tx-robot] updated from transifex
2014-05-15 01:55:53 -04:00
c9df98abae
[tx-robot] updated from transifex
2014-05-14 01:55:31 -04:00
58857b8df5
@returns -> @return
2014-05-13 19:09:15 +01:00
b8de1e5d71
Merge pull request #8398 from owncloud/enc_backup_keys
...
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
a9ac11718e
backup the encryption key after the encryption was disabled so that the user
...
can restore them if needed
2014-05-13 12:35:25 +02:00
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02:00
4dd1a49a68
remove legacy aka deprecated code: OC_Filesystem
2014-05-12 16:20:07 +02:00
57b671ebec
only update the values which really changed
2014-04-30 12:48:16 +02:00
73a2d87ab4
fix shouldEncrypt() method and improved decryptAll() unit tests
2014-04-28 14:49:19 +02:00
6c20a014ea
merge master into webdav-injection
2014-04-25 11:47:06 +02:00
3fc809dfd8
[tx-robot] updated from transifex
2014-04-25 01:56:28 -04:00
fb88aba8f4
some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code
2014-04-23 12:54:26 +02:00
a86d97295e
fix encryption tests after the removal of the shared folder
2014-04-23 12:54:25 +02:00
3f453d1641
[tx-robot] updated from transifex
2014-04-23 01:56:35 -04:00
b42ce6c30a
Prevent error if previously cached data doesn't have an etag
2014-04-22 15:24:38 +02:00
c82adb8c5d
merge master into webdav-injection
2014-04-15 20:03:00 +02:00
2a2aabbdaf
[tx-robot] updated from transifex
2014-04-14 01:55:09 -04:00
e704bc2bf0
Merge pull request #7807 from sarciszewski/patch-1
...
Update crypt.php
2014-04-11 19:19:02 +02:00
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
a9d49de465
[tx-robot] updated from transifex
2014-04-06 01:56:11 -04:00
54783550e8
[tx-robot] updated from transifex
2014-04-03 01:56:12 -04:00
a6de5efbab
Merge pull request #7978 from owncloud/enc_cleanup
...
there is no need to re-calculate the shares after a touch
2014-04-02 18:23:33 +02:00
1782dcbb50
Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled
...
always encrypt files to owner
2014-04-02 13:20:51 +02:00
73dd5ff26c
[tx-robot] updated from transifex
2014-04-02 01:56:39 -04:00
630b5b648f
Merge pull request #7997 from owncloud/correct-remember-trashbin-state
...
Correct the remembering of the trashbin app state in encryption test
2014-04-01 21:23:53 +02:00
f37a76c396
Remember before change works better
2014-04-01 19:46:46 +02:00
c45793033d
Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook
...
move check if a file should be encrypted to the pre hook
2014-04-01 13:56:46 +02:00
18acfa8bb3
Merge pull request #7915 from owncloud/replace-personalblock
...
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
7a4a836abe
[tx-robot] updated from transifex
2014-04-01 01:56:15 -04:00
c578ab68fe
there is no need to re-calculate the shares after a touch
2014-03-31 18:24:53 +02:00
8e34812393
always encrypt files to owner
2014-03-31 18:19:48 +02:00
aa867ad647
don't call getFileInfo() to avoid to open the same file twice
2014-03-31 15:29:16 +02:00
8ebb1f15d3
move check if a file should be encrypted to the pre hook
2014-03-31 15:29:16 +02:00
2be2a5d2c5
external storage: fix merge conflict, indentation
2014-03-31 13:12:04 +02:00
b9100bc2de
don't write file if opening a stream to encrypt the data fails
2014-03-28 12:02:49 +01:00
ccc55f40e6
[tx-robot] updated from transifex
2014-03-28 01:55:47 -04:00
6de572c6e6
replace personalblock fieldset with section class in files apps
2014-03-27 17:00:47 +01:00
50dba97bde
Miscellaneous text fixes for core apps
2014-03-26 15:43:03 +00:00
371a924c92
merge master into webdav-injection
2014-03-26 14:26:07 +01:00
09cc020535
Update crypt.php
...
Use a 256-bit random value
2014-03-24 08:57:33 -04:00
abdc823bb6
[tx-robot] updated from transifex
2014-03-24 01:55:51 -04:00
37af74efb3
Merge pull request #7655 from owncloud/shared-unencryptedsize
...
Fixed warning when browsing Shared folder
2014-03-21 12:28:27 +01:00
36da3bc359
Update crypt.php
...
A 1024 kilobyte key would be obnoxiously slow to operate on. I'm assuming you meant 1024-bit?
Also, 183 bytes = 1464 bits.
Here's a safe alternative: 2048 bits, with comment-code sanity
2014-03-19 13:31:51 -04:00
c216c4777b
Merge branch 'master' into close-session-faster-master
...
Conflicts:
apps/files/ajax/upgrade.php
2014-03-19 11:44:21 +01:00
7b1d52f5b9
[tx-robot] updated from transifex
2014-03-19 01:55:39 -04:00
153eadd753
Merge branch 'master' into close-session-faster-master
2014-03-17 21:57:48 +01:00
8a24e1eb96
clearify the use-case of this app
2014-03-17 12:29:17 +01:00
b2e929d580
[tx-robot] updated from transifex
2014-03-15 02:14:22 -04:00
bbbbb033f3
in case of phpunit executions calling header() and exit() is too bad
2014-03-14 18:20:33 +01:00
4b802aa7cb
[tx-robot] updated from transifex
2014-03-13 17:12:37 -04:00
1295e54173
[tx-robot] updated from transifex
2014-03-13 01:55:50 -04:00
8320b8eb7a
[tx-robot] updated from transifex
2014-03-12 01:57:17 -04:00
b0ec38e202
[tx-robot] updated from transifex
2014-03-11 01:59:39 -04:00
022d76c7bb
Fixed warning when browsing Shared folder
...
The virtual "Shared" folder doesn't have an unencrypted_size field.
This fix adds a check to prevent warnings in the log.
2014-03-10 17:25:16 +01:00
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
84cf40ed82
merge master into webdav-injection
2014-03-06 13:35:06 +01:00
a687498547
Fix encryption webdav tests
2014-03-05 13:19:08 +01:00
fbd8c00a89
don't create files folder, let ownCloud core handle it
2014-03-05 12:44:02 +01:00
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
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
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
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
39f2f564a9
use assertSame and assertNotSame for etag checks
2014-02-27 09:39:34 +01:00
86b3cdc132
close encryption session after decryption was finished
2014-02-26 17:18:38 +01:00
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
d3a24e945b
add test case if a file gets moved out from the shared folder
2014-02-24 17:56:00 +01:00
ebd73aee8f
don't overwrite keys if rename was done by a stream copy
2014-02-24 17:24:43 +01:00
fdb0d2067f
Remove duplicated definition and move OC.msg to js/js.js
...
Fix issue #7166
2014-02-19 10:20:52 +01:00
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
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
1e84d6b14b
Merge pull request #7190 from owncloud/appconfig-legacy-apps
...
Remove usage of legacy OC_Appconfig
2014-02-18 18:10:22 +01:00
3b1083f46e
Merge pull request #7176 from owncloud/style
...
Some style fixes
2014-02-18 17:30:26 +01:00
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
f2f5769df7
catch errors during decryption
2014-02-17 10:03:57 +01:00
2ab062193a
catch errors during initial encryption
2014-02-17 09:58:46 +01:00
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
2933668355
fileinfo is no longer a array
2014-02-14 18:05:59 +01:00
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
181bbd4325
Remove usage of legacy OC_Appconfig
2014-02-13 16:28:49 +01:00
1fb5f96c37
Style fixes
2014-02-12 09:09:51 +01:00
050e84a08f
refuse login as long as the initial encryption is running
2014-02-10 10:56:11 +01:00
b330d07b51
Fix more documentation failes
...
Issue #7111
2014-02-08 11:47:55 +01:00
91254c304d
name users after test
2014-02-07 18:07:38 +01:00
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
97921d0c25
add function to extract filename from sharekey name + tests
2014-02-03 13:39:05 +01:00
fe5f512272
added tests for the delete hooks if the trash bin is disabled
2014-02-01 20:08:23 +01:00
bef58f5361
don't expect OC_FilesystemView, this is depreciated
2014-01-31 20:39:52 +01:00
4d1086c35f
better error detection and don't use glob()
2014-01-31 20:39:11 +01:00
5610842e56
move unlink proxy to a hook which handles pre and post conditions
2014-01-31 20:38:35 +01:00
4e2b52a376
merge master into fileinfo
2014-01-29 16:33:27 +01:00
83878b9a7d
only update file cache with the unenecrypted size when the file was written
2014-01-24 16:01:00 +01:00
b489d6b0af
fix infinite loop if folder and subfolder has the same name
2014-01-22 17:15:01 +01:00
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
1df6bf997a
add link to documentation
2014-01-17 14:56:15 +01:00
5cb08bb9cb
Merge branch 'master' into fileinfo
...
Conflicts:
tests/lib/files/cache/cache.php
2014-01-17 14:47:29 +01:00
299bb4d99d
remove more is_array from encryption
2014-01-17 14:38:14 +01:00
ec7c339930
Don't use is_array on FileInfo
2014-01-17 12:56:17 +01:00
6b69c52037
updated description of the files encryption app
2014-01-17 11:08:49 +01:00
f4179a3f5a
don't try to encrypt/decrypt cache chunks or files in the trash bin
2014-01-15 14:29:33 +01:00
6be2dee5bc
[tx-robot] updated from transifex
2014-01-08 01:55:41 -05:00
095f9b8ee0
[tx-robot] updated from transifex
2014-01-02 01:56:21 -05:00
e345f3f511
[tx-robot] updated from transifex
2013-12-29 01:55:36 -05:00
71c829f92a
[tx-robot] updated from transifex
2013-12-28 01:55:35 -05:00
64a001edab
[tx-robot] updated from transifex
2013-12-27 01:55:35 -05:00
dbbd99db09
[tx-robot] updated from transifex
2013-12-24 01:55:40 -05:00
f60ecfc7fd
[tx-robot] updated from transifex
2013-12-22 01:56:05 -05:00
6a3e38266f
Merge pull request #6507 from owncloud/enc_fix_getUser
...
[encryption] fix getUser Helper
2013-12-19 11:09:41 -08:00
517a55a437
tests added
2013-12-19 19:43:57 +01:00
f0da7b20c1
Merge pull request #6517 from owncloud/fix_6510
...
[encryption] fix rename of shared files
2013-12-19 10:19:09 -08:00
552d0a6feb
check if the old owner and the old path is available
2013-12-19 18:40:40 +01:00
165542f27d
fix rename of shared files
2013-12-19 17:29:38 +01:00
06dec2632f
Merge pull request #6512 from owncloud/master-failingoracletests
...
Removed numRows usage from encryption app
2013-12-19 08:22:44 -08:00
079f1a6f41
Merge pull request #6495 from owncloud/enc_fseek_fallback
...
Added fseek fallback to the encryption app
2013-12-19 07:09:07 -08:00
fe7fb66ef8
we can also have a path user/cache/...
2013-12-19 15:58:10 +01:00
963ee31efb
Removed numRows usage from encryption app
...
numRows on Oracle always seem to return 0.
This fix removes numRows usage from the encryption and sharing app.
This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle
2013-12-19 15:51:24 +01:00
df0c1fe7f3
add test for the stream wrapper to read encrypted files from the system folder /tmp
2013-12-18 17:07:35 +01:00
f9ec3a7124
test for isEncryptedPath()
2013-12-18 16:39:34 +01:00
4f8ae789ae
extend the encryption stream wrapper to handle local files and add a fall back for file size calculation if the storage doesn't support fseek
2013-12-18 15:43:50 +01:00
d9668977cd
implement ftell stream wrapper and fix return value from fseek stream wrapper
2013-12-18 15:41:40 +01:00
930a46e8e2
Merge pull request #6469 from owncloud/enc_cleanup
...
remove duplicated code
2013-12-18 05:21:42 -08:00
22a6bf9e5a
Merge pull request #6474 from owncloud/enc_detect_encrypted_files
...
reliable detect encrypted files
2013-12-17 09:12:02 -08:00
9a94c07553
remove unused method tail()
2013-12-17 16:19:00 +01:00
c955381d56
fall back to getLocalFile if storage doesn't support fseek
2013-12-17 16:18:05 +01:00
69b89454a4
reliable detect encrypted files
2013-12-17 15:53:25 +01:00
a99dd3183c
[tx-robot] updated from transifex
2013-12-17 06:46:52 -05:00
83417d69be
remove duplicated code
2013-12-17 11:28:05 +01:00
4ae148cebd
Merge pull request #6183 from owncloud/enc_tests
...
enable more encryption tests
2013-12-16 08:46:52 -08:00
95892c8be9
update file cache for target file
2013-12-16 16:05:24 +01:00
cdd816c930
only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted
2013-12-16 16:05:24 +01:00
6d489e0474
call set password hook because it doesn't get triggered during test execution and fix paths
2013-12-16 16:00:16 +01:00
77b68505c2
[tx-robot] updated from transifex
2013-12-13 14:44:31 -05:00
6aab1ebf44
[tx-robot] updated from transifex
2013-12-09 06:40:22 -05:00
079d20a80e
[tx-robot] updated from transifex
2013-12-07 22:28:29 -05:00
575a68074f
Merge pull request #6220 from owncloud/debug_oracle_errors
...
cherry-picks from #5884 , just for debugging purpose
2013-12-06 10:00:04 -08:00
40f148cc6c
Don't try to encrypt a file when the temp file isn't created
2013-12-06 17:01:13 +01:00
9ff231590c
set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again
2013-12-06 16:11:41 +01:00
9371944e43
fix typo
2013-12-06 12:20:42 +01:00
58c0117c3d
only create new key on password change if a recovery key exists or if the user don't have any private/public keys
2013-12-06 12:20:31 +01:00
8082ef2073
show change password form if key couldn't be decrypted
2013-12-06 12:20:22 +01:00
85467b973a
add method to check if users private/public key exists
2013-12-06 12:20:14 +01:00
7e702f294f
[tx-robot] updated from transifex
2013-12-04 18:14:17 -05:00
b919a65432
enable more tests
2013-12-04 17:43:38 +01:00
36bc6b871f
Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)."
...
This reverts commit efbf18652c
2013-12-04 13:27:38 +01:00
83ec234f53
[tx-robot] updated from transifex
2013-12-02 17:28:29 -05:00
efbf18652c
Adjust files_encryption requirements to the new core requirement (PHP 5.3.8).
2013-11-29 20:34:57 +01:00
1b18c5a047
[tx-robot] updated from transifex
2013-11-29 14:10:40 -05:00
ee78d48186
loginname is not necessarily username
2013-11-28 13:26:31 +01:00
a1d2f0f516
Merge pull request #6094 from owncloud/enc_fix_reshares
...
fix path reconstruction for reshares
2013-11-28 01:41:34 -08:00
efe7c4075a
fix path reconstruction for reshares
2013-11-27 23:26:04 +01:00
55d7cf8ffd
improve encryption message
2013-11-27 23:07:19 +01:00
d9729168f9
some small js fixes
2013-11-27 22:42:03 +01:00
0219b8b3b9
add spinner to the template so that it can be loaded in time
2013-11-27 22:36:47 +01:00
e0924a5f07
switch to large spinner
2013-11-27 21:58:38 +01:00
1536c7ea58
switch from "name" attribute to "id"
2013-11-27 17:01:21 +01:00
1065c33543
Merge branch 'master' into encryption_initial_enc_indicator
2013-11-27 16:44:06 +01:00
060e0ad0cd
with the latest changes in master $this-userID is always the correct ID, so we no longer need the extra parameter
2013-11-27 15:35:32 +01:00
9fb71af988
Merge branch 'master' into encryption_enable_public_upload
...
Conflicts:
apps/files_encryption/lib/helper.php
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/keymanager.php
2013-11-27 15:08:09 +01:00
5b7b053634
Merge pull request #5976 from owncloud/encryption_work_with_public_gallery
...
Encryption work with public gallery
2013-11-27 04:25:54 -08:00
7f2bdb0e97
typo fixed
2013-11-27 12:25:04 +01:00
7f3b178d73
some small changes according to the review comments
2013-11-27 11:46:24 +01:00
7240d349da
Merge branch 'master' into encryption_initial_enc_indicator
2013-11-26 19:15:53 +01:00
c7e1fe50c2
added a small version of the dark loading gif, looks nicer on the blue background
2013-11-26 17:14:16 +01:00
fb7aa2f014
[tx-robot] updated from transifex
2013-11-26 10:47:07 -05:00
0617e06f69
use POST instead of GET
2013-11-26 11:38:49 +01:00
35a6ad255d
fix typo in var name
2013-11-26 11:38:45 +01:00
dc67c7efa9
[tx-robot] updated from transifex
2013-11-26 04:04:05 -05:00
8974107b4e
remove debug output
2013-11-25 23:57:08 +01:00
d6fb2afa85
show a message at the log-in screen if inital encryption take place
2013-11-25 23:49:05 +01:00
49038545f8
Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/core into encryption_work_with_public_gallery
2013-11-25 10:29:53 +01:00
9c4b8ae54c
fix typo in comment
2013-11-25 10:29:05 +01:00
2a465fb20f
Merge branch 'master' into encryption_work_with_public_gallery
2013-11-24 23:20:46 +01:00
ba0e09adce
[tx-robot] updated from transifex
2013-11-24 00:14:51 -05:00
5d9731cef2
[tx-robot] updated from transifex
2013-11-21 10:05:34 -05:00
6443e570c2
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 16:00:21 +01:00
d2e6f7d979
check HTTP Referer to check if we come from public.php or from a internal page.
...
Necessary to detect public access also if a user is logged in.
2013-11-21 15:57:49 +01:00
87f2696e6a
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 11:18:53 +01:00
c7dc6dc2c2
fix getFileKey() call
2013-11-21 11:11:15 +01:00
009bbef17e
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 10:34:25 +01:00
16b484209c
Merge branch 'master' into encryption_work_with_public_gallery
...
Conflicts:
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/crypt.php
2013-11-21 10:33:37 +01:00
Jenkins for ownCloud
Bjoern Schiessle
Morris Jobke
icewind1991
Robin Appelman
Volkan Gezer
Thomas Müller
Robin McCorkell
Vincent Petry
Lukas Reschke
Bart Visscher
Jan-Christoph Borchardt
Scott Arciszewski
Frank Karlitschek
Jörn Friedrich Dreyer
Joas Schilling
Scrutinizer Auto-Fixer
Björn Schießle
Morris Jobke
Andreas Fischer
Arthur Schiwon