mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-25 20:26:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
22805 commits 207 branches 547 tags 609 MiB
Commit graph

22805 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
0a6f54da33 Label and use UNSAFE_componentWillMount to minimize warnings 
These TODO comments are expected to be fixed ASAP, but until that happens let's minimize the errors in the console for development.

For https://github.com/vector-im/riot-web/issues/12877

These all aren't using componentDidMount because they do something which causes application instability if componentDidMount were used. Much of these calls are expected to move into constructors once they are converted to real classes.
 2020-03-31 14:15:23 -06:00
Michael Telatynski
56dda3895c
Merge pull request #4302 from matrix-org/t3chguy/cmds 
rework SlashCommands to better expose aliases
 2020-03-31 17:04:31 +01:00
Michael Telatynski
c75475f3f5
Merge pull request #4311 from matrix-org/t3chguy/fix_els 
Fix EventListSummary when RR rendering is disabled
 2020-03-31 16:18:16 +01:00
Jorik Schellekens
6da01a9cf7
Merge pull request #4299 from JorikSchellekens/joriks/css-location 
Update link to css location.
 2020-03-31 16:00:11 +01:00
Michael Telatynski
9ed08e76f8
Merge pull request #4310 from matrix-org/t3chguy/fix_peeking 
Fix peeking keeping two timeline update mechanisms in play
 2020-03-31 14:21:42 +01:00
Michael Telatynski
2624017ab9 Also stop peeking on unmount 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-31 12:51:03 +01:00
Michael Telatynski
9e8a401dc8 Fix EventListSummary when RR rendering is disabled 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-31 12:29:58 +01:00
Michael Telatynski
80479195c8 iterate PR based on feedback. Remove newballsplease cmd alias 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-31 11:53:26 +01:00
Michael Telatynski
6e61761012 Merge branches 'develop' and 't3chguy/cmds' of github.com:matrix-org/matrix-react-sdk into t3chguy/cmds 
 Conflicts:
	src/SlashCommands.tsx
 2020-03-31 11:49:53 +01:00
J. Ryan Stinnett
223a4e285d
Merge pull request #4308 from matrix-org/jryans/4s-prompt-overload 
Pass new secret storage key to bootstrap path
 2020-03-31 11:04:58 +01:00
J. Ryan Stinnett
24c09cc4c8 Convert secret storage key creation to object 2020-03-31 10:45:53 +01:00
Michael Telatynski
a2a9dc6cd0 Fix peeking keeping two timeline update mechanisms in play 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-31 10:37:56 +01:00
J. Ryan Stinnett
2455c5a850
Merge pull request #4303 from matrix-org/jryans/id-change-red 
Show red shield for users that become unverified
 2020-03-31 10:07:28 +01:00
Michael Telatynski
c094afbbe6
Merge pull request #4295 from matrix-org/t3chguy/a11y2 
Accessibility fixed for Event List Summary and Composer Format Bar
 2020-03-31 09:41:20 +01:00
Michael Telatynski
1c5b7bf132
Merge pull request #4279 from matrix-org/t3chguy/instant_sso 
Support $riot: Templates for SSO/CAS urls in the welcome.html page
 2020-03-31 09:39:40 +01:00
Travis Ralston
2557875fd2
Merge pull request #4296 from waylon531/upstream 
Added the /html command
 2020-03-30 20:56:24 -06:00
J. Ryan Stinnett
690b5945d0 Pass new secret storage key to bootstrap path 
This passes the newly created secret storage key down to the bootstrap path for
temporary caching to avoid prompting the user for it again in the later stages
of bootstrapping.

Fixes https://github.com/vector-im/riot-web/issues/12867
 2020-03-30 21:40:11 +01:00
waylon531
9cf82d8743
Updated strings 
I added a new string for the /html command and had to regerate strings
for i18

Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
 2020-03-30 11:44:34 -07:00
waylon531
dd4331cd18
Added the /html command 
This command lets you send html messages through riot. This is
incredibly useful for doing advanced formatting not supported by
markdown and lets riot support even more html tags.

Signed-off-by: Waylon Cude <waylon.cude@finzdani.net>
 2020-03-30 11:44:08 -07:00
Damir Jelić
930f93b974 Merge branch 'poljar/event-index-log-skipped-events' into develop 2020-03-30 20:12:51 +02:00
Michael Telatynski
6517ed07bd
Merge pull request #4307 from matrix-org/t3chguy/fixes1111 
Field: mark id as optional in propTypes
 2020-03-30 19:08:29 +01:00
