03151418af
Merge branch 'master' into develop
2019-07-18 15:51:33 +01:00
3c0c64af8e
v1.4.0
2019-07-18 15:50:46 +01:00
8b0e36e884
Prepare changelog for v1.4.0
2019-07-18 15:50:45 +01:00
480061bde3
Upgrade JS SDK to v2.2.0
2019-07-18 15:46:38 +01:00
4a7264cc15
Merge pull request #3236 from matrix-org/jryans/v1.4.0/dontredactfirst
...
Don't show remove button for original event in edit history
2019-07-18 14:40:58 +01:00
1b06b9957a
dont show remove button for original event in edit history
2019-07-18 14:40:05 +01:00
8952b4ac4e
Merge branch 'origin/develop' into Weblate.
2019-07-18 13:35:11 +00:00
6c6300e1cc
Merge pull request #3235 from matrix-org/bwindels/dontredactfirst
...
dont show remove button for original event in edit history
2019-07-18 14:35:07 +01:00
aca41fe80a
dont show remove button for original event in edit history
2019-07-18 14:09:29 +02:00
adc2648b46
Merge pull request #3234 from matrix-org/jryans/v1.4.0/rm-reactions-edits-flags
...
Remove feature flags for reactions and edits
2019-07-18 10:28:57 +01:00
537eb2c88f
Remove reactions feature flag
...
Fixes https://github.com/vector-im/riot-web/issues/10282
2019-07-18 10:23:12 +01:00
25351d552e
Remove editing feature flag
...
Part of https://github.com/vector-im/riot-web/issues/10282
2019-07-18 10:23:12 +01:00
f96d02daf9
Merge branch 'origin/develop' into Weblate.
2019-07-18 08:59:00 +00:00
2371e8d204
Translated using Weblate (Tamil)
...
Currently translated at 8.8% (149 of 1687 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ta/
2019-07-18 08:59:00 +00:00
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
599c49613f
Remove reactions feature flag
...
Fixes https://github.com/vector-im/riot-web/issues/10282
2019-07-17 17:00:36 +01:00
674f33917f
Remove editing feature flag
...
Part of https://github.com/vector-im/riot-web/issues/10282
2019-07-17 16:56:15 +01:00
03f577bea9
use keydown here, as its a div element
2019-07-17 17:23:19 +02:00
50c88279a0
remove non-existing keypress handler
2019-07-17 17:05:56 +02:00
4bde0c08ad
make sure we don't break any A or BUTTON keyboard handling
2019-07-17 16:53:12 +02:00
10a74696b3
hack around React having its own bubbling phase
2019-07-17 16:50:05 +02:00
3cb2659737
Merge branch 'origin/develop' into Weblate.
2019-07-17 14:20:11 +00:00
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
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
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
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
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
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
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
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
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
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
3a90884642
Merge branch 'origin/develop' into Weblate.
2019-07-17 13:29:02 +00:00
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
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
c6fd2af318
Merge branch 'origin/develop' into Weblate.
2019-07-17 10:30:41 +00:00
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
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
e5a073b8e8
Merge branch 'origin/develop' into Weblate.
2019-07-17 09:05:34 +00:00
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
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
60adbdc2eb
Remove logging of origin mismatch
2019-07-17 09:42:04 +01:00
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
c94715150d
as both RM and RR move past invisible events, remove the flag
2019-07-17 10:18:51 +02:00
741ae9957b
also put read marker past (like RR) invisible events
2019-07-17 10:15:09 +02:00
cde5a5b41a
Merge branch 'origin/develop' into Weblate.
2019-07-16 17:58:20 +00:00
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
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
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
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
RiotRobot