mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 18:11:51 +03:00
Code Issues Projects Releases Packages Wiki Activity
15431 commits 219 branches 562 tags 474 MiB
Commit graph

15431 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
7ac82a23ab Yes yes, eslint 2019-05-14 12:11:07 +01:00
David Baker
c11d26d809 Fix email registration, pt. 2 
Regressed in https://github.com/matrix-org/matrix-react-sdk/pull/2768
where we check for an existing stored account first and restore that
instead if it exist, telling the user. We usually make a guest account
when the user first hits the page though, so this just restored this
guest account.

Don't restore the account if it's just a guest account (which, as per
comment, is not perfect, but is definitely better than the current
behaviour).

Fixes https://github.com/vector-im/riot-web/issues/9581
 2019-05-14 11:59:38 +01:00
David Baker
a0ecd89c94 Fix email registration: pt. 1 
We look to see if there's already a user logged in and if there is,
restore that session instead of logging the user in as their new
account. We still set this 'is_registered' flag though, even though
in that case it's not a newly registered account that's being restored,
so don't set in that case.
 2019-05-14 11:44:00 +01:00
Travis Ralston
f86ccae4a0 Give all the matrix.to tests a room ID to abuse 2019-05-13 14:31:40 -06:00
Travis Ralston
1584ab42c2 Support a backup room ID in PermalinkCreator 
In the case of room upgrades, it is possible the client is trying to render the room create event, but the user has never been in the old room. This results in an error because the PermalinkCreator cannot possibly figure out a room ID. 

Instead, we'll feed the creator an alternate room ID to try if the room object can't be provided.

Fixes https://github.com/vector-im/riot-web/issues/9636
 2019-05-13 14:12:58 -06:00
J. Ryan Stinnett
7881369b98 Always thumbnail for GIFs 
When displaying a GIF, we always want to thumbnail so that we can properly
respect the user's GIF autoplay setting (which relies on thumbnailing to produce
the static preview image).

Fixes https://github.com/vector-im/riot-web/issues/9658
 2019-05-13 18:28:57 +01:00
J. Ryan Stinnett
9d9a41b263 Save content.info as a local for readability 2019-05-13 18:00:52 +01:00
Travis Ralston
201fef8b11
Merge pull request #2947 from matrix-org/travis/password-score-config 
Add configuration flag to disable minimum password requirements
 2019-05-13 09:19:23 -06:00
J. Ryan Stinnett
f5aa32bc96
Merge pull request #2954 from matrix-org/jryans/aggregations 
Send and undo reaction events
 2019-05-13 15:20:28 +01:00
J. Ryan Stinnett
e22bd45608 Clarify ReactionsRow forceUpdate usage 2019-05-13 15:00:43 +01:00
J. Ryan Stinnett
af9fdbaeeb Rework reactionsCreated in EventTile to use state 
This changes to use component state instead of `forceUpdate`, so that it's more
obvious why an update is happening here.
 2019-05-13 14:52:55 +01:00
J. Ryan Stinnett
24209905e8 Test settings later for performance 2019-05-13 14:41:49 +01:00
David Baker
8729442ce4
Merge pull request #2961 from matrix-org/dbkr/optional_email_was_not_optional 
Fix bug where email was not required where it shouldn't have been
 2019-05-13 14:33:37 +01:00
David Baker
59cefbaa44
Typo 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-05-13 14:24:56 +01:00
David Baker
34990d1c89 Fix bug where email was not required where it shouldn't have been 
See comment!

Fixes https://github.com/vector-im/riot-web/issues/9681
 2019-05-13 14:17:09 +01:00
Travis Ralston
4ffd826e76 Flip logic for unsafe->safe 2019-05-12 22:53:06 -06:00
Travis Ralston
86ae9d9ab0
Merge pull request #2958 from matrix-org/t3chguy/cmd_rainbow 
add /rainbow and /rainbowme Slash Commands
 2019-05-12 18:51:29 -06:00
Travis Ralston
909354c195
Merge branch 'develop' into t3chguy/cmd_rainbow 2019-05-12 18:51:22 -06:00
Travis Ralston
99e2ac7255
Merge pull request #2956 from matrix-org/t3chguy/fix_memberinfo_invite 
Fix invite via MemberInfo
 2019-05-12 18:47:17 -06:00
Travis Ralston
8af6bc0758
Merge pull request #2955 from matrix-org/t3chguy/close_room_settings_leave_room 
Close Room Settings upon Leave Room
 2019-05-12 18:46:49 -06:00
Travis Ralston
76f37d691d
Merge pull request #2953 from matrix-org/t3chguy/roomavatar 
Command to change avatar for a single room, including upload of mxc res
 2019-05-12 18:46:06 -06:00
