Commit Graph

677 Commits

Author SHA1 Message Date
Jenkins for ownCloud afc3d9314a [tx-robot] updated from transifex 2013-06-26 02:07:04 +02:00
Jenkins for ownCloud c3b8f2bf64 [tx-robot] updated from transifex 2013-06-25 02:13:40 +02:00
Jenkins for ownCloud aaecfa18ed [tx-robot] updated from transifex 2013-06-23 02:05:39 +02:00
Jenkins for ownCloud 52ba86678a [tx-robot] updated from transifex 2013-06-22 02:11:35 +02:00
Björn Schießle f40f49851c fix some strings in the admin settings, it's not a 'recovery account' but a 'recovery key' 2013-06-21 14:49:01 +02:00
Björn Schießle 76369b7424 encryption is LDAP compatible 2013-06-21 13:08:31 +02:00
Björn Schießle d10ad0d603 Squashed commit of the following:
commit 1345201c9da99a82f198e41fba24da6b0d7ae59a
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 16:27:46 2013 +0200

    add l10n support

commit bf2c79c8de8710e839a4a55642a91874c374fa1c
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 16:19:10 2013 +0200

    only init session if openssl extension is loaded

commit cbd52af6afbaa310bb1a534db64ff5e476dfd5d7
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:25:40 2013 +0200

    first disable app and than show error page

commit 55baf593179c433642de59552592e6b0f1932880
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:17:34 2013 +0200

    typo fixed

commit 1d9bef0b058e7cc3d511b81ae12d5a07660c75b2
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 12:15:40 2013 +0200

    move dependency check to the encryption app

commit c186e95da526f0470e20f014f1bd9513db5518ff
Author: Björn Schießle <schiessle@owncloud.com>
Date:   Thu Jun 20 11:13:11 2013 +0200

    make sure that openssl is installed and loaded
2013-06-21 10:37:51 +02:00
Jenkins for ownCloud 8c923a85de [tx-robot] updated from transifex 2013-06-21 08:53:57 +02:00
Björn Schießle c4aa3fac7e Merge pull request #3788 from owncloud/more_error_messages
add some more error messages, in case something went wrong
2013-06-20 02:12:01 -07:00
Jenkins for ownCloud 01ab79d460 [tx-robot] updated from transifex 2013-06-20 02:43:39 +02:00
Björn Schießle fe61230cc1 always have a defined return value 2013-06-19 16:55:31 +02:00
Björn Schießle e2e370f199 some more error messages 2013-06-19 15:58:34 +02:00
Björn Schießle 83d98e2d8b add some more error messages, in case something went wrong 2013-06-19 15:52:33 +02:00
Jenkins for ownCloud d991a9372b [tx-robot] updated from transifex 2013-06-18 02:11:10 +02:00
Jenkins for ownCloud 6156d71832 [tx-robot] updated from transifex 2013-06-17 02:08:11 +02:00
Jenkins for ownCloud 8243d19050 [tx-robot] updated from transifex 2013-06-16 02:07:45 +02:00
Jenkins for ownCloud ab411d2700 [tx-robot] updated from transifex 2013-06-15 02:07:18 +02:00
Björn Schießle a8a60d761b Merge pull request #3715 from owncloud/fixes_for_3641_3620
files_encryption: bug fixes for reported problems.
2013-06-14 01:38:15 -07:00
Jenkins for ownCloud 6c534c8165 [tx-robot] updated from transifex 2013-06-14 02:52:34 +02:00
Florin Peter 8566881758 fix for path_hash not unique as reported at #3641 2013-06-13 20:52:34 +02:00
Florin Peter 35da408222 fix memory problems as reported at #3620 2013-06-13 20:51:22 +02:00
Björn Schießle 7cfb0dc406 Merge branch 'master' into files_encryption_check_private_key
Conflicts:
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/util.php
2013-06-13 13:17:35 +02:00
Björn Schießle bc2862fcb9 Merge branch 'master' into files_encryption_upgrade_fix 2013-06-13 12:53:29 +02:00
Björn Schießle 2b179ccff0 Merge pull request #3668 from owncloud/encryption_migrate_only_once
make sure that only one process can enter the migration mode
2013-06-13 03:31:31 -07:00
Björn Schießle 2f1005f05f LegacyKeyRecryptKeyfileEncrypt() no longer exists, so test can be removed 2013-06-13 10:44:05 +02:00
Björn Schießle 6394fedb33 add comment to explain the helper function 2013-06-13 10:35:30 +02:00
Björn Schießle 77944cf7b8 fix typo in var name 2013-06-13 10:11:23 +02:00
Björn Schießle 27fcdb3af5 Merge branch 'master' into files_encryption_upgrade_fix
Conflicts:
	apps/files_encryption/tests/crypt.php
2013-06-12 20:53:45 +02:00
Björn Schießle df78085171 adapt test to the code changes 2013-06-12 14:00:53 +02:00
Björn Schießle c78a90fd54 use number of manipulated rows as idicator if it was possible to enter the migration mode 2013-06-12 12:21:11 +02:00
Björn Schießle 20ddd6e1c7 Merge branch 'master' into files_encryption_check_private_key
Conflicts:
	apps/files_encryption/tests/crypt.php
2013-06-11 15:19:02 +02:00
Björn Schießle 3ec6b19cdf use constants for different migration status 2013-06-11 13:07:39 +02:00
Björn Schießle 5fafd55108 make sure that only one process can enter the migration mode 2013-06-11 12:03:50 +02:00
Thomas Müller 74b1f7d448 Merge pull request #3646 from owncloud/introduce_phpunit_timeouts
add timeouts 3/30/90 to phpunit tests
2013-06-11 01:52:10 -07:00
Jenkins for ownCloud 4f0f537b42 [tx-robot] updated from transifex 2013-06-11 02:02:44 +02:00
Jörn Friedrich Dreyer c70a0f791d allow 30 sec for testDeleteFile 2013-06-10 14:45:39 +02:00
Morris Jobke 1da112750e Merge pull request #3647 from owncloud/missing_backticks
add missing backticks all over the place
2013-06-10 05:15:07 -07:00
Björn Schießle 13017ce9e1 Merge branch 'master' into files_encryption_check_private_key
Conflicts:
	settings/ajax/changepassword.php
2013-06-10 12:12:07 +02:00
Björn Schießle db06b906e5 Merge pull request #3610 from owncloud/encryption_recovery_for_ldap
recover encryption keys if ownCloud can't change the log-in password
2013-06-10 02:03:56 -07:00
Jörn Friedrich Dreyer b6f8d2b859 raise failed tests from first commit to size @medium 2013-06-10 10:17:47 +02:00
Jörn Friedrich Dreyer 124f34422c add missing backticks all over the place 2013-06-10 09:53:29 +02:00
Jörn Friedrich Dreyer 73fb722a9e add timeouts 3/30/90 to phpunit tests 2013-06-10 09:31:22 +02:00
Jenkins for ownCloud 3c79d89492 [tx-robot] updated from transifex 2013-06-08 02:13:41 +02:00
Jenkins for ownCloud 67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
Björn Schießle d7a9852f7b use pre_setPassword hook to update the encryption keys if the back-end doesn't support password change; improved output to let the admin know what happened 2013-06-06 13:32:02 +02:00
Jenkins for ownCloud 81b6cab94f [tx-robot] updated from transifex 2013-06-06 02:21:31 +02:00
Björn Schießle 7fc5151d95 add a hint that the admin can recover your files; Don't let the user change the recovery settings if no private key is set 2013-06-05 18:53:02 +02:00
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