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

16721 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
11718a982a use originalEvent if present and append it to list 2019-07-09 17:54:59 +02:00
Weblate
5666c0db45 Merge branch 'origin/develop' into Weblate. 2019-07-09 15:05:08 +00:00
Bruno Windels
31723e9e5b
Merge pull request #3194 from matrix-org/bwindels/fix-history-redactions 
Don't try to call bodyToHtml with an empty content
 2019-07-09 15:05:03 +00:00
Weblate
7a7af68413 Merge branch 'origin/develop' into Weblate. 2019-07-09 15:03:26 +00:00
J. A. Durieux
87a67df2d0 Translated using Weblate (Dutch) 
Currently translated at 99.1% (1667 of 1682 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-07-09 15:03:25 +00:00
Bruno Windels
7ab665bf31
Merge pull request #3193 from matrix-org/bwindels/replace-server-date 
Take server-side aggregation into account for timestamp on (edited) tooltip
 2019-07-09 15:03:21 +00:00
Bruno Windels
f03187190e Don't try to call bodyToHtml with an empty content 
with the stripReply flag, this crashes.
 2019-07-09 15:00:26 +02:00
Weblate
88b91e24a5 Merge branch 'origin/develop' into Weblate. 2019-07-09 09:59:33 +00:00
Karol Kosek
044d1b8130 Translated using Weblate (Polish) 
Currently translated at 73.1% (1229 of 1682 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2019-07-09 09:59:33 +00:00
Michael Telatynski
349afb13f3
Merge pull request #3164 from matrix-org/t3chguy/fix_proptypes_mismatches 
Fix some React errors
 2019-07-09 10:59:29 +01:00
Bruno Windels
58d7ed02b7 use method that also takes server aggregations into account for tooltip date 2019-07-09 11:31:29 +02:00
Travis Ralston
8ebc03706a Also clear data when the deviceId doesn't match 
When the HS implementation doesn't respect the device_id parameter erroneously
 2019-07-08 15:35:34 -06:00
Travis Ralston
ab63e8bd04 Remove backwards compat function 2019-07-08 11:55:00 -06:00
Travis Ralston
d2ab0a5ca7 Move key backup init to componentDidMount 2019-07-08 11:53:26 -06:00
Travis Ralston
3e0be640fd Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys 2019-07-08 11:52:58 -06:00
Travis Ralston
c3383e9315 Move _initLogin to componentDidMount 2019-07-08 11:51:22 -06:00
Weblate
c8e0b7b96c Merge branch 'origin/develop' into Weblate. 2019-07-08 15:19:40 +00:00
Kévin C
61a7cc17a0 Translated using Weblate (French) 
Currently translated at 100.0% (1682 of 1682 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-07-08 15:19:39 +00:00
Jeff Huang
85e7fd4719 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1682 of 1682 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-07-08 15:19:39 +00:00
Bruno Windels
cd803617b8
Merge pull request #3192 from matrix-org/bwindels/preserve-reply-fallback-on-edit 
Preserve reply fallback on edit
 2019-07-08 15:19:35 +00:00
Bruno Windels
f6e71b2335 turn flag into options object 2019-07-08 16:55:56 +02:00
Bruno Windels
e601037cd2 don't show reply fallback in edit history 2019-07-08 15:32:38 +02:00
Bruno Windels
888e4d1ec2 preserve reply fallback when editing 2019-07-08 15:25:44 +02:00
Weblate
3cf34d819b Merge branch 'origin/develop' into Weblate. 2019-07-08 09:55:53 +00:00
RiotRobot
0347c42798 Merge branch 'master' into develop 2019-07-08 10:53:53 +01:00
RiotRobot
61e2d87152 v1.3.0 2019-07-08 10:53:03 +01:00
RiotRobot
6cafcf6408 Prepare changelog for v1.3.0 2019-07-08 10:53:03 +01:00
RiotRobot
33eba0e500 Upgrade to JS SDK 2.1.0 2019-07-08 10:49:43 +01:00
Weblate
061bd789cf Merge branch 'origin/develop' into Weblate. 2019-07-08 09:23:55 +00:00
Michael Telatynski
dd27891ee9
Merge pull request #3191 from matrix-org/t3chguy/lightbox_remove_no_pl 
Don't show Remove button in ImageView if can't redact, delint ImageView
 2019-07-08 10:23:51 +01:00
Weblate
c9f34a5d5a Merge branch 'origin/develop' into Weblate. 2019-07-08 08:19:31 +00:00
Bruno Windels
7a482461dd
Merge pull request #3180 from matrix-org/bwindels/history-actions 
Edit history actions
 2019-07-08 08:19:27 +00:00
Bruno Windels
1af2ca6b36 constistent jsx bracket and indent styling 2019-07-08 10:12:26 +02:00
Bruno Windels
cf11a3758f set analyticsInfo for dialogs 2019-07-08 10:12:04 +02:00
Jeff Huang
0b9ab4e566 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1681 of 1681 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2019-07-07 14:50:30 +00:00
Michael Telatynski
c2905bd33b make things a tad saner 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-06 11:16:01 +01:00
Michael Telatynski
89ece266c6 Make id used in EditableItemList unique, namespace mx_EditableItemList_* 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-06 11:15:10 +01:00
Michael Telatynski
6b9c6a31f0 Don't show Remove button in ImageView if can't redact, delint ImageView 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-07-06 10:42:14 +01:00
Weblate
eb46774437 Merge branch 'origin/develop' into Weblate. 2019-07-06 07:53:26 +00:00
Michael Telatynski
040e580cf0
Merge pull request #3183 from matrix-org/t3chguy/editing_while_replying 
Don't allow editing via up-arrow when Replying
 2019-07-06 08:53:22 +01:00
Weblate
f9fe35dba3 Merge branch 'origin/develop' into Weblate. 2019-07-06 07:53:03 +00:00
Michael Telatynski
000f7e8007
Merge pull request #3103 from matrix-org/t3chguy/edit_skip_if_no_edit 
If oldContent matches newContent, skip sending the edit
 2019-07-06 08:52:58 +01:00
Travis Ralston
ae79ce97f3 Dress up the soft logout page to look like the design 
Fixes https://github.com/vector-im/riot-web/issues/10262

Also fixes showing the user ID twice. We might have a User object which helpfully sets the display name to the user ID, so check for that.
 2019-07-05 15:05:31 -06:00
Travis Ralston
ca6563dce4 Merge branch 'travis/soft-logout-rehydrate' into t1 2019-07-05 15:03:24 -06:00
Travis Ralston
fca4ebcd72 Overwrite the old session if the new creds are for a different user 
Fixes https://github.com/vector-im/riot-web/issues/10272
 2019-07-05 14:45:34 -06:00
Travis Ralston
8b417f8a60 Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-overwrite 2019-07-05 14:37:04 -06:00
Travis Ralston
1f1a5b2aac Fix React crash when using a non-default homeserver on soft logout 
The function used exists on the peg, not the client. This commit also fixes the name of the function in a backwards compatible way.
 2019-07-05 14:35:21 -06:00
Travis Ralston
55b4ef2169 Change soft logout rehydrate text if there's pending key backups 
Fixes https://github.com/vector-im/riot-web/issues/10263
Requires https://github.com/matrix-org/matrix-js-sdk/pull/982
 2019-07-05 13:52:14 -06:00
Travis Ralston
d39b4e9c7c Merge branch 'travis/soft-logout-rehydrate' into travis/soft-logout-keys 2019-07-05 13:41:04 -06:00
Weblate
89b8ccf471 Merge branch 'origin/develop' into Weblate. 2019-07-05 16:56:04 +00:00