Björn Schießle
|
036732c249
|
allow to press enter to update the password
|
2013-06-05 14:51:51 +02:00 |
|
Björn Schießle
|
be324fad1c
|
tell the user what he can do to regain access to his files
|
2013-06-05 14:19:26 +02:00 |
|
Björn Schießle
|
57bda411d1
|
only show personal settings if the recovery feature is enabled or if no private key is set
|
2013-06-05 13:51:28 +02:00 |
Florin Peter
|
055c901091
|
improved error msg and removed duplicate string
|
2013-06-04 22:31:36 +02:00 |
|
Björn Schießle
|
7bbd85b6e5
|
improved label for the password recovery feature
|
2013-06-04 21:19:42 +02:00 |
|
Björn Schießle
|
4ee7a428ae
|
link directly to the encryption settings
|
2013-06-04 10:49:58 +02:00 |
|
Florin Peter
|
14ac4fab05
|
better handling for http post
|
2013-06-04 00:41:47 +02:00 |
|
Florin Peter
|
ef97481a0d
|
changed redirect handling
|
2013-06-03 23:41:57 +02:00 |
|
Florin Peter
|
b46e7323ec
|
fixed typo
|
2013-06-03 19:10:55 +02:00 |
|
Florin Peter
|
563f343291
|
fix password change when files_encryption app is disabled
|
2013-06-03 19:06:20 +02:00 |
|
Florin Peter
|
dc8bcf0688
|
reformat code
|
2013-06-03 18:42:13 +02:00 |
|
Björn Schießle
|
1e601cd6f1
|
use generated private key fro m setUp()
|
2013-06-03 17:43:06 +02:00 |
|
Björn Schießle
|
35c91ff901
|
added test for decryptPrivateKey()
|
2013-06-03 17:34:43 +02:00 |
|
Björn Schießle
|
b5820af3cc
|
let user update private key password in case it was changed from outside, e.g. external auth back-ends
|
2013-06-03 15:27:31 +02:00 |
|
Björn Schießle
|
b02f4dc62c
|
$session->setPrivateKey expects only one parameter
|
2013-06-03 15:26:58 +02:00 |
|
Björn Schießle
|
42f66af5a3
|
control files are no longer needed, remove them from the tests
|
2013-06-03 14:21:30 +02:00 |
|
Björn Schießle
|
471d2b732c
|
introduce decryptPrivateKey() method which also checks if the result is a valid private key to avoid additional checks on various places
|
2013-06-03 14:19:31 +02:00 |
|
Florin Peter
|
a134ffcf2c
|
code optimized and cleaned up unused vars
|
2013-05-31 16:52:33 +02:00 |
|
Florin Peter
|
e9d1ea712c
|
allow the user to login but do not allow upload and show error message on the web
|
2013-05-31 15:57:18 +02:00 |
|
Florin Peter
|
2e3bfdb12c
|
check if the decrypted private key is valid on login and on read/write files
|
2013-05-31 13:58:58 +02:00 |
|
FlorinPeter
|
d636e168a6
|
Merge pull request #3527 from owncloud/file_encryption_external_storage_fixes
File encryption external storage fixes
|
2013-05-31 03:21:46 -07:00 |
Jenkins for ownCloud
|
a730a72dcb
|
[tx-robot] updated from transifex
|
2013-05-31 02:04:40 +02:00 |
|
Florin Peter
|
eaa4f92275
|
added our own file extension .part will not work here if we use file_get_contents so we used our own extension '.etmp'
|
2013-05-30 22:07:36 +02:00 |
|
Florin Peter
|
b3834b49c3
|
prevent files_versions from calling file proxy which calls files_encryption and do unnecessary load and file operations
|
2013-05-30 22:05:52 +02:00 |
Arthur Schiwon
|
bd7771867b
|
LDAP: fix generation of alternate internal name on conflicts. Use also smaller number for better user experience on e.g. *DAV links
|
2013-05-30 16:55:21 +02:00 |
Jörn Friedrich Dreyer
|
476747ee89
|
Merge pull request #3509 from owncloud/update_jquery_to_1_10
Update jquery to 1.10.0 and add jquery-migrate 1.2.1
|
2013-05-30 06:00:52 -07:00 |
icewind1991
|
aa1c5a5d63
|
Merge pull request #3529 from owncloud/folder-permissions
Cache: provide a function to get the permissions of all files in a folder with one query
|
2013-05-30 05:54:29 -07:00 |
|
Jenkins for ownCloud
|
8e1d9261aa
|
[tx-robot] updated from transifex
|
2013-05-30 02:34:14 +02:00 |
|
Florin Peter
|
6d94b393bf
|
fix share and un-share for single file
|
2013-05-30 01:38:11 +02:00 |
|
Florin Peter
|
8c17f26226
|
fixed problems with file_get_contents and file_put_contents this problem was related to text editor with big text files
|
2013-05-30 01:13:22 +02:00 |
|
Florin Peter
|
313631edf6
|
Merge branch 'master' into file_encryption_external_storage_fixes
Conflicts:
apps/files_encryption/hooks/hooks.php
|
2013-05-30 00:45:29 +02:00 |
Michael Gapczynski
|
5a47054505
|
Implement getDirectoryPermissions() in Shared Permissions, fixes #2846
|
2013-05-29 18:22:54 -04:00 |
|
Michael Gapczynski
|
dbbf195727
|
Only retrieve the current user's permissions
|
2013-05-29 18:08:18 -04:00 |
Thomas Tanghus
|
2ce555fe55
|
Merge pull request #3533 from owncloud/signature-delimiter
fix wrong signature delimiter - fix #3523
|
2013-05-29 14:58:00 -07:00 |
Morris Jobke
|
4a6f774642
|
Merge pull request #3507 from owncloud/remove_unused_vars
remove unused varaibles
|
2013-05-29 14:46:04 -07:00 |
|
Florin Peter
|
d59ae569ba
|
reformat code
|
2013-05-29 23:13:45 +02:00 |
|
Florin Peter
|
838fd1a20a
|
changed " to '
|
2013-05-29 23:11:30 +02:00 |
|
Florin Peter
|
1337f48d64
|
fixes for pgsql
|
2013-05-29 20:41:07 +02:00 |
|
Florin Peter
|
8c6eec7a8f
|
Merge branch 'master' into remove_unused_vars
|
2013-05-29 20:29:09 +02:00 |
|
Florin Peter
|
ee7c4c4c93
|
changed l10n to full sentences
|
2013-05-29 20:27:12 +02:00 |
|
Morris Jobke
|
5c04b3a63a
|
fix wrong signature delimiter - fix #3523
|
2013-05-29 20:21:48 +02:00 |
|
Florin Peter
|
f1b884aa5d
|
changed deprecated class
|
2013-05-29 20:15:04 +02:00 |
|
Florin Peter
|
df41a60c50
|
fixed typo
|
2013-05-29 20:11:53 +02:00 |
|
Florin Peter
|
353d19d183
|
fixes if cache returns false
|
2013-05-29 20:11:13 +02:00 |
|
Florin Peter
|
c8d1cd224d
|
fix $parent/$source typo
|
2013-05-29 19:58:05 +02:00 |
|
Michael Gapczynski
|
5bbc583b56
|
Merge pull request #3532 from owncloud/scan-update
Only update metadata that has changed
|
2013-05-29 10:23:41 -07:00 |
|
Florin Peter
|
1202ab9995
|
Merge branch 'master' into file_encryption_external_storage_fixes
|
2013-05-29 19:19:40 +02:00 |
|
Florin Peter
|
d265264542
|
fix for share folder on external storage
|
2013-05-29 19:11:39 +02:00 |
|
icewind1991
|
8a5dec7775
|
Merge pull request #3530 from owncloud/cache-mimeicon
Cache mimetype icons
|
2013-05-29 08:20:58 -07:00 |
|
Michael Gapczynski
|
59655e9afd
|
Style fixes
|
2013-05-29 10:56:28 -04:00 |