f72f9e0159
Merge pull request #14530 from owncloud/revert-14403
...
Revert "Updating license headers"
2015-02-27 00:39:29 -08:00
06aef4e8b1
Revert "Updating license headers"
...
This reverts commit 6a1a4880f0
2015-02-26 11:37:37 +01:00
bf65b1f18b
Rename getAsyncCommandBus to getCommandBus
2015-02-25 15:09:41 +01:00
27d047979d
require command that do file access to be run sync when encryption is enabled
2015-02-25 15:09:41 +01:00
6a1a4880f0
Updating license headers
2015-02-23 12:13:59 +01:00
87f81e5926
Remove unneeded addTranslations() calls
2015-01-14 14:36:23 +01:00
efac8ced90
Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself
2014-12-09 09:47:26 +01:00
7f7006643f
Fix namespace of files_encryption classes and autoload them
2014-12-09 09:47:26 +01:00
a10ae2816e
clean up encryption exceptions
2014-11-07 13:48:31 +01:00
c2a45c1238
throw exception if private key is missing
2014-11-05 13:05:46 +01:00
ec1a73fab9
Added OC.L10N namespace with translation functions
...
Added addTranslations and fixed de.js file
Fixed de.js to use OC.L10N.register() and use to correct expected
format.
Added JS unit tests for OC.L10N class
Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
724ff6264a
Remove unneeded file initialization in encryption, already handled in a hook
2014-09-02 16:15:42 +02:00
8105f2ac8a
introduce some encryption exceptions and catch additional error cases
2014-07-16 12:36:30 +02:00
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02: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
d6fb2afa85
show a message at the log-in screen if inital encryption take place
2013-11-25 23:49:05 +01:00
f6e8a388a9
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
settings/ajax/changepassword.php
2013-09-23 10:39:12 +02:00
fb462e83cc
no longer enforce log out, but provide useful errors/warnings instead
2013-09-06 12:27:40 +02:00
4dbc787055
check if stream wrapper is already registered to avoid warning
2013-09-03 15:56:25 +02:00
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
adcee5b695
check php version, the encryption app needs php >= 5.3.3
2013-07-01 12:16:36 +02:00
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
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
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
13017ce9e1
Merge branch 'master' into files_encryption_check_private_key
...
Conflicts:
settings/ajax/changepassword.php
2013-06-10 12:12:07 +02:00
8761242f52
Merge branch 'master' into files_encryption_upgrade_fix
...
Conflicts:
apps/files_encryption/appinfo/app.php
2013-05-31 20:34:43 +02:00
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
1c4c89418b
also fix login errors while filesystem is not loaded in app.php
2013-05-31 12:56:08 +02:00
4f9cbadfa4
fix for autoloader while user logged in and system is in maintenance
2013-05-31 01:34:31 +02:00
5d32e214b7
reformat code
2013-05-27 17:26:58 +02:00
4bf840e2ca
cleanup unused code optimize tests
2013-05-21 00:00:55 +02:00
1fbdc3ce8f
fix for previous workaround
2013-05-15 14:32:50 +02:00
137039d35a
workaround for blank page need an other solution
2013-05-15 10:52:23 +02:00
e25aa78caf
added helper class and moved hook registration to it
2013-05-09 19:36:18 +02:00
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
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
d40ffc5aac
added filesystem post rename hook
2013-04-27 20:18:05 +02:00
f378a7f572
Fixed proxy class handing of read / write files
...
Various work on other classes
2013-04-16 13:22:16 +02:00
4303d6318e
Session expect OC_FilesystemView()
2013-04-10 15:31:19 +02:00
98de385b8a
add $view as parameter for session constructor
2013-04-10 15:08:28 +02:00
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
e58dbd46fc
Merge in master
2013-03-09 00:04:33 +00:00
370f202251
Rebase to current master
2013-03-05 00:25:56 +00:00
5352f1e65b
Update app.php
...
suppress log messages like `include path for class \"OCA\\Encryption\\Crypt\" starts with \"apps\/\"`.
2013-03-02 12:18:28 +01:00
1b880f2f96
Moved dependencies out of Crypt methods (encKeyfileToMultipleUsers)(DI)
...
Fixed bug preventing sharing with users other than 'ownCloud'
Added comments
Moved functionality into filterShareReadyUsers()
Other changes
2013-02-19 19:16:50 +00:00
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
2013-02-14 08:36:26 +01:00
9356f9a6bf
add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared
2013-02-13 17:23:27 +01:00
4952dfe956
add post_unshare hook, also add public link shares to the list of user with access to a file
2013-02-13 14:56:39 +01:00
5a64c96d06
go back to preUnshare hooks since sharing doesn't trigger post unshare hooks
2013-02-11 15:13:42 +01:00
3e3cee98c8
- moved the enrcyption of the filekey ifg file gets shared from the post shared hook to
...
Crypt::encKeyfileToMultipleUsers() because this can be reused if files get unshared
- switch from preUnshare hook to postUnshare hook because afterward we can simply get the
updated list of users with access to the file and call Crypt::encKeyfileToMultipleUsers()
2013-02-11 13:28:37 +01:00
Thomas Müller
Morris Jobke
Robin Appelman
Jenkins for ownCloud
Vincent Petry
Joas Schilling
Bjoern Schiessle
VicDeo
Florin Peter
Sam Tuke
Tom Needham
j-ed
Bart Visscher