Commit Graph

103 Commits

Author SHA1 Message Date
Robin McCorkell 50dba97bde Miscellaneous text fixes for core apps 2014-03-26 15:43:03 +00:00
Frank Karlitschek 8a24e1eb96 clearify the use-case of this app 2014-03-17 12:29:17 +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 1df6bf997a add link to documentation 2014-01-17 14:56:15 +01:00
Bjoern Schiessle 6b69c52037 updated description of the files encryption app 2014-01-17 11:08:49 +01:00
Bjoern Schiessle d6fb2afa85 show a message at the log-in screen if inital encryption take place 2013-11-25 23:49:05 +01:00
Björn Schießle 5b7f76e702 Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617
Encryption improved error messages
2013-10-04 02:28:18 -07:00
Bjoern Schiessle 7e54e8831e set rememberlogin to false for the encryption app 2013-09-26 19:34:50 +02:00
Bjoern Schiessle f6e8a388a9 Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts:
	settings/ajax/changepassword.php
2013-09-23 10:39:12 +02:00
Bjoern Schiessle fb462e83cc no longer enforce log out, but provide useful errors/warnings instead 2013-09-06 12:27:40 +02:00
Bjoern Schiessle 4dbc787055 check if stream wrapper is already registered to avoid warning 2013-09-03 15:56:25 +02:00
Bjoern Schiessle bab63c22ee encryption error messages, distinguish between a re-enabled encryption app and a password change from outside 2013-09-02 11:26:11 +02:00
Bjoern Schiessle d7dca966a2 improved error messaging, initial commit 2013-08-30 10:17:50 +02:00
kondou 9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +02:00
Frank Karlitschek ccb3c5b428 Removed the preview warning. This is only a simple text change 2013-07-13 13:31:55 +02:00
VicDeo f67fc78531 Merge pull request #3899 from owncloud/encryption_check_php_version
check php version, the encryption app needs php >= 5.3.3
2013-07-04 06:53:17 -07:00
Björn Schießle adcee5b695 check php version, the encryption app needs php >= 5.3.3 2013-07-01 12:16:36 +02:00
Björn Schießle c4aef89278 introduce pre-disable-app hook and use it for the encryption app to reset migration status if the app was disabled 2013-06-27 14:09:22 +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
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 13017ce9e1 Merge branch 'master' into files_encryption_check_private_key
Conflicts:
	settings/ajax/changepassword.php
2013-06-10 12:12:07 +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
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 1c4c89418b also fix login errors while filesystem is not loaded in app.php 2013-05-31 12:56:08 +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 5d32e214b7 reformat code 2013-05-27 17:26:58 +02:00
Frank Karlitschek 29c8cbf4d1 increase version and add warning 2013-05-25 12:08:18 +02:00
Florin Peter 4bf840e2ca cleanup unused code optimize tests 2013-05-21 00:00:55 +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 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
Florin Peter 2a038baee0 updated authors info 2013-05-18 22:33:31 +02:00
Florin Peter 681252669a changed migrationStatus to migration_status for pgsql 2013-05-18 22:10:00 +02:00
Florin Peter 6980f59b2f fixed typos 2013-05-18 21:12:53 +02:00
Florin Peter 1fbdc3ce8f fix for previous workaround 2013-05-15 14:32:50 +02:00
Florin Peter 137039d35a workaround for blank page need an other solution 2013-05-15 10:52:23 +02:00
Florin Peter e25aa78caf added helper class and moved hook registration to it 2013-05-09 19:36:18 +02:00
Sam Tuke 28866de44b Added pre_share hook
Switched it for post_share hook in encryption hooks
Stop a file from being shared if the encryption procedure fails for any users
2013-05-08 16:22:08 +02:00
Sam Tuke c8946ea608 Added support for user-specified password for adminRecovery account in admin settings page
Made encryptAll() (file migration for unencrypted + legacy encrypted files) run only on first login for each user (status stored in DB)
Made recoveryAdmin user member of 'admin' user group automatically
Set recoveryadmin settings to only display on user settings if enabled by an admin
Updated encryption db xml schema
2013-05-04 16:14:38 +02:00
Sam Tuke ba29147e34 Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax)
Renamed recovery methods in Util{} for clarity
Added note about bug causing slow page load and redundant keypair generation
recoveryAdmin functionality not yet complete
2013-05-01 19:21:01 +02:00
Florin Peter d40ffc5aac added filesystem post rename hook 2013-04-27 20:18:05 +02:00
Sam Tuke f89a3604aa Working on stream{} writing
Development snapshot
2013-04-16 18:29:22 +02:00
Sam Tuke f378a7f572 Fixed proxy class handing of read / write files
Various work on other classes
2013-04-16 13:22:16 +02:00
Björn Schießle 4303d6318e Session expect OC_FilesystemView() 2013-04-10 15:31:19 +02:00
Björn Schießle 98de385b8a add $view as parameter for session constructor 2013-04-10 15:08:28 +02:00
Sam Tuke 109fe198c3 Added info about filesystem method access conventions 2013-04-09 19:19:27 +02:00
Sam Tuke 14451bdaf0 Development snapshot;
Fixed errors from Hooks::login();
Work on enable/disable recoveryAdmin for lost passwords in settings page (template, ajax, js);
Work on fixing sharing files to users (still broken);
2013-03-29 21:11:29 +01:00
Sam Tuke ff6f52d5ec Merge branch 'master' into files_encryption
Conflicts:
	apps/files_encryption/hooks/hooks.php
	apps/files_encryption/lib/crypt.php
	apps/files_encryption/lib/keymanager.php
2013-03-28 18:39:12 +01:00
Sam Tuke c89fd49870 Improved folder creation code
Created stub method for checking user pwd recovery preference from db
Added pwd recovery column to db
Added comments
2013-03-19 19:53:15 +01:00
Tom Needham e58dbd46fc Merge in master 2013-03-09 00:04:33 +00:00