Alexei Stukov
|
c893216874
|
Merge branch 'master' into security
|
2018-08-13 14:38:25 +03:00 |
|
Alexei Stukov
|
a1a869181b
|
Merge pull request #214 from samuelthomas2774/settings
Add an option to disable toasts and additional options for collections
|
2018-08-13 14:37:03 +03:00 |
|
Alexei Stukov
|
f5cbd8d491
|
Merge pull request #220 from JsSucks/security-encrypted-images
Security encrypted images
|
2018-08-13 14:34:59 +03:00 |
|
Alexei Stukov
|
17917f3257
|
Merge branch 'security' into security-encrypted-images
|
2018-08-13 14:27:29 +03:00 |
|
Jiiks
|
19be33b17d
|
Don't use encrypted key for hmac
|
2018-08-13 12:56:41 +03:00 |
|
Jiiks
|
cfcca0d782
|
Remove debug
|
2018-08-13 12:35:19 +03:00 |
|
Jiiks
|
5592a8d376
|
Use security module
|
2018-08-13 12:33:44 +03:00 |
|
Jiiks
|
0c0ebb2ebb
|
Pseudo needs content
|
2018-08-13 10:57:32 +03:00 |
|
Jiiks
|
d6d78d1e99
|
Move master init to enabled
|
2018-08-13 10:45:52 +03:00 |
|
Jiiks
|
b6da7019d0
|
Unused import
|
2018-08-12 22:12:26 +03:00 |
|
Jiiks
|
a123e20b05
|
Move to Security
|
2018-08-12 22:11:41 +03:00 |
|
Jiiks
|
856334cf30
|
TODO
|
2018-08-12 22:09:34 +03:00 |
|
Jiiks
|
3f5b2afbd5
|
decrypting should be set to false as well
|
2018-08-12 22:05:44 +03:00 |
|
Jiiks
|
ad35c89d7d
|
Force update on failed auth instead
|
2018-08-12 21:59:54 +03:00 |
|
Jiiks
|
71a0ce8fb0
|
Set readyState on failed authentication
|
2018-08-12 21:58:26 +03:00 |
|
Jiiks
|
d53a3b4d64
|
base classname
|
2018-08-12 21:56:57 +03:00 |
|
Jiiks
|
bd0c66466f
|
Use randomBytes for master encryption
|
2018-08-12 21:54:57 +03:00 |
|
Jiiks
|
0a751919aa
|
Remove debug
|
2018-08-12 21:48:15 +03:00 |
|
Jiiks
|
cae68947df
|
add bad key handler
|
2018-08-12 21:46:59 +03:00 |
|
Jiiks
|
2b833b5141
|
add hmac
|
2018-08-12 21:43:59 +03:00 |
|
Jiiks
|
b24c0ba2f3
|
Strip base64 prefix to not have static data in encrypted content
|
2018-08-12 20:57:02 +03:00 |
|
Jiiks
|
3b8126781d
|
Default to channel id
|
2018-08-12 20:31:30 +03:00 |
|
Jiiks
|
a1a63f2c35
|
Proper doc
|
2018-08-12 18:37:11 +03:00 |
|
Jiiks
|
334c9f852a
|
Use cache module
|
2018-08-12 18:10:22 +03:00 |
|
Jiiks
|
17128a889b
|
add cache module
|
2018-08-12 17:40:26 +03:00 |
|
Jiiks
|
d2b99f200b
|
add image plus material icon
|
2018-08-12 15:58:00 +03:00 |
|
Jiiks
|
5f4a77f2d8
|
Remove my leak tests
|
2018-08-12 15:48:26 +03:00 |
|
Jiiks
|
3614997fa9
|
No need to use this when it's already in the scope
|
2018-08-12 15:47:20 +03:00 |
|
Jiiks
|
5f76d304f6
|
Use predefined colours
|
2018-08-12 15:46:17 +03:00 |
|
Jiiks
|
e8688c0ce4
|
User some colour variables
|
2018-08-12 15:41:25 +03:00 |
|
Jiiks
|
641a12d640
|
Move lock icon to images
|
2018-08-12 15:40:00 +03:00 |
|
Jiiks
|
169741d5a1
|
Image encryption, decryption, styling and other stuff
|
2018-08-12 15:39:00 +03:00 |
|
Alexei Stukov
|
4aec2a7ade
|
Merge pull request #218 from JsSucks/security-patch
fix all mentions in e2ee
|
2018-08-12 11:01:45 +03:00 |
|
Mega-Mewthree
|
ee9cba328f
|
Merge pull request #5 from Mega-Mewthree/e2ee-dev
E2ee dev
|
2018-08-11 18:29:38 -07:00 |
|
Mega-Mewthree
|
c421be9e91
|
Fix merge
|
2018-08-11 18:28:18 -07:00 |
|
Mega-Mewthree
|
7a1768ca87
|
Merge branch 'e2ee-dev' of https://github.com/Mega-Mewthree/BetterDiscordApp into e2ee-dev
|
2018-08-11 18:26:37 -07:00 |
|
Mega-Mewthree
|
b9e9ab89f7
|
Rename variables to better describe what they represent.
|
2018-08-11 18:24:55 -07:00 |
|
Mega-Mewthree
|
b9f3c3f4e2
|
Merge pull request #4 from Mega-Mewthree/e2ee-dev
E2ee dev
|
2018-08-11 17:24:46 -07:00 |
|
Mega-Mewthree
|
dc842b479b
|
Merge branch 'security' into e2ee-dev
|
2018-08-11 17:24:22 -07:00 |
|
Mega-Mewthree
|
02e6fb88aa
|
Prevent the context menu from appearing in Group DMs.
|
2018-08-11 16:37:58 -07:00 |
|
Mega-Mewthree
|
c10310af3a
|
Error toast on computeSecret error.
|
2018-08-11 16:28:34 -07:00 |
|
Mega-Mewthree
|
7e41fe73e7
|
Secure key exchange for DMs.
|
2018-08-11 16:21:08 -07:00 |
|
Mega-Mewthree
|
c122457565
|
Style the lock context menu.
|
2018-08-11 10:11:56 -07:00 |
|
Mega-Mewthree
|
0ea0acfaa5
|
Merge pull request #3 from JsSucks/security-patch
fix all mentions
|
2018-08-11 07:55:19 -07:00 |
|
Jiiks
|
866ad8b13b
|
Tons of stuff
|
2018-08-11 15:29:30 +03:00 |
|
Mega-Mewthree
|
c5d4e199fc
|
Very poorly implemented key exchange UI.
PLEASE HELP ME
|
2018-08-11 00:34:18 -07:00 |
|
Mega-Mewthree
|
1a8946b151
|
Merge branch 'e2ee-dev' of https://github.com/Mega-Mewthree/BetterDiscordApp into e2ee-dev
|
2018-08-10 23:06:28 -07:00 |
|
Zack Rauen
|
9c0e19e198
|
fix all mentions
|
2018-08-11 01:15:49 -04:00 |
|
Alexei Stukov
|
816f809ca7
|
Merge pull request #217 from samuelthomas2774/security
Add clicking the status icon to toggle encryption and add an indicator to encrypted messages
|
2018-08-11 06:00:56 +03:00 |
|
Samuel Elliott
|
32a995f678
|
Add an encrypted indicator to encrypted messages
|
2018-08-11 02:58:55 +01:00 |