PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
24018 commits 1 branch 0 tags 338 MiB
Commit graph

24018 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
0da8ef6a1e
Merge pull request #4560 from matrix-org/t3chguy/redact_file 
Close ImageView when redacting
 2020-05-11 10:10:25 +01:00
Michael Telatynski
347e3a0dd0
Merge pull request #4484 from matrix-org/t3chguy/redaction_redesign 
Redesign redactions
 2020-05-08 17:40:04 +01:00
Half-Shot
93f2a83774 Revert "Assume room should be unencrypted if homeserver does not implement keys/query" 
This reverts commit baa7a86e3e.
 2020-05-08 16:36:13 +01:00
Will Hunt
baa7a86e3e
Assume room should be unencrypted if homeserver does not implement keys/query 
Dendrite (and others) do not support key fetching (or indeed, E2E at all). Rather than failing to create a room at all, leave it unencrypted. Fixes #13598
 2020-05-08 16:33:50 +01:00
Michael Telatynski
5402839f30 Close ImageView when 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-08 00:15:48 +01:00
Travis Ralston
2aa7a6087c
Merge pull request #4547 from matrix-org/travis/fix-user-panel 
Don't try to reload profile information when closing the user panel
 2020-05-07 10:21:17 -06:00
Michael Telatynski
dc65c87752 Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-05-07 17:10:21 +01:00
Michael Telatynski
4d6cd3c050 Update padding-left to 20px as per Nad's iteration 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-07 12:50:04 +01:00
David Baker
0fd06300be
Merge pull request #4558 from matrix-org/dbkr/fix_member_panel_hide 
Fix right panel hiding when viewing room member
 2020-05-07 12:03:34 +01:00
Zoe
1abd729ce0
Merge pull request #4540 from matrix-org/foldleft/11395-reg-error 
Don't erase password confirm on registration error
 2020-05-07 10:42:21 +01:00
Michael Telatynski
7c1ac7aaff fix unrelated tautology 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-05-07 10:02:40 +01:00
Michael Telatynski
f0085a9feb Merge branches 'develop' and 't3chguy/redaction_redesign' of github.com:matrix-org/matrix-react-sdk into t3chguy/redaction_redesign 2020-05-07 09:56:21 +01:00
David Baker
0b5691c003 Fix right panel hiding when viewing room member 
If you clicked on the header button whilst the right panel was
showing a room member, it would NPE because there was no
refireParams.member. It fires the same phase with no refireParams to
toggle the panel visibility (apparently), so detect that case.

Fixes https://github.com/vector-im/riot-web/issues/13571
 2020-05-07 09:43:14 +01:00
Travis Ralston
7f030a149e
Merge pull request #4557 from matrix-org/travis/3pid-loading 
Add a loading state for email addresses/phone numbers in settings
 2020-05-06 17:03:42 -06:00
Travis Ralston
9ae812c346 Add a loading state for email addresses/phone numbers in settings 
Fixes https://github.com/vector-im/riot-web/issues/13432
 2020-05-06 15:17:55 -06:00
Travis Ralston
19bb678dd6
Merge pull request #4554 from nimbleape/pwa-taskbar-colour-follow-theme 
set the meta tag for theme-color to the same theme css background
 2020-05-06 11:27:01 -06:00
Michael Telatynski
62bbf15efe
Merge pull request #4497 from matrix-org/t3chguy/invite_copy 
Update Invite Dialog copy to include email addresses
 2020-05-06 18:16:36 +01:00
Jorik Schellekens
d62e6ed05d
Merge pull request #4546 from JorikSchellekens/joriks/font-scaling-regressions 
Fix slider toggle regression.
 2020-05-06 17:08:18 +01:00
Dan Jenkins
1767a611a6
set the meta tag for theme-color to the same theme css background 2020-05-06 16:23:06 +01:00
Zoe
14516d3e7e
Merge pull request #4552 from matrix-org/foldleft/fix-sublist-crash 
Fix a crash where a name could unexpectedly be an empty list
 2020-05-06 13:52:50 +01:00
Michael Telatynski
854d27baf5
Merge pull request #4492 from ihatetothink/comunities-drag-from-context 
Solves communities can be dragged from context menu
 2020-05-06 13:06:30 +01:00
Bruno Windels
93f6737982
Merge pull request #4553 from matrix-org/bwindels/fixdefaultcomposeravatar 
Remove prefixes for composer avatar urls
 2020-05-06 10:40:48 +00:00
