mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 19:41:52 +03:00
Code Issues Projects Releases Packages Wiki Activity
22920 commits 219 branches 562 tags 474 MiB
Commit graph

22920 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
f8051f9f6f Merge branch 'origin/develop' into Weblate. 2020-03-30 18:13:22 +00:00
Damir Jelić
930f93b974 Merge branch 'poljar/event-index-log-skipped-events' into develop 2020-03-30 20:12:51 +02:00
Weblate
1e2b175612 Merge branch 'origin/develop' into Weblate. 2020-03-30 18:08:35 +00: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
Weblate
fd593280e0 Merge branch 'origin/develop' into Weblate. 2020-03-30 17:20:54 +00: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
Weblate
b5587ea853 Merge branch 'origin/develop' into Weblate. 2020-03-30 17:08:55 +00: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
Weblate
28356345fc Merge branch 'origin/develop' into Weblate. 2020-03-30 13:23:19 +00: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
Weblate
47783bd9b4 Merge branch 'origin/develop' into Weblate. 2020-03-30 12:43:01 +00:00
RiotRobot
78fd8e4569 Reset matrix-js-sdk back to develop branch 2020-03-30 13:42:52 +01:00
Weblate
8a372778be Merge branch 'origin/develop' into Weblate. 2020-03-30 12:42:27 +00: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
Weblate
ba9b7d30dc Merge branch 'origin/develop' into Weblate. 2020-03-30 10:56:25 +00:00
random
b5c45b7d12 Translated using Weblate (Italian) 
Currently translated at 100.0% (2242 of 2242 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-03-30 10:56:25 +00: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
Weblate
68ebba1f94 Merge branch 'origin/develop' into Weblate. 2020-03-30 09:30:43 +00: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
Weblate
4b480f0b6d Merge branch 'origin/develop' into Weblate. 2020-03-30 09:30:24 +00: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
Weblate
2035a038aa Merge branch 'origin/develop' into Weblate. 2020-03-30 09:30:02 +00: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
Weblate
8ef77fec8a Merge branch 'origin/develop' into Weblate. 2020-03-30 09:22:31 +00: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
Michael Telatynski
acc41585ab Fix CmdOrCtrl+K for collapsed LHS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 20:33:27 +01:00
Michael Telatynski
2a54a8aa85 Escape should cancel a reply 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 20:33:01 +01:00
Michael Telatynski
2ff16844e5 Make ELS somewhat more accessible 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 20:12:10 +01:00
Michael Telatynski
b2d905ef2c Make FormatButton use AccessibleButtons 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-29 20:07:32 +01:00
Szimszon
78e46f0476 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2241 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-03-29 14:27:22 +00:00
Tirifto
b7d33a4c9b Translated using Weblate (Esperanto) 
Currently translated at 100.0% (2241 of 2241 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-03-29 14:27:22 +00:00