Michael Telatynski
147e7bc57e Field: mark id as optional in propTypes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-30 18:42:47 +01:00
Travis Ralston
b5688ac2b6
Merge pull request #4254 from ThobyV/fix-css/_TagPanel.scss/mx_TagTile_context_button 
Fix view community link icon contrast
 2020-03-30 11:20:49 -06:00
Travis Ralston
df60f9cd26
Merge pull request #4304 from matrix-org/travis/fix-confs 
Remove underscore from Jitsi conference names
 2020-03-30 11:08:49 -06:00
Travis Ralston
ca5d540311 Remove underscore from Jitsi conference names 
Fixes https://github.com/vector-im/riot-web/issues/12929

Note: we don't need this to fix conferences in our hosted instance (riot.im or modular.im), but it is a common thing for self-hosters, including sometimes ourselves, to accidentally make mistakes on.
 2020-03-30 10:40:26 -06:00
J. Ryan Stinnett
520b4c3e65 Add tests for was verified case 2020-03-30 16:33:22 +01:00
J. Ryan Stinnett
b53b5cc45d Add wasCrossSigningVerified in test 2020-03-30 15:24:43 +01:00
J. Ryan Stinnett
a3555cacea Merge remote-tracking branch 'origin/develop' into jryans/id-change-red 2020-03-30 14:52:22 +01:00
Zoe
4e8cec354d
Merge pull request #4290 from matrix-org/foldleft/12484-user-shields 
Refactor shield display logic; changed rules for DMs
 2020-03-30 14:23:13 +01:00
Michael Telatynski
559b8e174b undo accidental changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-30 14:13:08 +01:00
Michael Telatynski
c6d69f3d3f de-tslint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-30 14:09:10 +01:00
Michael Telatynski
8c2b910c03 rework SlashCommands to better expose aliases 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-30 13:59:08 +01:00
Damir Jelić
836b348bff EventIndex: Add a trailing comma. 2020-03-30 14:49:28 +02:00
Damir Jelić
4371006c58 EventIndex: Better logging on how many events are added. 
This adds a bit more info to how many events are added, how many skipped
and if they are skipped because they are undecryptable.
 2020-03-30 14:49:28 +02:00
RiotRobot
78fd8e4569 Reset matrix-js-sdk back to develop branch 2020-03-30 13:42:52 +01:00
RiotRobot
9bfd88641d Merge branch 'master' into develop 2020-03-30 13:42:15 +01:00
RiotRobot
e32e9cec06 v2.3.0 2020-03-30 13:41:02 +01:00
RiotRobot
af1446e0ff Prepare changelog for v2.3.0 2020-03-30 13:41:02 +01:00
RiotRobot
d369695e22 Upgrade matrix-js-sdk to 5.2.0 2020-03-30 13:31:42 +01:00
Bruno Windels
117ea5dc76
Merge pull request #4300 from matrix-org/bwindels/fixglobalscrollbars 
Fix: bring back global thin scrollbars
 2020-03-30 10:56:19 +00:00
Bruno Windels
eff9db4273 bring back global style rules for thin scrollbars (also FF now!) 2020-03-30 12:41:05 +02:00
Michael Telatynski
90b8d87a39
Merge pull request #4297 from matrix-org/t3chguy/kbd11 
Keyboard shortcuts: Escape cancel reply and fix Ctrl+K
 2020-03-30 10:30:38 +01:00
Michael Telatynski
057ca35c24
Merge pull request #4298 from matrix-org/t3chguy/Bugreportdialog 
Field: make id optional, generate one if not provided
 2020-03-30 10:30:19 +01:00
Michael Telatynski
5375f888ea
Merge pull request #4293 from matrix-org/t3chguy/fix_scrollbars 
Fix ugly scrollbars in TabbedView (settings), emojipicker and widgets
 2020-03-30 10:29:56 +01:00
Zoe
403d70897d
Merge pull request #4274 from matrix-org/foldleft/reset-refactor 
rename secret storage force-reset variable to avoid confusion
 2020-03-30 10:22:24 +01:00
Zoe
098df07c67 review feedback 2020-03-30 10:18:47 +01:00
Jorik Schellekens
21a41fa343 Update link to css location. 2020-03-30 10:05:40 +01:00
Michael Telatynski
55c2d98571 Fix Field ctor 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 23:16:57 +01:00
Michael Telatynski
19aae087e0 Field: make id optional, generate one if not provided 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 22:59:15 +01:00
Michael Telatynski
167f953ac7 Document Composer:Escape to cancel a reply 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 20:35:35 +01:00