icewind1991
8c991d97aa
Merge pull request #3561 from owncloud/user
...
Refactor of user management
2013-06-03 08:13:40 -07: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
icewind1991
2a81813e44
Merge pull request #3051 from owncloud/backgroundjob
...
Reworked background job system.
2013-06-02 14:29:59 -07:00
Frank Karlitschek
9392d2d58e
Merge pull request #3567 from owncloud/fixing-3466
...
In cases where smb4php returns false of an empty array stat/( has to ret...
2013-06-02 14:04:55 -07:00
Robin Appelman
e1b5598f00
Files: use public api to register backgroundjob
2013-06-02 21:21:39 +02:00
Robin Appelman
251527c6e6
merge master into backgroundjob
2013-06-02 20:12:44 +02:00
Jenkins for ownCloud
cf71a54f5d
[tx-robot] updated from transifex
2013-06-02 02:07:21 +02:00
Jenkins for ownCloud
3013c02767
[tx-robot] updated from transifex
2013-06-01 02:03:53 +02:00
Thomas Mueller
1d7d5d2894
In cases where smb4php returns false of an empty array stat/( has to return false.
...
Fixes #3466 because the test method of external filesystems uses stat() to detect if the given parameters are okay.
Changes to 3rdparty are necessary as well:
https://github.com/owncloud/3rdparty/pull/33
2013-06-01 00:06:23 +02:00
Florin Peter
46e5e9bd73
cleanup unused method legacyKeyRecryptKeyfile
2013-05-31 22:49:32 +02:00
blizzz
1656cc2e7c
Merge pull request #3565 from owncloud/fix_ldap_sqlite_n_js
...
Fix ldap sqlite n js
2013-05-31 12:17:46 -07:00
Florin Peter
d85a10ebc5
fix broken tests
2013-05-31 20:55:05 +02:00
Florin Peter
8761242f52
Merge branch 'master' into files_encryption_upgrade_fix
...
Conflicts:
apps/files_encryption/appinfo/app.php
2013-05-31 20:34:43 +02:00
blizzz
eafb241068
Merge pull request #3562 from owncloud/fix_ldap_offline_host_handling
...
Fix ldap offline host handling
2013-05-31 11:10:33 -07:00
Arthur Schiwon
2ff9677cd1
LDAP: sqlite compatibility for emptyiing tables
2013-05-31 20:07:13 +02:00
Arthur Schiwon
c49ee4d3e3
LDAP: fix setting value of checkbox after loading configuration
2013-05-31 20:06:40 +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
Florin Peter
1bfe975938
Merge branch 'master' into files_encryption_upgrade_fix
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-31 12:58:12 +02:00
Florin Peter
1c4c89418b
also fix login errors while filesystem is not loaded in app.php
2013-05-31 12:56:08 +02:00
Florin Peter
88d74c33af
Merge branch 'master' into files_encryption_fs_loaded_fix
2013-05-31 12:49:46 +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
Florin Peter
4a0e69f941
fix login errors while filesystem is not loaded
2013-05-31 11:55:40 +02:00
Jenkins for ownCloud
a730a72dcb
[tx-robot] updated from transifex
2013-05-31 02:04:40 +02:00
Florin Peter
96ef926161
normalize path to prevent following split to fail
2013-05-31 01:57:32 +02:00
Florin Peter
ccdfb59426
fix legacy key in until test
2013-05-31 01:55:48 +02:00
Florin Peter
8e324aad38
fix re-encrypt legacy files
2013-05-31 01:36:49 +02:00
Florin Peter
986e9dd362
use legacyDecrypt to decrypt key file like the previous files_encryption
2013-05-31 01:35:48 +02:00
Florin Peter
4f9cbadfa4
fix for autoloader while user logged in and system is in maintenance
2013-05-31 01:34:31 +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
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
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
ee7c4c4c93
changed l10n to full sentences
2013-05-29 20:27:12 +02:00
Florin Peter
df41a60c50
fixed typo
2013-05-29 20:11:53 +02: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
Björn Schießle
b44192f366
check list of users with access to the file from the bottom to the top. This way we avoid calling getFileInfo() on every dir, which creates a lot of overhead, especially for external storages
2013-05-29 13:10:26 +02:00
Florin Peter
5dd865a57f
changes l10n after review
2013-05-29 12:47:50 +02:00
Florin Peter
efd629462e
changes after review
2013-05-29 12:23:33 +02:00
Florin Peter
c398fc59ad
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/session.php
apps/files_encryption/lib/stream.php
2013-05-29 09:21:00 +02:00
Jenkins for ownCloud
7c0c6bd779
[tx-robot] updated from transifex
2013-05-29 02:10:54 +02:00
Florin Peter
71a532fc4d
fixed if fopen returns false typically on external storage
2013-05-28 20:50:14 +02:00
Florin Peter
4b4b447e2a
fixed missing convert to new session handler
2013-05-28 17:06:37 +02:00
Florin Peter
6ae7bde788
fixed encryption session namespace to avoid problems
2013-05-28 17:04:35 +02:00
Robin Appelman
cc0cf93136
merge master into sessionclass
2013-05-28 14:55:42 +02:00
Florin Peter
09b54ccb2b
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/lib/session.php
apps/files_encryption/lib/util.php
2013-05-28 11:00:49 +02:00
Björn Schießle
3a76c22372
$_POST["adminEnableRecovery"] is a string
2013-05-28 10:51:12 +02:00
Florin Peter
0041711fe3
fix for undefined index
2013-05-28 09:36:14 +02:00
Florin Peter
6f9e425939
fix for losing private key while being logged in and accessing a public link
2013-05-28 09:27:04 +02:00
Jenkins for ownCloud
3420d853ab
[tx-robot] updated from transifex
2013-05-28 02:07:51 +02:00
Robin Appelman
9c99048429
fix syntax error
2013-05-28 01:31:26 +02:00
Robin Appelman
44f9af5a7f
Use the new session wrapper
2013-05-28 01:04:09 +02:00
Florin Peter
e1e1c58969
changed to public log api
2013-05-27 20:51:52 +02:00
Florin Peter
7224fc98b2
replace == with === and replace != with !==
2013-05-27 20:44:38 +02:00
Florin Peter
6075aff687
changed basic auth to test user
2013-05-27 20:32:59 +02:00
Björn Schießle
2c3c60c1af
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/proxy.php
2013-05-27 18:09:35 +02:00
Björn Schießle
c81e34ef89
replace == with ===
2013-05-27 18:03:29 +02:00
Björn Schießle
4c05259ccf
legacyBlockDecryprt() needs to be public
2013-05-27 17:35:38 +02:00
Björn Schießle
df22a7c495
make legacyDecrypt() private als always call legacyBlockDecrypt() from other classes
2013-05-27 17:35:28 +02:00
Björn Schießle
8b35578833
fix migration from old to new encryption
2013-05-27 17:35:06 +02:00
Florin Peter
5d32e214b7
reformat code
2013-05-27 17:26:58 +02:00
Florin Peter
690bf9b8c4
Merge branch 'master' into remove_unused_vars
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-27 17:26:35 +02:00
Björn Schießle
f8d1c32112
Merge pull request #3506 from owncloud/fix_3320
...
fix https://github.com/owncloud/core/issues/3320
2013-05-27 08:04:55 -07:00
Georg Ehrke
841b420bc4
add event.preventDefault to undelete function
2013-05-27 16:37:43 +02:00
Björn Schießle
710e9c2d14
fix tests, after unused variables are removed
2013-05-27 15:34:57 +02:00
Björn Schießle
1a3f7891ea
remove unused varaibles
2013-05-27 15:31:26 +02:00
Georg Ehrke
d408cd7f37
fix https://github.com/owncloud/core/issues/3320
2013-05-27 15:24:37 +02:00
Florin Peter
80433fc4c4
Merge branch 'master' into file_encryption_util_is_error
...
Conflicts:
apps/files_encryption/lib/util.php
2013-05-27 14:41:53 +02:00
Björn Schießle
5e243b48bb
Merge pull request #3481 from owncloud/firsttime_enc
...
fix first time encryption after app was enabled
2013-05-27 05:17:31 -07:00
Florin Peter
8cf827ee9d
Merge branch 'master' into file_encryption_tests
2013-05-27 12:54:33 +02:00
Florin Peter
89f0c8f39d
added check by numRows()
...
changed to public api where it was possible
reformat code to comply with the coding guidelines
2013-05-27 12:41:55 +02:00
Jenkins for ownCloud
73e0b4c10a
[tx-robot] updated from transifex
2013-05-27 02:07:24 +02:00
Florin Peter
9dd277576a
added users for tests
...
reformat code to meet coding guidelines
2013-05-26 20:44:15 +02:00
Florin Peter
c7981abbc9
improved test
...
- fixed testPermanentDeleteFile sometimes failed
- speed optimization
- reformat code
2013-05-26 03:22:16 +02:00
Jenkins for ownCloud
0c621ff6a9
[tx-robot] updated from transifex
2013-05-26 02:03:54 +02:00
Florin Peter
788c5940f0
fixed error rising from fetchRow
2013-05-25 23:20:55 +02:00
Florin Peter
9a6cd89a69
added OC_DB::isError and logging
2013-05-25 21:33:05 +02:00
Michael Gapczynski
dbb6a10364
Merge pull request #3478 from davidak/master
...
small typo fix: added 2 whitespaces
2013-05-25 11:21:21 -07:00
Frank Karlitschek
29c8cbf4d1
increase version and add warning
2013-05-25 12:08:18 +02:00
Arthur Schiwon
86d72b9a61
LDAP: fix possible recursion
2013-05-25 11:03:58 +02:00
Arthur Schiwon
bfa715768a
LDAP: fix handling when LDAP Host is offline
2013-05-25 11:02:51 +02:00
Jenkins for ownCloud
6a6c18dfab
[tx-robot] updated from transifex
2013-05-25 02:11:52 +02:00
Florin Peter
fba7200b05
improved trashbin test again
2013-05-24 23:12:16 +02:00
Florin Peter
b32823a96e
improved trashbin test
2013-05-24 23:12:07 +02:00
Björn Schießle
f56802a437
no use the recoveryPassword var instead of accessing the POST array
2013-05-24 18:37:58 +02:00
Björn Schießle
5ce4149e75
fix first time encryption after app was enabled
2013-05-24 17:35:00 +02:00
davidak
56006ea852
small typo fix: added 2 whitespaces
2013-05-24 14:31:06 +02:00
Thomas Müller
4911305887
Merge pull request #3416 from owncloud/files_encryption
...
New files encryption app
2013-05-24 02:21:19 -07:00
Michael Gapczynski
a98d6c4be6
Merge pull request #3425 from owncloud/move-storages
...
Support for moving/copying folders between storages
2013-05-23 17:35:11 -07:00
Jenkins for ownCloud
b47729c5fc
[tx-robot] updated from transifex
2013-05-24 02:02:43 +02:00
Florin Peter
6c8de5ae6d
fixes after review from @DeepDiver1975
2013-05-23 23:56:31 +02:00
Florin Peter
adc930d9f9
added l10n support in apps/files_encryption/ajax/adminrecovery.php
2013-05-23 22:09:28 +02:00
Björn Schießle
7b07168c46
code clean up; nicer solution to solve the public link share problem if a user is logged in
2013-05-23 21:18:31 +02:00
Björn Schießle
a9ebf2aabe
fix public link share if a user is logged in
2013-05-23 20:30:07 +02:00
opensaucesystems
acba7d7b13
Update settings.php
2013-05-23 17:27:22 +02:00
opensaucesystems
b23ce9ed40
Remove http:// from label and add placeholder
2013-05-23 17:24:48 +02:00
opensaucesystems
169eb10030
Enable https authentication
...
Allow authentication using https:// as well as http://
2013-05-23 17:22:05 +02:00
opensaucesystems
e866e564c2
Enable https authentication
2013-05-23 16:57:22 +02:00
Michael Gapczynski
30330b4343
Merge branch 'master' into move-storages
...
Conflicts:
tests/lib/files/view.php
2013-05-23 10:25:12 -04:00
Björn Schießle
cb79169cf5
Merge branch 'master' into files_encryption
2013-05-23 11:11:57 +02:00
Jenkins for ownCloud
698862519d
[tx-robot] updated from transifex
2013-05-23 02:00:27 +02:00
Florin Peter
46c784ccdf
added trash bin tests
2013-05-22 23:51:35 +02:00
Florin Peter
842d0608f1
added static function registerHooks() for better unit tests handling
2013-05-22 23:50:45 +02:00
Michael Gapczynski
9b622bdeed
RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead
2013-05-22 15:02:11 -04:00
Björn Schießle
80dea1a8c5
settings clean-up; There is no blacklist in the new encryption app
2013-05-22 18:05:12 +02:00
Björn Schießle
15a3ae6db1
improved error messages
2013-05-22 18:01:18 +02:00
Björn Schießle
ee53bd1aa3
Merge branch 'master' into files_encryption
...
Conflicts:
lib/files/cache/cache.php
2013-05-22 15:29:22 +02:00
Morris Jobke
9fd2be0757
Merge pull request #3406 from owncloud/oc_dialogs_oc_template
...
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
Jenkins for ownCloud
d590064fdf
[tx-robot] updated from transifex
2013-05-22 02:19:52 +02:00
Florin Peter
c6722581f9
fix pgsql error
2013-05-22 02:02:42 +02:00
Florin Peter
afbfa742d7
improved tests
2013-05-22 01:11:55 +02:00
Florin Peter
9ca9a22c6a
fixed finding encrypted files in subfolders and removed unused code
2013-05-22 00:54:47 +02:00
Florin Peter
095fc790ac
added webdav test
2013-05-21 21:09:39 +02:00
Florin Peter
1deeec93b7
fixed postFileSize
2013-05-21 21:09:25 +02:00
Björn Schießle
5cd14425f9
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_trashbin/l10n/nn_NO.php
2013-05-21 15:30:19 +02:00
Björn Schießle
9d324db054
fix path to 3rdparty apps
2013-05-21 12:33:32 +02:00
Björn Schießle
4c27c7e199
fix path, needs to be relative to data/
2013-05-21 12:22:03 +02:00
Björn Schießle
64591cf754
move 3rdparty dependencies to app
2013-05-21 10:30:24 +02:00
Florin Peter
c9e862ccba
fix broken tests
2013-05-21 07:19:23 +02:00
Jenkins for ownCloud
afdad5c74d
[tx-robot] updated from transifex
2013-05-21 02:04:52 +02:00
Florin Peter
4bf840e2ca
cleanup unused code optimize tests
2013-05-21 00:00:55 +02:00
Florin Peter
f2b1158add
improved tests
2013-05-20 23:44:10 +02:00
Florin Peter
1c8e5d6873
added test for failed sharing
2013-05-20 21:46:28 +02:00
Florin Peter
1fa2f19ee4
removed dead code for delShareKey
2013-05-20 21:24:39 +02:00
Florin Peter
8e0540d0e4
key creation should never override a private or public key
2013-05-20 21:22:03 +02:00
Florin Peter
171b9a4702
added legacy encryption test
2013-05-20 21:19:28 +02:00
Michael Gapczynski
ec475cbcfa
Add data-dir attribute to home breadcrumb
2013-05-20 10:21:13 -04:00
Florin Peter
31037241e1
Merge branch 'master' into files_encryption
2013-05-20 02:25:56 +02:00
Jenkins for ownCloud
6609de28d8
[tx-robot] updated from transifex
2013-05-20 02:10:11 +02:00
Florin Peter
3b850a2524
reformat code added and changed phpdoc
2013-05-20 01:24:36 +02:00
Florin Peter
dc39ef378e
changed recovery_enabled and migration_status columns to integer and fix tests
2013-05-20 00:38:23 +02:00
Florin Peter
5d572c3449
update phpdoc
2013-05-19 22:31:00 +02:00
Florin Peter
bdd2127f19
cleanup tests
2013-05-19 22:28:48 +02:00
Florin Peter
ddda2a1f79
changed database column 'recovery' to 'recovery_enabled' because recovery is a pgsql keyword
...
more info about pgsql keywords http://www.postgresql.org/docs/9.1/static/sql-keywords-appendix.html
2013-05-19 07:04:31 +02:00
Jenkins for ownCloud
694f42dfd5
[tx-robot] updated from transifex
2013-05-19 02:01:55 +02:00
Florin Peter
2a038baee0
updated authors info
2013-05-18 22:33:31 +02:00
Florin Peter
227b122947
fixed again key-manager tests
2013-05-18 22:25:47 +02:00
Florin Peter
681252669a
changed migrationStatus to migration_status for pgsql
2013-05-18 22:10:00 +02:00
Florin Peter
e0e89602a2
fixed key-manager tests
2013-05-18 22:00:35 +02:00
Florin Peter
80f9c5bb6d
removed mockery from tests and changed class names
2013-05-18 21:37:00 +02:00
Florin Peter
6980f59b2f
fixed typos
2013-05-18 21:12:53 +02:00
Jenkins for ownCloud
9428d813ba
[tx-robot] updated from transifex
2013-05-18 02:03:28 +02:00
Florin Peter
41165afa59
improved tests
2013-05-17 22:45:09 +02:00
Florin Peter
3aa48616a6
remove unused code
2013-05-17 22:44:45 +02:00
Florin Peter
b6572cedac
added folder move test
2013-05-17 22:16:56 +02:00
Florin Peter
cea9208cec
fix broken legacy tests
2013-05-17 21:59:53 +02:00
Björn Schießle
e7d1fe82aa
fix path to class
2013-05-17 18:01:32 +02:00
Björn Schießle
eaa61b8539
fix migration to new encryption
2013-05-17 17:29:32 +02:00
Björn Schießle
002445e23d
some typo fixed
2013-05-17 14:49:54 +02:00
Björn Schießle
93771f735b
gremove unused code
2013-05-17 14:13:05 +02:00
Björn Schießle
bf04a21973
set migration status after successful upgrade
2013-05-17 13:16:52 +02:00
Björn Schießle
0b40c1d08a
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-17 11:20:17 +02:00
Björn Schießle
ca6a77d39b
upgrade from old encryption to the new one needs to generate share keys too
2013-05-17 11:15:36 +02:00
Thomas Tanghus
152e275c8a
Various cleanups in OC.dialogs
2013-05-17 04:54:08 +02:00
Jenkins for ownCloud
6a6079176b
[tx-robot] updated from transifex
2013-05-17 02:07:36 +02:00
Florin Peter
2b0bf4dc87
added tests for recovery
2013-05-17 01:07:50 +02:00
Florin Peter
a4c0eb1756
improved tests
2013-05-17 01:07:26 +02:00
Florin Peter
42b4963dd0
moved enable and disable recovery to Helper class for unit tests
2013-05-17 00:58:41 +02:00
Florin Peter
3793e4d2d6
fix for recover files in subfolder
2013-05-16 22:57:55 +02:00
Florin Peter
d40d6aa358
fix typo in addRecoveryKeys
2013-05-16 22:39:09 +02:00
Björn Schießle
9d1e60325c
allow admin to recover users files in case of password lost
2013-05-16 14:53:04 +02:00
blizzz
2d51eefcb8
Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuid
...
Ldap configurable username n uuid
2013-05-16 05:40:31 -07:00
Jenkins for ownCloud
966c2231e3
[tx-robot] updated from transifex
2013-05-16 02:01:37 +02:00
Florin Peter
67a80e1870
improved tests for touch
2013-05-16 00:44:40 +02:00
Florin Peter
0fca2f8f31
added tests for put content, get content, touch and fopen
2013-05-16 00:36:40 +02:00
Florin Peter
c651950a17
fix for re-share and removed check if file exists because we are sometime into a pre_put_contents hook
2013-05-16 00:34:45 +02:00
Florin Peter
c0c4fe5fd3
fix if file is not yet created
2013-05-16 00:31:17 +02:00
Florin Peter
8f963b95e5
added test for share with group
2013-05-16 00:30:01 +02:00
Florin Peter
b75a0abb6b
added test for rename folder
2013-05-15 22:42:22 +02:00
Florin Peter
ec2e193a44
removed unused code
2013-05-15 21:01:03 +02:00
Florin Peter
5fcb5f3aba
added test for password change
2013-05-15 21:00:35 +02:00
Björn Schießle
57c0a7ed69
add recovery key to all files if the user enabled the feature and removes them again on disable
2013-05-15 17:56:45 +02:00
Björn Schießle
1a31dc036a
added missing file to enable the admin to change the recovery key password
2013-05-15 16:14:54 +02:00
Björn Schießle
1f5ed65b12
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-15 16:13:29 +02:00
Björn Schießle
64d94c540a
enable admin to change the recovery password
2013-05-15 16:12:20 +02:00
Florin Peter
63a790b415
fix for broken tests
2013-05-15 14:33:08 +02:00
Florin Peter
1fbdc3ce8f
fix for previous workaround
2013-05-15 14:32:50 +02:00
Björn Schießle
5b160edebb
check if the user knows the correct recovery password before changing the recovery key settings
2013-05-15 14:02:13 +02:00
Björn Schießle
335f2ca321
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
2013-05-15 11:42:41 +02:00
Björn Schießle
d8ae2fa80d
only let the user change the recovery admin settings if a key passwords was entered.
2013-05-15 11:42:22 +02:00
Florin Peter
137039d35a
workaround for blank page need an other solution
2013-05-15 10:52:23 +02:00
Florin Peter
3d7534da74
improved files_encryption tests
2013-05-15 10:21:56 +02:00
Florin Peter
01f1153b08
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
...
Conflicts:
apps/files/l10n/ar.php
apps/files/l10n/bn_BD.php
apps/files/l10n/de.php
apps/files/l10n/de_DE.php
apps/files/l10n/el.php
apps/files/l10n/es.php
apps/files/l10n/fa.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/id.php
apps/files/l10n/ko.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sl.php
apps/files/l10n/uk.php
apps/files/l10n/vi.php
apps/files_encryption/l10n/ca.php
apps/files_sharing/lib/cache.php
apps/files_sharing/lib/sharedstorage.php
apps/user_ldap/l10n/tr.php
core/l10n/cs_CZ.php
core/l10n/de.php
core/l10n/de_DE.php
core/l10n/ru.php
core/l10n/sk_SK.php
core/l10n/tr.php
core/l10n/vi.php
core/l10n/zh_CN.php
l10n/af_ZA/files.po
l10n/ar/files.po
l10n/be/files.po
l10n/bg_BG/files.po
l10n/bn_BD/files.po
l10n/ca/files.po
l10n/ca/files_encryption.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/core.po
l10n/de/files.po
l10n/de/files_encryption.po
l10n/de/files_external.po
l10n/de/files_sharing.po
l10n/de/files_trashbin.po
l10n/de/files_versions.po
l10n/de/lib.po
l10n/de/settings.po
l10n/de/user_ldap.po
l10n/de_DE/files.po
l10n/de_DE/files_encryption.po
l10n/de_DE/files_external.po
l10n/de_DE/files_sharing.po
l10n/de_DE/files_trashbin.po
l10n/de_DE/lib.po
l10n/de_DE/settings.po
l10n/de_DE/user_ldap.po
l10n/el/files.po
l10n/eo/files.po
l10n/es/files.po
l10n/es/lib.po
l10n/es/settings.po
l10n/es_AR/files.po
l10n/eu/files.po
l10n/fa/files.po
l10n/fi/files.po
l10n/fi_FI/files.po
l10n/fr/core.po
l10n/fr/files.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/core.po
l10n/he/files.po
l10n/he/user_ldap.po
l10n/hi/files.po
l10n/hr/files.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/files_external.po
l10n/hu_HU/settings.po
l10n/hy/files.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/files_trashbin.po
l10n/ia/settings.po
l10n/id/files.po
l10n/is/files.po
l10n/it/files.po
l10n/ja_JP/files.po
l10n/ja_JP/user_ldap.po
l10n/ka/files.po
l10n/ka_GE/files.po
l10n/kn/files.po
l10n/ko/files.po
l10n/ko/files_trashbin.po
l10n/ko/settings.po
l10n/ku_IQ/files.po
l10n/lb/files.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lv/files.po
l10n/mk/files.po
l10n/ms_MY/files.po
l10n/my_MM/files.po
l10n/nb_NO/files.po
l10n/ne/files.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nn_NO/files.po
l10n/oc/files.po
l10n/pl/files.po
l10n/pl_PL/files.po
l10n/pt_BR/files.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/files_external.po
l10n/pt_PT/settings.po
l10n/ro/files.po
l10n/ru/core.po
l10n/ru/files.po
l10n/si_LK/files.po
l10n/sk/files.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sq/files.po
l10n/sr/files.po
l10n/sr@latin/files.po
l10n/sv/files.po
l10n/sw_KE/files.po
l10n/ta_LK/files.po
l10n/te/files.po
l10n/th_TH/files.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/lib.po
l10n/tr/settings.po
l10n/tr/user_ldap.po
l10n/uk/files.po
l10n/ur_PK/files.po
l10n/vi/core.po
l10n/vi/files.po
l10n/vi/files_external.po
l10n/zh_CN.GB2312/files.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/settings.po
l10n/zh_HK/files.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/files_versions.po
l10n/zh_TW/settings.po
l10n/zh_TW/user_ldap.po
lib/base.php
lib/files/filesystem.php
lib/files/view.php
lib/public/share.php
settings/l10n/es.php
settings/l10n/pt_PT.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
2013-05-15 10:18:25 +02:00
Florin Peter
226aec8d56
Merge branch 'master' into files_encryption
2013-05-15 03:22:06 +02:00
Florin Peter
7461e9c2b5
improved tests and added new tests for file rename and move
2013-05-15 02:38:08 +02:00
Florin Peter
499fe6ca8e
disabled FileProxy in Keymanager::getPrivateKey
2013-05-15 02:36:23 +02:00
Florin Peter
ddedf20106
prevent of infinite loop with FileProxy
2013-05-15 02:34:36 +02:00
Jenkins for ownCloud
6a788d1a54
[tx-robot] updated from transifex
2013-05-15 02:02:45 +02:00