Michael Telatynski
9f9a245af1 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-12 17:14:30 +01:00
Michael Telatynski
d9b03b0196 fix i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-12 16:42:13 +01:00
Michael Telatynski
4c8593a91f Add i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-12 16:40:27 +01:00
Michael Telatynski
8bd45ce893 add /rainbow and /rainbowme Slash Commands 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-12 16:36:43 +01:00
Michael Telatynski
3cd9c152c2 Check permission to invite before showing invite buttons/disable them 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-11 19:45:24 +01:00
Michael Telatynski
0530a64f19 Fix invite via MemberInfo. Thank U JetBrains for solving this one for me <3 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-11 18:46:13 +01:00
Michael Telatynski
249f3d972b Close Room Settings upon Leave Room 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-10 20:58:32 +01:00
Michael Telatynski
5cb0a81565 Change roomavatar to myroomavatar and roomnick to match, leaving alias 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-10 20:28:28 +01:00
Travis Ralston
3161682836
Merge pull request #2804 from matrix-org/devtools_serverlist 
Add View Servers in Room to Devtools
 2019-05-10 11:32:17 -06:00
J. Ryan Stinnett
6a3708d51b Disable select for reaction buttons 2019-05-10 18:09:32 +01:00
J. Ryan Stinnett
33513a95d7 Change to componentDidUpdate to process first reaction 
This changes to "did update" and also calls the reaction change handler to
ensure that we update the state of my reactions (to know which were sent by
you).
 2019-05-10 17:59:17 +01:00
J. Ryan Stinnett
dc4fccd291 Send and redact reaction events 
This updates both the reaction row and action bar UIs to send and redact
reaction events as appropriate based on user interactions.

Fixes https://github.com/vector-im/riot-web/issues/9574
Fixes https://github.com/vector-im/riot-web/issues/9572
 2019-05-10 17:19:27 +01:00
J. Ryan Stinnett
39bd0d8bb3 Listen for additional reactions in existing collection 
The various reaction UI bits will now listen for `Reactions.add` for new
reactions just like with redactions.

Part of https://github.com/vector-im/riot-web/issues/9572
 2019-05-10 17:19:27 +01:00
J. Ryan Stinnett
37d2f60045 Listen for reaction collections when they are created 
The `EventTile` for events without reactions now use `Event.relationsCreated` to
listen for a future time where they come in to being.
 2019-05-10 17:19:27 +01:00
J. Ryan Stinnett
ce35741030 Remove redundant key vs. content in ReactionDimension 
This simplifies `ReactionDimension` by using the emoji string everywhere instead
of keeping a separate text string as well. It should improve readability as
well, as the reaction events also have a field `key` which was the emoji
content, which was easy to confuse.
 2019-05-10 17:19:27 +01:00
J. Ryan Stinnett
6a59143ffb Update reactions when redacted 
This updates the reaction state in the reaction row and action bar when a
reaction is redacted.

Part of https://github.com/vector-im/riot-web/issues/9574
 2019-05-10 17:19:27 +01:00
J. Ryan Stinnett
8fdb59a909 Use basic read path from JS SDK for reactions 
This displays existing reactions correctly in the action bar and reaction row,
but it doesn't yet update after a new reaction is sent.
 2019-05-10 17:19:27 +01:00
J. Ryan Stinnett
8903f65fcb Enable client-side aggregations for reactions 
If reactions are enabled, we need to enable client-side aggregation in the
`MatrixClient` to access the data.
 2019-05-10 17:19:27 +01:00
J. Ryan Stinnett
74189b2164 Fix indentation in MessagePanel 2019-05-10 17:19:27 +01:00
J. Ryan Stinnett
3beb70814c Fix indentation in TimelinePanel 2019-05-10 17:19:27 +01:00
David Baker
35435edd46
Merge pull request #2951 from Yoshiin/yoshiin/develop 
Update 'Rooms' import RoomView.js file
 2019-05-10 09:54:45 +01:00
Michael Telatynski
cd5a460b2b Iterate PR based on feedback 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-09 22:30:45 +01:00
Michael Telatynski
16c027dc61 Merge branches 'develop' and 'devtools_serverlist' of github.com:matrix-org/matrix-react-sdk into devtools_serverlist 2019-05-09 22:27:37 +01:00
Michael Telatynski
92a932158d Command to change avatar for a single room, including upload of mxc res 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-05-09 22:16:51 +01:00
Léo Mora
2342eb5426
Update 'Rooms' import 2019-05-09 16:17:54 +02:00
J. Ryan Stinnett
d6f47d4c10
Merge pull request #2950 from matrix-org/jryans/extract-reaction-dimensions 
Extract `ReactionDimension` out of `MessageActionBar`
 2019-05-09 11:34:44 +01:00
J. Ryan Stinnett
576241236c Extract ReactionDimension out of MessageActionBar 
The reactions bits were cluttering up `MessageActionBar` so they have now been
extracted to a separate component.
 2019-05-08 13:53:41 +01:00
David Baker
09a9b2e15e Merge branch 'master' into develop 2019-05-07 15:50:14 +01:00
David Baker
3b03e23ace v1.1.0 2019-05-07 15:36:10 +01:00