Commit graph

17033 commits

Author SHA1 Message Date
J. Ryan Stinnett
76a60c84ac
Merge pull request #3233 from matrix-org/jryans/rm-reactions-edits-flags
Remove feature flags for reactions and edits
2019-07-18 09:58:55 +01:00
J. Ryan Stinnett
599c49613f Remove reactions feature flag
Fixes https://github.com/vector-im/riot-web/issues/10282
2019-07-17 17:00:36 +01:00
J. Ryan Stinnett
674f33917f Remove editing feature flag
Part of https://github.com/vector-im/riot-web/issues/10282
2019-07-17 16:56:15 +01:00
Bruno Windels
03f577bea9 use keydown here, as its a div element 2019-07-17 17:23:19 +02:00
Bruno Windels
50c88279a0 remove non-existing keypress handler 2019-07-17 17:05:56 +02:00
Bruno Windels
4bde0c08ad make sure we don't break any A or BUTTON keyboard handling 2019-07-17 16:53:12 +02:00
Bruno Windels
10a74696b3 hack around React having its own bubbling phase 2019-07-17 16:50:05 +02:00
Weblate
3cb2659737 Merge branch 'origin/develop' into Weblate. 2019-07-17 14:20:11 +00:00
J. Ryan Stinnett
b8aae63c83
Merge pull request #3229 from matrix-org/jryans/enable-reactions-edits-default
Enable reactions and edits by default
2019-07-17 15:20:07 +01:00
J. Ryan Stinnett
88a0dbe2f1
Merge pull request #3232 from matrix-org/jryans/v1.4.0/enable-reactions-edits-default
Enable reactions and edits by default
2019-07-17 15:19:08 +01:00
J. Ryan Stinnett
19b3b41ad6 Continue to next config level after device for features
This ensures we continue checking further config levels for the feature setting
if nothing is found when reading the device level. For example, this means the
feature setting's default value can be used.
2019-07-17 15:16:10 +01:00
J. Ryan Stinnett
db560989da Enable reactions and edits by default
This enables reactions and edits by default, assuming you don't have any local
device settings that would disable them.

Fixes https://github.com/vector-im/riot-web/issues/10281
2019-07-17 15:16:10 +01:00
J. Ryan Stinnett
470f9b7704
Merge pull request #3231 from matrix-org/jryans/v1.4.0/tooltip-safe-area-alt
Improve interactive tooltip safe mousing area
2019-07-17 15:04:30 +01:00
J. Ryan Stinnett
e3d849e993 Improve interactive tooltip safe mousing area
This adds a more complex trapezoidal safe area between the button that triggers
the tooltip and the tooltip itself. It should be easier to move from the button
into the tooltip without accidentally closing it.

Fixes https://github.com/vector-im/riot-web/issues/10185
2019-07-17 15:03:35 +01:00
J. Ryan Stinnett
3f760be540
Merge pull request #3230 from matrix-org/jryans/v1.4.0/action-bar-safe-area
Add a previous event safe area around action bar
2019-07-17 14:58:24 +01:00
J. Ryan Stinnett
2be9696a27 Add a previous event safe area around action bar
This adds a previous event safe area so that you can't accidentally hover the
previous event while trying to mouse into the action bar or from the react
button to its tooltip.

Part of https://github.com/vector-im/riot-web/issues/10185
Fixes https://github.com/vector-im/riot-web/issues/9650
2019-07-17 14:57:42 +01:00
J. Ryan Stinnett
202f6fb94d Continue to next config level after device for features
This ensures we continue checking further config levels for the feature setting
if nothing is found when reading the device level. For example, this means the
feature setting's default value can be used.
2019-07-17 14:50:35 +01:00
J. Ryan Stinnett
3801f0b78e Enable reactions and edits by default
This enables reactions and edits by default, assuming you don't have any local
device settings that would disable them.

Fixes https://github.com/vector-im/riot-web/issues/10281
2019-07-17 14:50:35 +01:00
Weblate
3a90884642 Merge branch 'origin/develop' into Weblate. 2019-07-17 13:29:02 +00:00
J. Ryan Stinnett
35ba489a2b
Merge pull request #3228 from matrix-org/jryans/tooltip-safe-area-alt
Improve interactive tooltip safe mousing area
2019-07-17 14:28:57 +01:00
J. Ryan Stinnett
fc8cdc5661 Improve interactive tooltip safe mousing area
This adds a more complex trapezoidal safe area between the button that triggers
the tooltip and the tooltip itself. It should be easier to move from the button
into the tooltip without accidentally closing it.

