Michael Telatynski
|
3f72a590f5
|
move e2ee-default switch to well-known from config.json
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-06-01 22:37:12 +01:00 |
|
Michael Telatynski
|
cbc2aee746
|
Add js-sdk mechanism for polling client well-known for config
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-06-01 22:35:16 +01:00 |
|
Michael Telatynski
|
8848a2ea64
|
Merge branches 'develop' and 't3chguy/e2eedefault' of github.com:matrix-org/matrix-react-sdk into t3chguy/e2eedefault
Conflicts:
src/components/views/dialogs/InviteDialog.js
|
2020-06-01 21:42:31 +01:00 |
|
Jorik Schellekens
|
5caae2051b
|
Merge pull request #4678 from JorikSchellekens/joriks/draggable-cleanup-console
Remove logging to console for irc name resize
|
2020-06-01 18:22:23 +01:00 |
|
Jorik Schellekens
|
85faa8ac23
|
Merge pull request #4677 from JorikSchellekens/joriks/fix-dark-theme-selection
Use arrow functions instead of binding `this`
|
2020-06-01 18:12:05 +01:00 |
|
Jorik Schellekens
|
50124d3476
|
Merge pull request #4675 from JorikSchellekens/joriks/fix-compact-layout-regression
Increase specificity of compact layout selectors
|
2020-06-01 18:11:52 +01:00 |
|
Jorik Schellekens
|
6801751745
|
No logging
|
2020-06-01 18:08:52 +01:00 |
|
Jorik Schellekens
|
7db95b614a
|
Revert to arrow functions to bind this
|
2020-06-01 18:01:12 +01:00 |
|
Jorik Schellekens
|
8fea9e831e
|
Merge pull request #4665 from JorikSchellekens/joriks/appearance-tab
Create and use stylised checkboxes
|
2020-06-01 17:58:03 +01:00 |
|
Jorik Schellekens
|
c1adee376f
|
Merge pull request #4676 from JorikSchellekens/joriks/fix-irc-resizer
useIRCLayout moved to props
|
2020-06-01 17:57:43 +01:00 |
|
Jorik Schellekens
|
df18638164
|
useIRCLayout moved to props
|
2020-06-01 17:34:42 +01:00 |
|
Michael Telatynski
|
6ed3349140
|
Merge pull request #4674 from matrix-org/t3chguy/upload-tweaks
Fix paste image to upload
|
2020-06-01 17:25:39 +01:00 |
|
Michael Telatynski
|
19e8fa01f2
|
use import instead of getComponent
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-06-01 17:05:53 +01:00 |
|
Jorik Schellekens
|
85978426c9
|
Fix selectors
|
2020-06-01 16:45:19 +01:00 |
|
Jorik Schellekens
|
03c6813425
|
Update res/css/views/rooms/_GroupLayout.scss
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
|
2020-06-01 16:00:11 +01:00 |
|
Jorik Schellekens
|
53129cafc7
|
Move comment
|
2020-06-01 15:36:55 +01:00 |
|
Jorik Schellekens
|
fb9b14ec51
|
Remove superflous list
|
2020-06-01 15:35:25 +01:00 |
|
Jorik Schellekens
|
b48818bb46
|
Increase specificity of compact layout selectors
|
2020-06-01 15:23:34 +01:00 |
|
Michael Telatynski
|
7b2f2daf2c
|
Upload and Paste to Upload tweaks
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-06-01 15:00:55 +01:00 |
|
Jorik Schellekens
|
69747b6114
|
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into joriks/appearance-tab
|
2020-06-01 14:32:31 +01:00 |
|
Jorik Schellekens
|
9e9bcb4974
|
Move id generator into constrcutor
|
2020-06-01 12:04:47 +01:00 |
|
Jorik Schellekens
|
419857c29c
|
Merge pull request #4647 from JorikSchellekens/joriks/fix-filepanel-regression
Fix FilePanel and NotificationsPanel regression
|
2020-05-31 21:17:14 +01:00 |
|
Michael Telatynski
|
6472ca451e
|
Merge pull request #4669 from matrix-org/t3chguy/toasts6_1
Allow deferring of Update Toast until the next morning
|
2020-05-30 12:54:42 +01:00 |
|
Michael Telatynski
|
097f27c822
|
Merge pull request #4668 from matrix-org/t3chguy/toasts6
Give contextual feedback for manual update check instead of banner
|
2020-05-30 12:46:53 +01:00 |
|
Michael Telatynski
|
f8f1a99a2d
|
Merge branch 't3chguy/toasts6' of github.com:matrix-org/matrix-react-sdk into t3chguy/toasts6
|
2020-05-30 12:36:34 +01:00 |
|
Michael Telatynski
|
5b31fdd308
|
remove stale references to MatrixToolbar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-30 12:36:17 +01:00 |
|
Matthew Hodgson
|
7750c95a02
|
typoe
|
2020-05-30 00:43:55 +01:00 |
|
Matthew Hodgson
|
f3fedc5fc4
|
fix url
|
2020-05-30 00:42:23 +01:00 |
|
Michael Telatynski
|
0bbf971bac
|
Update src/dispatcher/actions.ts
Co-authored-by: Travis Ralston <travpc@gmail.com>
|
2020-05-29 20:50:47 +01:00 |
|
Michael Telatynski
|
3f76b73b50
|
Merge pull request #4659 from matrix-org/t3chguy/dialog_cancel_space
Dialog wrap title instead of taking same space as the close/cancel button
|
2020-05-29 20:47:31 +01:00 |
|
Michael Telatynski
|
0b44e30517
|
Merge pull request #4627 from matrix-org/t3chguy/modular-utm
Update Modular hosting link
|
2020-05-29 20:16:13 +01:00 |
|
Michael Telatynski
|
9431393bda
|
Allow deferring of Update Toast until the next morning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-29 19:59:47 +01:00 |
|
Jorik Schellekens
|
b61f1704d3
|
Merge branch 'develop' into joriks/fix-filepanel-regression
|
2020-05-29 19:14:19 +01:00 |
|
Michael Telatynski
|
f45c584c8a
|
Correct the GenericToast props to show the two modes of operation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-29 19:13:59 +01:00 |
|
Michael Telatynski
|
efd0da44a1
|
Give contextual feedback for manual update check instead of banner
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-29 18:24:45 +01:00 |
|
Travis Ralston
|
822a126cb6
|
Merge pull request #4663 from JorikSchellekens/develop
Fix field placeholder regression
|
2020-05-29 10:47:04 -06:00 |
|
Travis Ralston
|
e24773af83
|
Merge pull request #4667 from matrix-org/travis/uia/auth
Fix/document a number of UIA oddities
|
2020-05-29 08:33:49 -06:00 |
|
Travis Ralston
|
ea064afca4
|
Fix/document a number of UIA oddities
Edition 2 of https://github.com/matrix-org/matrix-react-sdk/pull/3211
Fixes https://github.com/vector-im/riot-web/issues/13837
|
2020-05-29 08:23:59 -06:00 |
|
Jorik Schellekens
|
66c0d53f3e
|
Create and use stylised checkboxes
|
2020-05-28 22:33:00 +01:00 |
|
Jorik Schellekens
|
6559fd499e
|
Fix field placeholder regression
|
2020-05-28 21:09:42 +01:00 |
|
Jorik Schellekens
|
930b8ff901
|
Merge pull request #4662 from JorikSchellekens/joriks/appearance-tab
Stop copy icon repeating weirdly
|
2020-05-28 19:57:46 +01:00 |
|
Jorik Schellekens
|
1ab6f27535
|
Stop copy icon repeating weirdly.
|
2020-05-28 19:37:49 +01:00 |
|
Michael Telatynski
|
ab116e1e63
|
Merge pull request #4661 from matrix-org/t3chguy/notifier-race
Try and fix the Notifier race
|
2020-05-28 19:12:32 +01:00 |
|
Michael Telatynski
|
227fc24d3a
|
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-28 19:04:34 +01:00 |
|
Michael Telatynski
|
2530ec8419
|
Try and fix the Notifier race
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-28 19:03:42 +01:00 |
|
Hubert Chathi
|
ec24350801
|
Merge pull request #4657 from matrix-org/uhoreg/keytar
set the client's pickle key if the platform can store one
|
2020-05-28 13:52:02 -04:00 |
|
Michael Telatynski
|
0242b6f3f3
|
Merge pull request #4624 from matrix-org/t3chguy/toasts3_2
Migrate Banners to Toasts
|
2020-05-28 18:21:28 +01:00 |
|
Michael Telatynski
|
c4d6367a17
|
Swap priorities of Desktop Notifications and Update toasts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2020-05-28 17:30:43 +01:00 |
|
Hubert Chathi
|
dc4a2191c1
|
really fix types
|
2020-05-28 12:04:32 -04:00 |
|
Hubert Chathi
|
0859827910
|
fix types
|
2020-05-28 11:56:48 -04:00 |
|