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 |
|
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 |
|
Samuel Elliott
|
dac3187866
|
Add clicking the status icon to toggle encryption
|
2018-08-11 02:43:02 +01:00 |
|
Jiiks
|
60cdec3ae4
|
and move everything around just to annoy Zere
|
2018-08-11 04:33:00 +03:00 |
|
Jiiks
|
ed4adf21f4
|
Maybe encrypt instead
|
2018-08-11 04:31:57 +03:00 |
|
Jiiks
|
a8f0e239cf
|
Who wants to call them directly anyways
|
2018-08-11 04:31:13 +03:00 |
|
Jiiks
|
be1a183e62
|
Empty prefixes
|
2018-08-11 04:28:07 +03:00 |
|
Jiiks
|
d88cedb614
|
Security module
|
2018-08-11 04:27:18 +03:00 |
|
Jiiks
|
9880152290
|
Message parsing
|
2018-08-11 03:39:13 +03:00 |
|
Jiiks
|
0a1bd46ca9
|
Don't prefix everything by default
|
2018-08-10 21:17:52 +03:00 |
|
Jiiks
|
83ef17d302
|
Fix button patching
|
2018-08-10 20:38:02 +03:00 |
|
Jiiks
|
b67ca5c42d
|
Set master
|
2018-08-10 17:04:09 +03:00 |
|
Jiiks
|
bdec8b842e
|
Set master key
|
2018-08-10 17:02:41 +03:00 |
|
Jiiks
|
3bc7c28a97
|
initial master encrypt
|
2018-08-10 17:01:07 +03:00 |
|
Jiiks
|
3d4204f080
|
Functional E2EE submitting
|
2018-08-10 16:22:30 +03:00 |
|
Jiiks
|
3c83dbe0ff
|
add slight loading animation
|
2018-08-10 15:44:33 +03:00 |
|
Jiiks
|
a5ae5ad8e9
|
Warn style
|
2018-08-10 15:37:14 +03:00 |
|
Jiiks
|
54808f32ea
|
Default to error state
|
2018-08-10 15:33:48 +03:00 |
|
Jiiks
|
4e4c532813
|
More styling
|
2018-08-10 15:33:34 +03:00 |
|
Jiiks
|
aac4dba641
|
Styling
|
2018-08-10 15:32:04 +03:00 |
|
Jiiks
|
17f1b60a9b
|
E2EE component and material lock icon
|
2018-08-10 15:30:24 +03:00 |
|
Jiiks
|
2a10191926
|
E2EE patches
|
2018-08-10 15:08:21 +03:00 |
|
Alexei Stukov
|
87ec7d8773
|
Merge pull request #213 from JsSucks/ui
Securekvp
|
2018-08-10 14:21:00 +03:00 |
|
Jiiks
|
e518d4c117
|
package-lock
|
2018-08-10 14:18:08 +03:00 |
|
Jiiks
|
c4dfc7b11d
|
Remove debugs
|
2018-08-10 12:50:37 +03:00 |
|
Jiiks
|
0c04c04590
|
Secure kvp
|
2018-08-10 12:48:56 +03:00 |
|
Alexei Stukov
|
11b2b16233
|
Merge pull request #212 from samuelthomas2774/hide-button
Make the hide button setting functional
|
2018-08-10 02:35:07 +03:00 |
|
Alexei Stukov
|
4c6805510d
|
Merge pull request #211 from samuelthomas2774/vue-transition
Use Vue’s transition element to transition between menu panels
|
2018-08-10 02:34:25 +03:00 |
|
Samuel Elliott
|
cb01d32e19
|
Fix position on macOS
|
2018-08-10 00:00:01 +01:00 |
|
Samuel Elliott
|
89a5bfba20
|
Make the hide button setting functional
|
2018-08-09 23:49:10 +01:00 |
|
Alexei Stukov
|
87a2db1745
|
Merge pull request #210 from JsSucks/drop-area
Add temporary .bd file check on drop
|
2018-08-10 00:59:14 +03:00 |
|
Samuel Elliott
|
387227cc1f
|
Use Vue’s transition element to transition between menu panels
|
2018-08-09 22:50:14 +01:00 |
|
Zack Rauen
|
fdb3b308e1
|
add bd file check for upload drop area
|
2018-08-09 16:33:31 -04:00 |
|
Alexei Stukov
|
b33aff51c1
|
Merge pull request #207 from JsSucks/normalizer
fix class search in normalizer
|
2018-08-09 23:29:28 +03:00 |
|
Alexei Stukov
|
be09fbb5ac
|
Merge pull request #209 from JsSucks/settings
Collection setting and other minor things
|
2018-08-09 23:26:16 +03:00 |
|
Jiiks
|
2b4a804934
|
Use material icon
|
2018-08-09 23:21:57 +03:00 |
|
Jiiks
|
fcfba41805
|
Styling and remove default from E2EE
|
2018-08-09 23:13:38 +03:00 |
|
Jiiks
|
d14a06528c
|
else
|
2018-08-09 23:07:53 +03:00 |
|
Alexei Stukov
|
c336c8cb0d
|
Merge pull request #208 from samuelthomas2774/collection-settings
Extend ArraySetting for collections
|
2018-08-09 20:33:38 +03:00 |
|
Samuel Elliott
|
755d870a10
|
Merge remote-tracking branch 'upstream/settings' into collection-settings
# Conflicts:
# client/src/structs/settings/types/collection.js
# client/src/ui/components/bd/setting/Collection.vue
|
2018-08-09 18:27:06 +01:00 |
|
Jiiks
|
4ed301f531
|
Styling
|
2018-08-09 20:26:37 +03:00 |
|
Jiiks
|
263fcbe001
|
Collection fix
|
2018-08-09 20:22:48 +03:00 |
|
Samuel Elliott
|
883f760292
|
Extend ArraySetting for collections
|
2018-08-09 18:22:15 +01:00 |
|
Zack Rauen
|
5af8a2168d
|
fix class search
|
2018-08-09 11:31:11 -04:00 |
|
Jiiks
|
50badaef2b
|
add collection and make kvp functional
|
2018-08-09 17:20:06 +03:00 |
|
Alexei Stukov
|
4c20115705
|
Merge pull request #206 from JsSucks/security
Merge due to changes to core functionality to avoid conflicts
|
2018-08-09 13:24:00 +03:00 |
|
Jiiks
|
e21583eafd
|
add a manager for builtin modules
|
2018-08-09 13:21:17 +03:00 |
|
Jiiks
|
983763c48d
|
Check for module existence
|
2018-08-09 13:09:35 +03:00 |
|
Jiiks
|
75ceee5449
|
Typo
|
2018-08-09 13:06:20 +03:00 |