Bruno Windels
0c5c2501e6 remove prefixes as we're using data urls now 2020-05-06 12:23:03 +02:00
Michael Telatynski
d51a18ac49
Merge pull request #4541 from matrix-org/t3chguy/fix-reply-margin 
Fix reply RR spacing getting doubled
 2020-05-05 19:56:11 +01:00
Zoe
781cbea744 Fix a crash where a name could unexpectedly be an empty list 2020-05-05 15:39:37 +01:00
RiotRobot
aa0c6f1f71 Reset matrix-js-sdk back to develop branch 2020-05-05 11:40:37 +01:00
RiotRobot
338486b561 Merge branch 'master' into develop 2020-05-05 11:27:52 +01:00
RiotRobot
854855a5aa v2.5.0 2020-05-05 11:10:36 +01:00
RiotRobot
e6c485c7e8 Prepare changelog for v2.5.0 2020-05-05 11:10:36 +01:00
RiotRobot
1423c2e4bc Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:04:24 +01:00
J. Ryan Stinnett
7b131d873d
Merge pull request #4551 from matrix-org/jryans/event-logging-rm-rc 
EventIndex: Reduce the logging the event index is producing.
 2020-05-05 10:53:15 +01:00
Damir Jelić
51a79a43e3 EventIndex: Remove an unused variable. 2020-05-05 10:49:40 +01:00
Damir Jelić
5aa645caf9 EventIndex: Reduce the logging the event index is producing. 2020-05-05 10:49:40 +01:00
J. Ryan Stinnett
16099f731d
Merge pull request #4550 from matrix-org/bwindels/unverif-session-copy-self-rc 
Differentiate copy for own untrusted device dialog
 2020-05-05 10:39:07 +01:00
Bruno Windels
ab82bf8048 differentiate copy for own untrusted device dialog 2020-05-05 11:31:15 +02:00
Bruno Windels
ed455a966d
Merge pull request #4549 from matrix-org/bwindels/unverif-session-copy-self 
Differentiate copy for own untrusted device dialog
 2020-05-05 09:30:13 +00:00
Bruno Windels
b04bb423f8 differentiate copy for own untrusted device dialog 2020-05-05 10:23:39 +02:00
Damir Jelić
c9ac726629 EventIndex: Remove an unused variable. 2020-05-05 10:21:18 +02:00
Damir Jelić
f2df698e3b EventIndex: Reduce the logging the event index is producing. 2020-05-05 10:10:21 +02:00
Travis Ralston
9a14417a03 Don't try to reload profile information when closing the user panel 
Fixes https://github.com/vector-im/riot-web/issues/13479

This looks to have been caused by something to do with the app load order, though where is a mystery. The view change seems to fire for the same page type despite a dispatch that says to change the view type.

Instead of debugging it too much further, we'll just patch around it.

This commit also makes the settings link use a more safe approach to viewing the user info - not going through the dispatcher means we are at the mercy of browser behaviour when we already have a loop which deals with this.
 2020-05-04 15:41:26 -06:00
Jorik Schellekens
83bd96a091 Css rounds weirdly sometimes. Heigher precision fixes it. 2020-05-04 17:15:09 +01:00
J. Ryan Stinnett
349057f4d0
Merge pull request #4545 from matrix-org/foldleft/13167-spinner-progress-rc 
More detailed progress for key backup progress
 2020-05-04 16:35:01 +01:00
Zoe
64c70b2de0 fragments and i18n don't play nice together 2020-05-04 16:16:29 +01:00
Zoe
1afb09d257 Fixed the dialog height 2020-05-04 16:16:29 +01:00
Zoe
3dbcc9fe99 copy changes 2020-05-04 16:16:28 +01:00
Zoe
b7bcf25cfa i18n 2020-05-04 16:16:28 +01:00
Zoe
7ef3b446f4 Show progress when loading keys 2020-05-04 16:16:28 +01:00
Jorik Schellekens
a11812a402 Fix slider toggle regression. 2020-05-04 15:07:41 +01:00
Bruno Windels
d8ab1f0ddc
Merge pull request #4544 from matrix-org/bwindels/increaserage-rc 
Increase rageshake size limit to 5mb
 2020-05-04 13:35:22 +00:00
Bruno Windels
aa87e84652 increare rage shake size limit to 5mb 2020-05-04 14:08:39 +02:00