mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-01 11:03:18 +03:00
Code Issues Projects Releases Packages Wiki Activity
28580 commits 217 branches 561 tags 443 MiB
Commit graph

28580 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Hodgson
5ecc3f4398 kill formatMinimalBadgeCount entirely 2020-09-10 13:56:46 +01:00
Matthew Hodgson
89d05ac952 bring back 1.2M style badge counts rather than 99+ 2020-09-10 13:51:34 +01:00
David Baker
2b965a2741 Call jitsi widgets 'group calls' 
So they feel a bit more like first class citizens
 2020-09-10 11:52:01 +01:00
Travis Ralston
f8324c0dc0
Merge pull request #5190 from matrix-org/travis/permalinks-release-fix 
[Release] Account for via in pill matching regex
 2020-09-09 15:20:49 -06:00
Weblate
a9ee1e785e Merge branch 'origin/develop' into Weblate. 2020-09-09 21:08:50 +00:00
Nikita Epifanov
188aee0fcf Translated using Weblate (Russian) 
Currently translated at 100.0% (2369 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/ru/
 2020-09-09 21:08:50 +00:00
@a2sc:matrix.org
884b54fd02 Translated using Weblate (German) 
Currently translated at 100.0% (2369 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/de/
 2020-09-09 21:08:49 +00:00
Priit Jõerüüt
9586a981de Translated using Weblate (Estonian) 
Currently translated at 100.0% (2369 of 2369 strings)

Translation: Element Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/element-web/matrix-react-sdk/et/
 2020-09-09 21:08:48 +00:00
Travis Ralston
a765db8977
Merge pull request #5189 from matrix-org/travis/rageshake-fix 
Run the rageshake command through the bug report dialog
 2020-09-09 15:08:43 -06:00
Travis Ralston
3973efeed3 [Release] Account for via in pill matching regex 
https://github.com/matrix-org/matrix-react-sdk/pull/5188 to the release branch
 2020-09-09 15:01:41 -06:00
Travis Ralston
c61f2a8099
Merge pull request #5188 from matrix-org/travis/permalink-pills 
Account for via in pill matching regex
 2020-09-09 14:55:58 -06:00
Travis Ralston
77f715ba73 Fix i18n and analytics 2020-09-09 14:55:27 -06:00
Travis Ralston
9b5823cccb Run the rageshake command through the bug report dialog 
Ideally we encourage users to give us information like a github issue or options to download their logs.
 2020-09-09 14:53:38 -06:00
Travis Ralston
0a7090dd64 Account for via in pill matching regex 
Fixes https://github.com/vector-im/element-web/issues/15133

Regression first appeared in a80bcaa292

This also affects room IDs.
 2020-09-09 14:36:35 -06:00
Travis Ralston
91282e8071
Merge pull request #5187 from matrix-org/travis/fix-lock 
Remove now-unused create-react-class from lockfile
 2020-09-09 13:15:11 -06:00
Travis Ralston
85b5b8b094 Remove now-unused create-react-class from lockfile 2020-09-09 13:10:27 -06:00
Michael Telatynski
1b38b4cc00
Merge pull request #5163 from nigelrudolf/develop 
Fixed 1px jump upwards
 2020-09-09 17:49:08 +01:00
Michael Telatynski
050319c0cc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into fix-1px-jump 2020-09-09 17:37:50 +01:00
Michael Telatynski
c26f3b8a97 Fix onNewScreen to use replace when going from roomId->roomAlias to prevent locking the user in place 2020-09-09 16:52:46 +01:00
RiotRobot
c5e033d81a v3.4.0-rc.1 2020-09-09 15:53:04 +01:00
RiotRobot
53ca12a0b2 Prepare changelog for v3.4.0-rc.1 2020-09-09 15:53:04 +01:00
David Baker
62556c2afe
Merge pull request #5184 from matrix-org/dbkr/always_allow_local_widgets 
Always allow widgets when using the local version
 2020-09-09 15:52:31 +01:00
David Baker
f9079975a1 write correct jsdoc 2020-09-09 15:42:25 +01:00
David Baker
99b0a0a78e Always allow widgets when using the local version 
Since we're not loading the widget URL, there's no need to ask
for permission to load it: it's just another part of the app.
 2020-09-09 15:35:05 +01:00
Michael Telatynski
da9f765af8
Merge pull request #5175 from matrix-org/t3chguy/dpsah/6785.3 
Migrate RoomView and RoomContext to Typescript
 2020-09-09 15:27:40 +01:00
Michael Telatynski
a1f1334250 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.3 
 Conflicts:
	src/components/structures/RoomView.tsx
 2020-09-09 15:16:19 +01:00
RiotRobot
cc353dbe43 Upgrade matrix-js-sdk to 8.3.0-rc.1 2020-09-09 15:13:40 +01:00
J. Ryan Stinnett
0573ab1443
Merge pull request #5183 from RiotTranslateBot/weblate-element-web-matrix-react-sdk 
Update from Weblate
 2020-09-09 14:44:04 +01:00
Weblate
db5cbdf709 Merge branch 'origin/develop' into Weblate. 2020-09-09 13:34:36 +00:00
Michael Telatynski
3aeac749b3
Merge pull request #5167 from matrix-org/t3chguy/dpsah/6785.1 
Right Panel Room Summary and Widgets
 2020-09-09 14:34:31 +01:00
J. Ryan Stinnett
0219824d6f Merge remote-tracking branch 'origin/develop' into jryans/defer-cross-signing-setup 2020-09-09 14:13:23 +01:00
J. Ryan Stinnett
6d1b1d9460 Fix linting error 2020-09-09 14:12:36 +01:00
Michael Telatynski
04d2f93902 Fix WidgetStore handler bindings 2020-09-09 13:15:19 +01:00
Michael Telatynski
0e58eb6d56 Update initial widget height 2020-09-09 13:15:07 +01:00
Michael Telatynski
cef533b83e Update ellipsis svg 2020-09-09 13:09:21 +01:00
Michael Telatynski
39a59dbefa fix CI some more 2020-09-09 12:59:41 +01:00
Michael Telatynski
d9e17e89b5 fix CI 2020-09-09 12:55:16 +01:00
Michael Telatynski
8d66dce68d Update copy and use svg for ellipsis 2020-09-09 12:50:48 +01:00
Michael Telatynski
b635598bc3 Attempt to fix tests and fix RoomSummaryCard having wrong member count 2020-09-09 12:28:12 +01:00
Michael Telatynski
8dcb2d4719 attempt to fix CI tests 2020-09-09 12:06:16 +01:00
Michael Telatynski
bb98587143 fix e2e tests. Change the default Room Tab to RoomSummary 2020-09-09 11:42:41 +01:00
Michael Telatynski
37c0d524bc re-order top right buttons 2020-09-09 11:06:15 +01:00
Michael Telatynski
fb0b784369 test CI 2020-09-09 10:56:14 +01:00
Michael Telatynski
c8bc80a3b1 test with delay 2020-09-09 10:07:43 +01:00
Michael Telatynski
29c2a0ef35 Fix FilePanel and NotificationPanel overscroll issues 2020-09-09 09:50:08 +01:00
Michael Telatynski
644ff56ace Fix e2e tests 2020-09-09 09:38:13 +01:00
Nigel Mansell
421af52e76 Fixed 1px jump upwards on filter room members box 
Signed-off-by: Nigel Mansell <mansell.nigel@mac.com>
 2020-09-08 15:29:16 -04:00
Michael Telatynski
517b594edc Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/dpsah/6785.1 
 Conflicts:
	src/components/structures/RightPanel.js
 2020-09-08 18:04:24 +01:00
J. Ryan Stinnett
bbe2084f66 Add independent set up / reset actions in Settings 
This adds set up and reset actions to each of cross-signing and secure backup
that do separate things, rather than mixing concerns together. (It's temporarily
still a bit of lie for backup, as more changes are needed to stop resetting
cross-signing as well.)
 2020-09-08 18:01:56 +01:00
Michael Telatynski
12a6bc8231 update copy 2020-09-08 18:00:21 +01:00