Fixes https://github.com/vector-im/riot-web/issues/10185
2019-07-17 14:11:27 +01:00
Weblate
c6fd2af318 Merge branch 'origin/develop' into Weblate. 2019-07-17 10:30:41 +00:00
J. Ryan Stinnett
1cdfff850c
Merge pull request #3227 from matrix-org/jryans/action-bar-safe-area
Add a previous event safe area around action bar
2019-07-17 11:30:37 +01:00
J. Ryan Stinnett
58a75949c3 Add a previous event safe area around action bar
This adds a previous event safe area so that you can't accidentally hover the
previous event while trying to mouse into the action bar or from the react
button to its tooltip.

Part of https://github.com/vector-im/riot-web/issues/10185
Fixes https://github.com/vector-im/riot-web/issues/9650
2019-07-17 10:10:08 +01:00
Weblate
e5a073b8e8 Merge branch 'origin/develop' into Weblate. 2019-07-17 09:05:34 +00:00
Tirifto
fb33396d52 Translated using Weblate (Esperanto)
Currently translated at 99.7% (1682 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-07-17 09:05:34 +00:00
J. Ryan Stinnett
5f2fe181df
Merge pull request #3217 from matrix-org/jryans/im-origin-check
Parse integration manager origins more sensibly
2019-07-17 10:05:28 +01:00
J. Ryan Stinnett
60adbdc2eb Remove logging of origin mismatch 2019-07-17 09:42:04 +01:00
Bruno Windels
3d4cd8aa1c local echos should always be ignored (for both RM and RR),so remove flag
pending events won't be in liveEvents (where we look) anyway
2019-07-17 10:19:44 +02:00
Bruno Windels
c94715150d as both RM and RR move past invisible events, remove the flag 2019-07-17 10:18:51 +02:00
Bruno Windels
741ae9957b also put read marker past (like RR) invisible events 2019-07-17 10:15:09 +02:00
Weblate
cde5a5b41a Merge branch 'origin/develop' into Weblate. 2019-07-16 17:58:20 +00:00
random
bac0513436 Translated using Weblate (Italian)
Currently translated at 100.0% (1687 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2019-07-16 17:58:20 +00:00
Tirifto
056d6dfb34 Translated using Weblate (Esperanto)
Currently translated at 96.7% (1631 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2019-07-16 17:58:19 +00:00
Travis Ralston
e53b922290
Merge pull request #3225 from matrix-org/t3chguy/create_reuse_dialog_hide_left
ChatCreateOrReuse show only rooms both you and the other party still in
2019-07-16 11:58:10 -06:00
Michael Telatynski
df26840d9e ChatCreateOrReuse show only rooms both you and the other party still in
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-07-15 23:07:59 +01:00
Weblate
e11f78307a Merge branch 'origin/develop' into Weblate. 2019-07-15 20:47:00 +00:00
Edgars Voroboks
329bcb4478 Translated using Weblate (Latvian)
Currently translated at 55.8% (942 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lv/
2019-07-15 20:47:00 +00:00
natowi
2a28bc8199 Translated using Weblate (German)
Currently translated at 90.5% (1526 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2019-07-15 20:47:00 +00:00
cocker-cc
eb76f5abf6 Translated using Weblate (German)
Currently translated at 90.5% (1526 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2019-07-15 20:46:59 +00:00
Tentarial
9ee7ec8acc Translated using Weblate (German)
Currently translated at 90.5% (1526 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2019-07-15 20:46:59 +00:00
Travis Ralston
2471f92331
Merge pull request #3218 from matrix-org/travis/check-when-dead
Check for liveliness on submission when the server was previously dead
2019-07-15 14:46:55 -06:00
BenjaminVettori
58f073803f Translated using Weblate (German)
Currently translated at 89.6% (1511 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2019-07-15 17:26:52 +00:00
sonea-pm8
42d0467e35 Translated using Weblate (German)
Currently translated at 89.6% (1511 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2019-07-15 17:26:52 +00:00
Tentarial
eca298e9ca Translated using Weblate (German)
Currently translated at 89.6% (1511 of 1687 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2019-07-15 17:26:52 +00:00
Travis Ralston
2bc0e8e151 Don't rely on React being fast 2019-07-15 10:51:08 -06:00
RiotRobot
008903470a v1.4.0-rc.3 2019-07-15 17:28:48 +01:00
RiotRobot
415f88dd9a Prepare changelog for v1.4.0-rc.3 2019-07-15 17:28:47 +01:00
Bruno Windels
5c1c1f64b6 fix lint 2019-07-15 18:25:22 +02:00
David Baker
3809134d73
Merge pull request #3223 from matrix-org/dbkr/fix-powerlevels-crash-2
Check content and content.users in power levels
2019-07-15 17:23:43 +01:00