Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-26 18:38:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,592 Commits 205 Branches 553 Tags 445 MiB
c8e0b7b96c
Commit Graph

16592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Weblate
89b8ccf471 Merge branch 'origin/develop' into Weblate. 2019-07-05 16:56:04 +00:00
J. Ryan Stinnett
017fc84862
Merge pull request #3184 from matrix-org/jryans/reactions-send-marks-unread 
Track live events in timeline and use for read receipts and read markers
 2019-07-05 17:55:59 +01:00
Weblate
20c4c448ca Merge branch 'origin/develop' into Weblate. 2019-07-05 16:50:17 +00:00
Tuomas Hietala
11e6a81941 Translated using Weblate (Finnish) 
Currently translated at 99.6% (1675 of 1681 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-07-05 16:50:17 +00:00
J. Ryan Stinnett
480fe44d44
Merge pull request #3179 from matrix-org/jryans/upgrade-deps 
Upgrade dependencies
 2019-07-05 17:50:13 +01:00
Weblate
acadd624ef Merge branch 'origin/develop' into Weblate. 2019-07-05 15:35:11 +00:00
random
6cd2421929 Translated using Weblate (Italian) 
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/it/
 2019-07-05 15:35:11 +00:00
Tuomas Hietala
2bf3739af7 Translated using Weblate (Finnish) 
Currently translated at 99.6% (1675 of 1681 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-07-05 15:35:11 +00:00
J. Ryan Stinnett
74431fe8b1
Merge pull request #3186 from matrix-org/jryans/reactions-allow-text 
Allow diplayed reaction values to contain anything
 2019-07-05 16:35:06 +01:00
Weblate
60a9e39d69 Merge branch 'origin/develop' into Weblate. 2019-07-05 15:28:16 +00:00
random
02fc3c9b85 Translated using Weblate (Italian) 
Currently translated at 99.8% (1678 of 1681 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-07-05 15:28:16 +00:00
J. Ryan Stinnett
87188e9229
Merge pull request #3185 from matrix-org/jryans/tooltip-target-null 
Fix interactive tooltip null target error
 2019-07-05 16:28:12 +01:00
Weblate
e94b3c2459 Merge branch 'origin/develop' into Weblate. 2019-07-05 15:25:02 +00:00
random
2ce736f5a7 Translated using Weblate (Italian) 
Currently translated at 99.6% (1674 of 1681 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2019-07-05 15:25:02 +00:00
Tuomas Hietala
b742525fbb Translated using Weblate (Finnish) 
Currently translated at 99.6% (1675 of 1681 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-07-05 15:25:02 +00:00
Travis Ralston
9266c797da
Merge pull request #3181 from matrix-org/travis/soft-logout-force 
Require that users go to the soft logout page if they're soft logged out
 2019-07-05 09:24:56 -06:00
J. Ryan Stinnett
eb0e1eade4 Clamp reaction content width to at most 100px 
Part of https://github.com/vector-im/riot-web/issues/10256
 2019-07-05 16:18:16 +01:00
J. Ryan Stinnett
2a8f9a81f7 Allow diplayed reaction values to contain anything 
Part of https://github.com/vector-im/riot-web/issues/10256
 2019-07-05 16:18:06 +01:00
Bruno Windels
70334b69ec implement view source for edits 2019-07-05 16:11:15 +02:00
J. Ryan Stinnett
3c3426d97e Update copyright header 2019-07-05 15:08:55 +01:00
Bruno Windels
f4a8314c4f make dom tree similar to eventtile so red lozenge style applies 2019-07-05 16:05:40 +02:00
Bruno Windels
0aa1252d01 monitor associated send status for edit history events 
to update local echo if needed
 2019-07-05 16:04:34 +02:00
Bruno Windels
2182248d7c mark events from /relations as locally redacted if any pending redaction 2019-07-05 16:03:34 +02:00
J. Ryan Stinnett
5496a4dce6 Fix interactive tooltip null target error 
Fixes https://github.com/vector-im/riot-web/issues/10232
 2019-07-05 15:02:09 +01:00
J. Ryan Stinnett
0ae98a5a4d Track live events in timeline and use for read receipts and read markers 
This changes the `TimelinePanel` to track live events (that have committed to
the server and been remote echoed) as well as the full list of events (which
includes pending events).

The code paths that advance read receipt and read markers are then changed to
only use the live events so that these cannot advance into pending events.

Fixes https://github.com/vector-im/riot-web/issues/9952
 2019-07-05 14:37:19 +01:00
Weblate
efc70a8488 Merge branch 'origin/develop' into Weblate. 2019-07-05 10:50:44 +00:00