Luke Barnard
9625180fbe
Merge pull request #1732 from matrix-org/dbkr/fix_addpresspicker_keys
...
Fix key bindings in address picker dialog
2018-02-06 15:26:48 +00:00
David Baker
6162c0b360
Fix key bindings in address picker dialog
...
Another regression from https://github.com/matrix-org/matrix-react-sdk/pull/1674
Fixes https://github.com/vector-im/riot-web/issues/5994
2018-02-06 15:01:14 +00:00
David Baker
aab57d091d
Make ratelimitedfunc time from the function's end
...
Otherwise any function tghat takes longer than the delay to execute
will become eligible for execution again immediately after
finishing and therefore be able to spin.
This should help with https://github.com/vector-im/riot-web/issues/6060
(at least in the respect that it makes ratelimitedfunc do its job)
even if it's not the reason Riot started getting wedged.
2018-02-06 14:39:13 +00:00
lukebarnard
1ea6301eca
Add index fix again
...
This was changed on /develop to fix an issue where the incorrect
index was being used in a condition to handle literal edge cases
of dragging room tiles to start or end of an ordered sublist.
2018-02-06 14:25:50 +00:00
lukebarnard
dd0e981d72
Handle indication from server that a room has no more tags
2018-02-06 12:00:23 +00:00
lukebarnard
8d0d0b43ff
Handle first tag added/last tag removed
...
This is a special case because untagged rooms should
appear in im.vector.fake.recent and tagged rooms
should not.
2018-02-06 12:00:06 +00:00
lukebarnard
b744dbaab7
Handle setting a newTag without metaData
...
metaData is actually the request body for the PUT that adds the tag
so we need to send {} for e.g. m.lowpriority, which is not manually
ordered.
2018-02-06 11:56:55 +00:00
Luke Barnard
127eb61d36
Merge pull request #1730 from matrix-org/dbkr/display_name_change_message
...
Fix display name change text
2018-02-06 10:37:59 +00:00
David Baker
3398c29aa5
Revert unintentional package.josn change
2018-02-06 10:31:37 +00:00
David Baker
f1eb899cad
Re-run i18n script & prune
2018-02-06 10:26:37 +00:00
David Baker
8458023bbc
Fix display name change message
...
(i18n file fixes coming separately for ease of review)
Fixes https://github.com/vector-im/riot-web/issues/5171
2018-02-06 10:24:38 +00:00
lukebarnard
feca1707f1
Remove a factor n complexity during room visibility calc
2018-02-06 09:55:58 +00:00
Luke Barnard
71aa4ee9e1
Merge pull request #1721 from matrix-org/t3chguy/composer_slashcmd_history
...
Persist contentState when sending SlashCommand via MessageComposerInput
2018-02-06 09:14:36 +00:00
lukebarnard
c665c1170b
Regenerate room lists when we get RoomMember.membership
2018-02-05 18:27:50 +00:00
David Baker
d0972cdb1d
Merge remote-tracking branch 'origin/develop' into dbkr/newer-eslint-for-working-no-bind
2018-02-05 18:09:48 +00:00
lukebarnard
9982efbd8f
Regenerate room lists when we get m.direct
2018-02-05 18:06:29 +00:00
lukebarnard
415da3e6ab
Merge branch 'develop' into luke/room-list-flux
2018-02-05 17:57:46 +00:00
lukebarnard
330ce0f02e
On failure, regenerate state from sdk
...
Instead of using history, which could be unpredictable
2018-02-05 17:34:05 +00:00
Luke Barnard
70afce73a7
Merge pull request #1726 from matrix-org/t3chguy/fix_usercontent_pointer
...
This is actually MFileBody not MImageBody, change classname
2018-02-05 14:27:17 +00:00
David Baker
0d04c8dab5
Merge pull request #1717 from matrix-org/t3chguy/fix_3pid_dm_rooms
...
Use invite_3pid prop of createRoom instead of manual invite after create
2018-02-05 12:07:43 +00:00
Richard Lewis
e508f06765
Add asset add / remove messaging clauses.
2018-02-05 11:50:25 +00:00
Richard Lewis
992c4771f4
Add button to remove all stickerpacks
2018-02-05 11:49:44 +00:00
Richard Lewis
34de3729fe
Add method to remove all stickerpacks.
2018-02-05 11:49:26 +00:00
Richard Lewis
29962ed89d
Add stickerpack strings.
2018-02-05 11:48:48 +00:00
lukebarnard
81eca49266
Merge branch 'luke/room-list-flux' of github.com:matrix-org/matrix-react-sdk into luke/room-list-flux
2018-02-05 11:40:42 +00:00
Luke Barnard
ff8fcb3139
Merge branch 'develop' into luke/room-list-flux
2018-02-05 11:39:39 +00:00
David Baker
ec3a37d9f3
Merge pull request #1729 from matrix-org/t3chguy/aliases_null_guard
...
guard against m.room.aliases events with no keys (redaction?)
2018-02-05 10:21:05 +00:00
David Baker
3275a56013
Merge pull request #1718 from matrix-org/t3chguy/fix_memberlist_3pid_invites
...
Fix not showing Invited section if all invites are 3PID
2018-02-05 10:14:23 +00:00
David Baker
916ab68506
Merge pull request #1720 from matrix-org/t3chguy/nvl/fix_rich_reply_on_image
...
Fix Rich Replies on files
2018-02-05 09:58:37 +00:00
Michael Telatynski
d1a24ac87b
guard against m.room.aliases events with no keys (redaction?)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-02-02 08:12:56 +00:00
David Baker
e51dbd49f9
Merge pull request #1728 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2018-02-01 10:38:08 +00:00
David Baker
497cf21c86
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-02-01 10:35:12 +00:00
Weblate
ee81d6aea1
Merge remote-tracking branch 'origin/develop' into develop
2018-01-31 18:10:59 +00:00
Nathan van Beelen
3a33eea5e9
Translated using Weblate (Dutch)
...
Currently translated at 75.5% (743 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-01-31 18:10:57 +00:00
David Baker
4c17b5f1c7
Merge pull request #1724 from matrix-org/t3chguy/nvl/rich_quoting_nullguard
...
Null guard against falsey (non-null) props.node, to make react happy
2018-01-31 18:10:52 +00:00
Weblate
f193b3ae2c
Merge remote-tracking branch 'origin/develop' into develop
2018-01-30 15:21:19 +00:00
David Baker
cfd1f28258
Merge pull request #1722 from matrix-org/luke/load-tags-after-first-sync
...
Use correct condition for getting account data after first sync
2018-01-30 15:21:12 +00:00
Michael Telatynski
8a6727ea98
This is actually MFileBody not MImageBody, change classname
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-30 10:55:23 +00:00
Weblate
1fa9e7420f
Merge remote-tracking branch 'origin/develop' into develop
2018-01-30 10:27:20 +00:00
Марко М. Костић
977dec40a3
Translated using Weblate (Serbian)
...
Currently translated at 60.8% (599 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-01-30 10:27:19 +00:00
Szimszon
fd4fc883c1
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-30 10:27:19 +00:00
Walter
5e34c8043f
Translated using Weblate (German)
...
Currently translated at 98.9% (974 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-01-30 10:27:19 +00:00
Xose M
8d902010f8
Translated using Weblate (Galician)
...
Currently translated at 99.1% (976 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
2018-01-30 10:27:18 +00:00
Nathan van Beelen
4afdefb926
Translated using Weblate (Dutch)
...
Currently translated at 73.9% (728 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
2018-01-30 10:27:18 +00:00
Simó Albert i Beltran
5c7bdcec4f
Translated using Weblate (Catalan)
...
Currently translated at 88.5% (871 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-01-30 10:27:18 +00:00
Osoitz
819dd93d1f
Translated using Weblate (Basque)
...
Currently translated at 100.0% (984 of 984 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-30 10:27:18 +00:00
David Baker
c7afaed3a7
Merge pull request #1725 from matrix-org/luke/fix-room-list-reordering
...
Fix order calculation logic when reordering a room
2018-01-30 10:27:13 +00:00
lukebarnard
c5a3a02e1d
Fix order calculation logic when reordering a room
2018-01-30 10:14:05 +00:00
Michael Telatynski
6dd63ae644
Null guard against falsey (non-null) props.node, to make react happy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-29 19:17:46 +00:00
Michael Telatynski
5764280588
Persist contentState when sending SlashCommand via MessageComposerInput
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-29 09:09:22 +00:00