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
e11f78307a
Merge branch 'origin/develop' into Weblate.
2019-07-15 20:47:00 +00:00
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
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
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
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
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
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
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
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
2bc0e8e151
Don't rely on React being fast
2019-07-15 10:51:08 -06:00
008903470a
v1.4.0-rc.3
2019-07-15 17:28:48 +01:00
415f88dd9a
Prepare changelog for v1.4.0-rc.3
2019-07-15 17:28:47 +01:00
5c1c1f64b6
fix lint
2019-07-15 18:25:22 +02:00
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
57abbc4273
remove unnessary manual focussing of composer
...
now that composer is focused automatically when no other shortcuts
apply, remove the manual focusing we have in place where it's not needed
2019-07-15 18:21:10 +02:00
a8ccd6dfd7
Merge pull request #3222 from matrix-org/dbkr/read-receipt-ignore-no-tile-fix-2
...
Take adjacent invisible events into account for read receipt, even if any but first should be ignored.
2019-07-15 17:20:32 +01:00
02ec96cff1
also check content and content.users before proceeding
2019-07-15 17:17:20 +01:00
f901c8c4fe
remove unneeded else
2019-07-15 17:14:03 +01:00
d39a86b126
improve comments
2019-07-15 17:13:58 +01:00
e66ebec083
take adjacent no-tile events in combination with ignored events into account when determining the last displayed event
2019-07-15 17:13:52 +01:00
4adea67eb3
focus the composer in the body keydown handler if not other shortcuts apply
...
this allows the user to start typing a message even if the composer is not focused.
2019-07-15 18:12:45 +02:00
b4c30d1307
Merge branch 'origin/develop' into Weblate.
2019-07-15 15:30:38 +00:00
J. Ryan Stinnett