Commit Graph

7326 Commits (d6e1ac3ca6b362da6e186ec3d887800e23db2f45)

Author SHA1 Message Date
David Baker 8eb4137ec3 missing semicolon 2018-02-07 11:51:41 +00:00
David Baker 2a68e3ea39 import sdk 2018-02-07 11:42:50 +00:00
Weblate 211cfedc21 Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 10:16:40 +00:00
David Baker 383ef8b2ef
Merge pull request #1731 from matrix-org/dbkr/rate_limited_func_time_from_finish
Make ratelimitedfunc time from the function's end
2018-02-07 10:16:36 +00:00
David Baker 0a5bf07913 Use getComponent 2018-02-07 10:13:19 +00:00
Weblate fd1daa70d3 Merge remote-tracking branch 'origin/develop' into develop 2018-02-07 09:54:36 +00:00
Марко М. Костић b65e80fa53 Translated using Weblate (Serbian)
Currently translated at 80.4% (793 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-02-07 09:54:36 +00:00
Szimszon 443c19c6e1 Translated using Weblate (Hungarian)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-02-07 09:54:35 +00:00
Krombel 74a28a7496 Translated using Weblate (German)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-02-07 09:54:35 +00:00
lukebarnard c1649d1b75 Give dialogs a matrixClient context
Dialogs are mounted outside of the main react tree of MatrixChat,
so they won't have its child context.
2018-02-07 09:45:36 +00:00
Krombel ae094bebe5 Translated using Weblate (German)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2018-02-07 09:40:38 +00:00
Peter Vágner 054849bc18 Translated using Weblate (Slovak)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-02-07 08:53:50 +00:00
Szimszon 1b196655fa Translated using Weblate (Hungarian)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-02-06 21:11:38 +00:00
Kévin C ab88c1cf58 Translated using Weblate (French)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-02-06 19:11:45 +00:00
David Baker 424c367ecc Fix the reject/accept call buttons in canary (mk2)
Fixes https://github.com/vector-im/riot-web/issues/6081 by making
the accept/reject buttons AccessibleButtons which they should be
anyway (presumably the role=button makes chrome do the right thing
with the events). Also swallow the onClick event otherwise that
propagates out to the room header and causes it to expand/collapse.
2018-02-06 18:45:43 +00:00
Weblate 0601d65af7 Merge remote-tracking branch 'origin/develop' into develop 2018-02-06 17:50:58 +00:00
Luke Barnard cf4ae681f4
Offline mode (#1723)
* Allow the client to run without connection to HS (i.e. using indexeddb)

Allows running without having pushRules (it's safe not to have these 
when running from indexeddb sync.)

This means rooms will be displayed with "unknown" notifcation state.

This assumes anything that uses the push rules will get pushRule state
again when the client starts syncing again.

For recovering from being disconnected, 
* If an avatar has fallen back, try again on reconnection
* If a thumbnail image failed to load, retry on reconnect
* Load joined groups when reconnecting

Update tests to give MELS a context.matrixClient
2018-02-06 17:50:53 +00:00
Weblate 23df00a53d Merge remote-tracking branch 'origin/develop' into develop 2018-02-06 15:26:54 +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
Andrey 6a858863fc Translated using Weblate (Russian)
Currently translated at 100.0% (986 of 986 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-02-06 12:41:26 +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
Weblate 3a5e69d7b5 Merge remote-tracking branch 'origin/develop' into develop 2018-02-06 10:38:05 +00:00
Robert A. Viana 623cc10ab0 Translated using Weblate (Portuguese (Brazil))
Currently translated at 67.0% (660 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2018-02-06 10:38:04 +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 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
Weblate 584e47a031 Merge remote-tracking branch 'origin/develop' into develop 2018-02-06 09:14:42 +00:00
Robert A. Viana 0f2ca3bd95 Translated using Weblate (Portuguese (Brazil))
Currently translated at 66.9% (659 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
2018-02-06 09:14:42 +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
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
Weblate c1dad4579a Merge remote-tracking branch 'origin/develop' into develop 2018-02-05 14:27:22 +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
Weblate 0ec023b523 Merge remote-tracking branch 'origin/develop' into develop 2018-02-05 12:07:47 +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
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
Weblate 5ddb0b9b4b Merge remote-tracking branch 'origin/develop' into develop 2018-02-05 10:21:10 +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
Weblate 2d6dd988d6 Merge remote-tracking branch 'origin/develop' into develop 2018-02-05 10:14:28 +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
Weblate e1296a076e Merge remote-tracking branch 'origin/develop' into develop 2018-02-05 09:58:44 +00:00
Марко М. Костић 4133801390 Translated using Weblate (Serbian)
Currently translated at 78.4% (772 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-02-05 09:58:44 +00:00
Simó Albert i Beltran 03b137d425 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-02-05 09:58:43 +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
Nathan van Beelen d884596a1f Translated using Weblate (Dutch)
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/nl/
2018-02-04 14:23:33 +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
Krombel 41c9cb1c27 Translated using Weblate (German)
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/de/
2018-02-01 15:12:22 +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
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
Michael Telatynski 56927b23e6
pass onWidgetLoad (which is required for SOME EventTileTypes)
XXX: they should follow an interface, this is somewhat nasty

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-28 22:14:22 +00:00
lukebarnard 40907ecf29 Use correct condition for getting account data after first sync
so that we can get tags sooner.
2018-01-26 19:39:06 +01:00
d1d4c 6fa217742f 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-26 13:06:57 +00:00
lukebarnard 4820a195ab Remove logging 2018-01-26 09:15:03 +01:00
Simó Albert i Beltran 18bf9ef598 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-26 02:45:23 +00:00
lukebarnard 73e3a594ac Prevent TagTiles from being dragged into other droppables
for the time being at least.
2018-01-25 22:52:19 +01:00
lukebarnard 701abb6a21 Move management of room lists to RoomListStore
this is part maintenance to make RoomList clearer and part
allowing room list state to be modified via a dispatch.
2018-01-25 22:16:03 +01:00
lukebarnard d0e3319bd9 Remove DragDropContext from TagPanel and RoomList
So that we can have one context that can handle DND between
the TagPanel and RoomList.
2018-01-25 22:05:20 +01:00
lukebarnard 815f52587b Move TagPanel out of LoggedInView
(...and into LeftPanel in riot-web. Can we merge the projects yet?)
2018-01-25 21:53:34 +01:00
lukebarnard 38de8a129b Add transaction capability to asyncActions
for relating pending/success/failure actions. Particularly useful for mapping
a failure to a pending action to roll back any optimistic updates.
2018-01-25 21:45:21 +01:00
d1d4c 9223a5db9e Translated using Weblate (Catalan)
Currently translated at 83.6% (823 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-01-25 17:48:58 +00:00
Szimszon e78659642e 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-25 15:23:22 +00:00
Michael Telatynski 56bd4b7d06 Fix not showing Invited section if all invites are 3PID
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-25 12:18:02 +00:00
Osoitz c86c12de40 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-25 10:28:23 +00:00
Michael Telatynski 3060ec1053 Use invite_3pid prop of createRoom instead of manual invite after create
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-25 09:54:31 +00:00
Andrey dd4cef4c3e Translated using Weblate (Russian)
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/ru/
2018-01-25 04:48:39 +00:00
Jeff Huang 00f52edf4c Translated using Weblate (Chinese (Traditional))
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/zh_Hant/
2018-01-25 03:04:15 +00:00
Kévin C 899192b019 Translated using Weblate (French)
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/fr/
2018-01-24 20:27:07 +00:00
Weblate 6b62acd001 Merge remote-tracking branch 'origin/develop' into develop 2018-01-24 17:53:35 +00:00
Марко М. Костић b7c32ee1b5 Translated using Weblate (Serbian)
Currently translated at 38.9% (383 of 983 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-01-24 17:53:34 +00:00
d1d4c d3100f9bc9 Translated using Weblate (Catalan)
Currently translated at 54.3% (534 of 983 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-01-24 17:53:33 +00:00
David Baker ebfdd7c718
Merge pull request #1715 from matrix-org/t3chguy/rich_quoting_linear
Linear Rich Quoting
2018-01-24 18:53:29 +01:00
Simó Albert i Beltran 18d9de61fa Translated using Weblate (Catalan)
Currently translated at 24.3% (239 of 983 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-01-24 11:02:53 +00:00
d1d4c f45ad26423 Translated using Weblate (Catalan)
Currently translated at 24.3% (239 of 983 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2018-01-24 07:54:36 +00:00
Szimszon 71ecc5d7c5 Translated using Weblate (Hungarian)
Currently translated at 100.0% (983 of 983 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-23 07:09:24 +00:00
Jeff Huang e5f5091505 Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (983 of 983 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-01-23 05:16:28 +00:00
Kévin C ace7b84987 Translated using Weblate (French)
Currently translated at 100.0% (983 of 983 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-01-22 20:43:11 +00:00
Osoitz 88443af8fa Translated using Weblate (Basque)
Currently translated at 100.0% (983 of 983 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-22 19:23:52 +00:00
Andrey e19435d39d Translated using Weblate (Russian)
Currently translated at 100.0% (983 of 983 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-22 18:31:43 +00:00
Weblate acc878bee5 Merge remote-tracking branch 'origin/develop' into develop 2018-01-22 17:57:46 +00:00
Luke Barnard f013ffd068
Merge pull request #1714 from matrix-org/t3chguy/group_create_dialog_fixes
Fix CreateGroupDialog issues
2018-01-22 17:57:40 +00:00
Szimszon 294a5db20e Translated using Weblate (Hungarian)
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-22 17:24:43 +00:00
Michael Telatynski e3e3535072
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 17:02:20 +00:00
Michael Telatynski 4490715b60
Merge branch 'develop' into t3chguy/rich_quoting_linear 2018-01-22 16:46:20 +00:00
Michael Telatynski a6cefb83f8
basic error handling for malformed quotes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 16:41:32 +00:00
Michael Telatynski 3b1d69edbb
Change Quotes to be linearly rendered rather than recursively nested
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 16:34:47 +00:00
Michael Telatynski 33995b053e
Add class to EventTile Line's that are quotes
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 16:34:14 +00:00
Andrey 34b9db2033 Translated using Weblate (Russian)
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-22 16:03:49 +00:00
Michael Telatynski 37dcb33b15
Reset quotingEvent on Room Change because inideal UX
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-22 14:45:04 +00:00
Weblate 066d1a0ed2 Merge remote-tracking branch 'origin/develop' into develop 2018-01-22 11:16:48 +00:00
pebles 8496c947c8 Translated using Weblate (Spanish)
Currently translated at 58.3% (573 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/es/
2018-01-22 11:16:48 +00:00
Марко М. Костић 1d43ccde23 Translated using Weblate (Serbian)
Currently translated at 28.0% (275 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-01-22 11:16:48 +00:00
A.G 2326ee2586 Translated using Weblate (Italian)
Currently translated at 9.1% (90 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2018-01-22 11:16:47 +00:00
Szimszon 755ead7c1d Translated using Weblate (Hungarian)
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-22 11:16:47 +00:00
Matthew Hodgson 02824cfacf fix i18n for show devices prompt 2018-01-22 12:16:11 +01:00
Osoitz fb9930ad2c Translated using Weblate (Basque)
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
2018-01-21 09:31:40 +00:00
Jeff Huang fd2ef3e54d Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-01-21 00:11:52 +00:00
Andrey 2111271bda Translated using Weblate (Russian)
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2018-01-20 15:41:41 +00:00
Peter Vágner a0ba25806c Translated using Weblate (Slovak)
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sk/
2018-01-20 15:13:54 +00:00
Kévin C 1356e6dfd2 Translated using Weblate (French)
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2018-01-20 14:49:56 +00:00
Szimszon 38c58f3b23 Translated using Weblate (Hungarian)
Currently translated at 100.0% (982 of 982 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-01-20 13:40:43 +00:00
Michael Telatynski 61b3d050ab Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/group_create_dialog_fixes 2018-01-20 13:39:57 +00:00
Michael Telatynski 2705397bf6 Add local GID==='' check, because Synapse says Group rather than Community
Reset createError when doing check because it is now stale

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-20 13:16:33 +00:00
Weblate da5cf63daf Merge remote-tracking branch 'origin/develop' into develop 2018-01-20 11:44:21 +00:00
Марко М. Костић 67a4c6c487 Translated using Weblate (Serbian)
Currently translated at 18.2% (179 of 981 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-01-20 11:44:21 +00:00
Will Hunt 5206c9d18b Show a warning if the user attempts to leave a room that is invite only 2018-01-19 22:52:43 +00:00
Weblate aff1fcde90 Merge remote-tracking branch 'origin/develop' into develop 2018-01-19 14:49:55 +00:00
Luke Barnard a8320fe7e2
Merge pull request #1711 from matrix-org/luke/roomlist-beautiful-dnd
Swap RoomList to react-beautiful-dnd
2018-01-19 14:49:49 +00:00
lukebarnard 6106b3ce44 newOrder defaults `null`, allows check for `newOrder` on line 357 2018-01-19 14:12:27 +00:00
lukebarnard 54f6d305d7 Null-guard for newTag 2018-01-19 14:11:05 +00:00
Weblate e4b4a885ff Merge remote-tracking branch 'origin/develop' into develop 2018-01-19 14:07:23 +00:00
lukebarnard 75a1922731 Fix linting 2018-01-19 14:07:13 +00:00
lukebarnard 00dc077271 Remove react-dnd, revert fa14bc9 as no longer needed 2018-01-19 13:34:56 +00:00
Weblate 533e5482d8 Merge remote-tracking branch 'origin/develop' into develop 2018-01-19 10:39:51 +00:00
Марко М. Костић fba5d33923 Translated using Weblate (Serbian)
Currently translated at 12.0% (118 of 981 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
2018-01-19 10:39:50 +00:00
Matthew Hodgson 6c15bd8599 fix NPE when getGroupProfiles returns null 2018-01-19 10:39:38 +00:00
lukebarnard 6f0d799912 Fix indentation 2018-01-18 18:15:34 +00:00
lukebarnard 59f4661bfd Add comment 2018-01-18 18:01:31 +00:00
lukebarnard dfecad181a Swap RoomList to react-beautiful-dnd 2018-01-18 17:59:29 +00:00
Weblate 5adbedb28a Merge remote-tracking branch 'origin/develop' into develop 2018-01-18 10:22:26 +00:00
David Baker c090c2e7df
Merge pull request #1710 from matrix-org/t3chguy/roomColor
don't pass back {} when we have no `org.matrix.room.color_scheme`
2018-01-18 10:22:21 +00:00
Weblate 5fd7c30dbf Merge remote-tracking branch 'origin/develop' into develop 2018-01-18 09:57:38 +00:00
Matthew Hodgson 80d3edfbb3 simplify the 'send anyway' text, as 'mark devices known' is meaningless to users 2018-01-18 09:57:29 +00:00
Weblate 9e987337b7 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 23:28:22 +00:00
Matthew Hodgson d3292d9388 fix typos and NPE. fixes #5999 2018-01-17 23:28:14 +00:00
Weblate 0fb808ef99 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 19:28:56 +00:00
David Baker 27b27e3759
Merge pull request #1700 from matrix-org/dbkr/dont_paginate_while_decrypting
Don't paginate whilst decrypting events
2018-01-17 19:28:52 +00:00