OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
8,654 Commits
216 Branches
562 Tags
488 MiB
Commit Graph

7283 Commits (a4c7da63afe4a58551a8497c221e91e1d97fdeec)

Author SHA1 Message Date
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
Weblate d93518ac43 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 19:28:43 +00:00
David Baker 6b43b412ab
Merge pull request #1699 from matrix-org/dbkr/i18n_plural_fallback 
Fall back for missing i18n plurals
 2018-01-17 19:28:38 +00:00
Michael Telatynski 2f42e69b57 Merge branches 'develop' and 't3chguy/roomColor' of github.com:matrix-org/matrix-react-sdk into t3chguy/roomColor 2018-01-17 18:20:35 +00:00
Michael Telatynski b7204e79a7 fallback after receiving settings rather than {} because its truthy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-17 18:17:26 +00:00
Michael Telatynski 43bb8c561d add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-17 18:10:19 +00:00
Michael Telatynski b90a98b5c1 don't pass back {} when we have no `org.matrix.room.color_scheme` 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-17 18:06:19 +00:00
Weblate 816a77c089 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 17:10:55 +00:00
lukebarnard 5f413ddf8b Do not fetch GroupStore resources if already fetching 2018-01-17 17:01:42 +00:00
lukebarnard 3ebf278cf3 Refactor GroupStore based on existing STATE_KEY concept 
by factoring out a lot of repeated code.
 2018-01-17 16:59:13 +00:00
Weblate 7486da3e53 Merge remote-tracking branch 'origin/develop' into develop 2018-01-17 10:57:44 +00:00
lukebarnard 2a1f8bd394 Ignore remote echos caused by this client 
by sending each tag_ordering with a _storeId and ignoring accout data
that has a matching _storeId.

This will tend to become out of sync with the server over time if
requests continually fail, but subsequent successful requests will
rectify any differences.
 2018-01-17 10:51:28 +00:00
David Baker f76186d743 Merge remote-tracking branch 'origin/develop' into dbkr/i18n_plural_fallback 2018-01-16 17:45:45 +00:00
David Baker 0557737f8d Don't modify original options arg 2018-01-16 17:45:29 +00:00
David Baker c64b4e1b1c Merge remote-tracking branch 'origin/develop' into dbkr/dont_paginate_while_decrypting 2018-01-16 17:38:32 +00:00
Weblate 1c600ab8d5 Merge remote-tracking branch 'origin/develop' into develop 2018-01-16 11:26:49 +00:00
Xose M 5de8cf270c Translated using Weblate (Galician) 
Currently translated at 35.9% (353 of 981 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2018-01-16 11:26:48 +00:00
Luke Barnard 62caa4f096
Merge pull request #1705 from matrix-org/luke/tag-panel-beautiful-dnd 
Replace TagPanel react-dnd with react-beautiful-dnd
 2018-01-16 11:26:44 +00:00
Osoitz 1155c1c85c Translated using Weblate (Basque) 
Currently translated at 100.0% (981 of 981 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-16 11:21:32 +00:00
lukebarnard f19dcd8114 Comment workaround to atlassian/react-beautiful-dnd#273 2018-01-16 11:07:25 +00:00
lukebarnard bda2d6b0a6 Work around atlassian/react-beautiful-dnd#273 
For some reason, after dragging an item
the parent draggable receives a mouse click. The workaround is
to use onMouseDown for deselecting tags
 2018-01-16 10:44:11 +00:00
lukebarnard d2e5b12271 Update jsdoc for moveTag 2018-01-16 09:46:48 +00:00
Jeff Huang bc2448fa7c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (981 of 981 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-01-16 02:32:57 +00:00
Szimszon 732950594d Translated using Weblate (Hungarian) 
Currently translated at 100.0% (981 of 981 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-01-15 19:01:37 +00:00
lukebarnard 16c13fb079 Replace TagPanel react-dnd with react-beautiful-dnd 
This new library handles the simple case of an ordered vertical
(or horizontal) list of items that can be reordered.

It provides animations, handles positioning of items mid-drag
and exposes a much simpler API to react-dnd (with a slight loss
of potential function, but we don't need this flexibility here
anyway).

Apart from this, TagOrderStore had to be changed in a highly
coupled way, but arguably for the better. Instead of being
updated incrementally every time an item is dragged over
another and having a separate "commit" action, the
asyncronous action `moveTag` is used to reposition the tag in
the list and both dispatch an optimistic update and carry out
the request as before. (The MatrixActions.accountData is still
used to indicate a successful reordering of tags).

The view is updated instantly, in an animated way, and this
is handled at the layer "above" React by the DND library.
 2018-01-15 18:12:27 +00:00
Kévin C e085632d8d Translated using Weblate (French) 
Currently translated at 100.0% (981 of 981 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-01-15 16:08:31 +00:00
Weblate c3b3cc4a82 Merge remote-tracking branch 'origin/develop' into develop 2018-01-15 15:02:02 +00:00
David Baker 0a6018a945
Merge pull request #1704 from matrix-org/luke/perf-room-list 
Only set selected tags state when updating rooms
 2018-01-15 15:01:57 +00:00
lukebarnard 408f13f68c Only set selected tags state when updating rooms 
instead of every time we get an update from a GroupStore/otherwise.

This was leading to many setStates and renders at startup when we
receive many group /members /rooms etc. responses.

Also, use the rate limited version of refreshRoomList.
 2018-01-15 14:42:41 +00:00
Andrey 7fadd0f4ac Translated using Weblate (Russian) 
Currently translated at 100.0% (981 of 981 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-15 14:02:58 +00:00
Weblate c0f6cf2343 Merge remote-tracking branch 'origin/develop' into develop 2018-01-15 13:45:17 +00:00
Jeff Huang ab0c03369b Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (980 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-01-15 13:45:16 +00:00
Michael Telatynski b526fc057c Add formatFullDateNoTime to DateUtils and stop passing 12/24h to DateSep 2018-01-14 18:32:17 +00:00
Jeff Huang ba5d92559b Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (980 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-01-13 12:59:09 +00:00
David Baker e42bea6277 Don't paginate whilst decrypting events 
As comment hopefully explains. This meant loading the app on an e2e
room would often be very slow as it tried to pull hundreds of events
into the timeline.
 2018-01-12 18:17:03 +00:00
David Baker 3cadb9b587 Fall back for missing i18n plurals 
Counterpart doesn't do fallback if there is a translation for the
base string in the preferred language but not the required
pluralisation. This meant that if someone added some plurals to a
language or a string, but not all, you'd get completely empty
strings in the interface.

Work around this in the wrapper function.
 2018-01-12 16:21:30 +00:00
Weblate a013e7ea9a Merge remote-tracking branch 'origin/develop' into develop 2018-01-12 13:56:31 +00:00
Osoitz a40dafd701 Translated using Weblate (Basque) 
Currently translated at 100.0% (980 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-12 12:38:21 +00:00
David Baker 99a72b5b2b Fix autofocus broken in https://github.com/matrix-org/matrix-react-sdk/pull/1674 
'focus' attribute was on the wrong thing
 2018-01-12 10:52:51 +00:00
Weblate 3477c8a8d3 Merge remote-tracking branch 'origin/develop' into develop 2018-01-12 10:32:46 +00:00
David Baker aa5d42d045 Remove spurious dot 2018-01-12 10:32:36 +00:00
Weblate bd1312f673 Merge remote-tracking branch 'origin/develop' into develop 2018-01-12 09:41:19 +00:00
Szimszon 7a324b4104 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (980 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-01-12 09:41:19 +00:00
Osoitz 18098da94a Translated using Weblate (Basque) 
Currently translated at 98.8% (969 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-12 09:41:18 +00:00
Michael Telatynski 23bd612730
Focus composer when clicking `Reply` (quote event) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 19:29:00 +00:00
Michael Telatynski 192cba2b79
allow text&onSenderProfileClick for tileShape===quote 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 19:25:43 +00:00
Szimszon 3163673705 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (980 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-01-11 12:30:47 +00:00
Weblate 3b4e233535 Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 12:06:52 +00:00
Andrey 0ad84f4ab5 Translated using Weblate (Russian) 
Currently translated at 99.7% (978 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-11 12:06:52 +00:00
Klaus Marx da562e015c Translated using Weblate (German) 
Currently translated at 99.2% (973 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-01-11 12:06:51 +00:00
Michael Telatynski 8ad4da54cb
Fix missing negation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 12:04:53 +00:00
Kévin C 8f26155c16 Translated using Weblate (French) 
Currently translated at 100.0% (980 of 980 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-01-11 11:20:03 +00:00
Weblate 52607c4122 Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 11:02:40 +00:00
David Baker b152bd4ab9
Merge pull request #1625 from matrix-org/t3chguy/analytics_info 
Add Analytics Info and add Piwik to SdkConfig.DEFAULTS
 2018-01-11 11:02:34 +00:00
Weblate b2bc506b36 Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 11:01:08 +00:00
David Baker 84da19c544
Merge pull request #1668 from turt2live/travis/re-register-scalar-token 
Attempt to re-register for a scalar token if ours is invalid
 2018-01-11 11:01:04 +00:00
Andrey 62ced91356 Translated using Weblate (Russian) 
Currently translated at 100.0% (967 of 967 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-11 10:52:04 +00:00
Weblate 8ccc53088f Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 10:49:44 +00:00
Andrey 0ce043ab12 Translated using Weblate (Russian) 
Currently translated at 99.5% (963 of 967 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-11 10:49:44 +00:00
David Baker 292a6c5767
Merge pull request #1674 from aidalgol/rebase-dialogs 
Normalise dialogs
 2018-01-11 10:49:40 +00:00
Kévin C 5e7fab1e15 Translated using Weblate (French) 
Currently translated at 100.0% (967 of 967 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-01-11 10:40:12 +00:00
Weblate f845071f91 Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 10:35:01 +00:00
David Baker efb96cdd2a
Merge pull request #1695 from matrix-org/dbkr/send_without_verifying 
Add 'send without verifying' to status bar
 2018-01-11 10:34:56 +00:00
Weblate 070114d911 Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 10:34:44 +00:00
David Baker 57e11cea1c Fix jsdoc 2018-01-11 10:27:15 +00:00
Michael Telatynski 007715aeaa
Run prune-i18n.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:54:00 +00:00
Michael Telatynski 94167e2b8b
Run gen-i18n.js and embed the ellipsis into the base string 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:52:20 +00:00
Michael Telatynski 1a7dc22a8d
make wantsDateSeparator generic and throw into DateUtils 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:06:24 +00:00
Michael Telatynski e45fcf10c7
Refactor DateUtils to ES6 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:00:11 +00:00
Michael Telatynski 9e2238e884
remove unused imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 11:56:36 +00:00
Michael Telatynski 1bc9d344ae
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/views/messages/TextualBody.js
 2018-01-10 11:54:58 +00:00
Michael Telatynski 454fd23f25
fix typo shsape->shape 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 11:51:48 +00:00
Michael Telatynski a977ab9be4
change handler name to suit convention 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 11:51:23 +00:00
David Baker 9dd9a5be4b Wording tweak 2018-01-09 17:59:49 +00:00
David Baker dbb8f878cb Tidy up imports 2018-01-09 17:57:18 +00:00
David Baker 4c101628b5 Add 'send without verifying' to status bar 
Fixes other part of https://github.com/vector-im/riot-web/issues/5936
 2018-01-09 13:52:37 +00:00
Aidan Gauland 9365860075 Update copyright line 2018-01-09 18:40:12 +13:00
Michael Telatynski d0897dc8f3
update wording to not imply exhaustiveness 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-08 13:29:27 +00:00
Iru Cai (vimacs) 275c960337 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 76.8% (739 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-01-08 02:00:48 +00:00
Weblate eae95fce61 Merge remote-tracking branch 'origin/develop' into develop 2018-01-07 20:31:12 +00:00
Osoitz f6851101cc Translated using Weblate (Basque) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-07 20:31:11 +00:00
Matthew Hodgson a88f92c3e3
Revert "MD-escape URLs/alises/user IDs prior to parsing markdown" 2018-01-07 20:30:18 +00:00
Szimszon b49c5a4c16 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-01-05 17:27:39 +00:00
Weblate a9fa4c5f67 Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 16:16:14 +00:00
lukebarnard 5ac1d8ce81 Merge branch 'develop' into luke/pref-tag-panel-selected2 2018-01-05 15:57:43 +00:00
Weblate 7fc21f4423 Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 15:55:29 +00:00
David Baker 587a6f8e2b
Merge pull request #1687 from matrix-org/luke/perf-tag-panel-selected 
Improve performance of tag panel selection (when tags are selected)
 2018-01-05 15:55:24 +00:00
Weblate c0d14904ef Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 15:26:27 +00:00
Osoitz f6b24b749f Translated using Weblate (Basque) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-05 15:26:26 +00:00
Luke Barnard 8c84c3f929
Merge pull request #1680 from matrix-org/t3chguy/hide_roomstatusbar 
Hide status bar on visible->hidden transition
 2018-01-05 15:26:22 +00:00
lukebarnard 8509db1bda Cache isConfCallRoom 
This only needs to be calculated one per room
 2018-01-05 14:53:04 +00:00
Osoitz 1e66f4f0ed Translated using Weblate (Basque) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-05 14:31:24 +00:00
Kévin C f1850d188e Translated using Weblate (French) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/

Correction (Seul -> Seules)
 2018-01-05 13:17:33 +00:00
lukebarnard 8ade357349 Handle newly added rooms and removed rooms. 2018-01-05 12:33:26 +00:00
Andrey 44d920afc8 Translated using Weblate (Russian) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-05 12:27:22 +00:00
Weblate 8a805187dc Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 12:24:14 +00:00
David Baker 845dda8f48
Merge pull request #1692 from matrix-org/t3chguy/pr-revival/turt2live/single_unsent 
[revived] Singularise unsent message prompt, if applicable
 2018-01-05 12:24:06 +00:00
Weblate 58c1118993 Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 12:18:19 +00:00
Andrey d3624886a7 Translated using Weblate (Russian) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-05 12:18:19 +00:00
Michael Telatynski c61d09464a
Merge pull request #1683 from matrix-org/t3chguy/memberinfo_warn_demote_self 
small refactor && warn on self-demotion
 2018-01-05 12:18:15 +00:00
Michael Telatynski 9f295b7a86
fix typo 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 12:03:46 +00:00
Michael Telatynski 558a90a359
comment out RoomView.onStatusBarHidden 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 11:58:42 +00:00
Michael Telatynski a8bd4bf858
add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 11:56:18 +00:00
David Baker 5aed77c752
Merge pull request #1677 from aidalgol/PropTypes 
Remove use of deprecated React.PropTypes
 2018-01-05 11:53:55 +00:00
Michael Telatynski 222b01e000
Merge pull request #1691 from matrix-org/t3chguy/lazy_save_relatedGroupSettings 
only save RelatedGroupSettings if it was modified. Otherwise perms issue
 2018-01-05 11:53:30 +00:00
David Baker 350dab06a0
Merge pull request #1675 from turt2live/travis/fix-granular-again 
Fix a couple more issues with granular settings
 2018-01-05 11:48:32 +00:00
David Baker 242d84c63a
Merge pull request #1673 from matrix-org/t3chguy/fix_op_slashcommand_for_negatives 
Allow argument to op slashcommand to be negative as PLs can be -ve
 2018-01-05 11:28:52 +00:00
Michael Telatynski a473971c7b
negate for less indentation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 11:11:20 +00:00
Michael Telatynski 293bb15ccc
check PL and compare arrays rather than tracking changes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 10:53:55 +00:00
lukebarnard 7606e60188 Merge branch 'develop' into luke/perf-tag-panel-selected 2018-01-05 10:26:03 +00:00
Walter 8731bfd008 Translated using Weblate (Russian) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-05 10:24:02 +00:00
Walter a7aa0a3b27 Translated using Weblate (Russian) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-04 21:33:41 +00:00
Weblate ae3666143a Merge remote-tracking branch 'origin/develop' into develop 2018-01-04 18:26:10 +00:00
David Baker c7accb732c
Merge pull request #1624 from matrix-org/t3chguy/room_dict_refactor 
make RoomDetailRow reusable for the Room Directory
 2018-01-04 18:26:06 +00:00
Weblate 493023a1bb Merge remote-tracking branch 'origin/develop' into develop 2018-01-04 18:19:42 +00:00
lukebarnard f1b60287fb Merge branch 'develop' into luke/fix-get-users-rooms-for-joined-groups 2018-01-04 17:56:34 +00:00
Weblate cde2a5e201 Merge remote-tracking branch 'origin/develop' into develop 2018-01-04 17:46:52 +00:00
lukebarnard 55bfff24c4 Fix forgotten rename during d5e2a73d99 2018-01-04 17:46:44 +00:00
Weblate 9c13a5a267 Merge remote-tracking branch 'origin/develop' into develop 2018-01-04 17:33:40 +00:00
David Baker b34f360f96
Merge pull request #1690 from matrix-org/luke/remove-selected-room-prop 
Remove unused selectedRoom prop
 2018-01-04 17:33:36 +00:00
Weblate 36a2f4e8f9 Merge remote-tracking branch 'origin/develop' into develop 2018-01-04 17:08:06 +00:00
David Baker 5961cf3958
Merge pull request #1684 from matrix-org/luke/fix-tag-panel-shift-ctrl-click 
Fix shift and shift-ctrl click in TagPanel
 2018-01-04 17:08:01 +00:00
Weblate 7c86745fc3 Merge remote-tracking branch 'origin/develop' into develop 2018-01-04 16:49:22 +00:00
Michael Telatynski 831a3f7e42
Merge branch 'develop' into t3chguy/hide_left_chats_memberinfo 2018-01-04 16:41:16 +00:00
Michael Telatynski e99477d486
naive translation rescue post-pluralisation 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-04 15:13:54 +00:00
Michael Telatynski be48460595
Singularise unsent message prompt, if applicable 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-04 15:05:08 +00:00
Michael Telatynski f5f3c894d7
only save RelatedGroupSettings if it was modified. Otherwise perms issue 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-04 14:24:13 +00:00
lukebarnard 2282f5c26f Remove unused selectedRoom prop 2018-01-04 14:19:10 +00:00
lukebarnard d5e2a73d99 Add alt condition back in, rename to specify igorance of shift 
because this is really what this function is for - we want to
ignore specifically shift but not necessarily alt (despite
this probably not having any real impact).
 2018-01-04 12:06:19 +00:00
lukebarnard cdd1a57569 Calculate visible rooms when tags change 
instead of every time we getRoomLists
 2018-01-04 11:50:33 +00:00
lukebarnard 5c5307c665 Improve performance of tag panel selection (when tags are selected) 
Deselecting all tags is now slightly less performant than selecting a tag
but mostly due to the number of RoomTiles being rendered.

Swapping between different tags (a supposed common use-case) feels much
more spritely!
 2018-01-03 17:12:31 +00:00
Weblate 58e773031b Merge remote-tracking branch 'origin/develop' into develop 2018-01-03 15:48:49 +00:00
pincopallopino 77132bc7bd Translated using Weblate (Italian) 
Currently translated at 8.9% (86 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2018-01-03 15:48:48 +00:00
Luke Barnard d3e47fa99d
Merge pull request #1682 from Nostradamos/fix_riot_web_4821 
Make scroll on paste in RTE compatible with https://github.com/vector-im/riot-web/pull/5900
 2018-01-03 15:48:43 +00:00
lukebarnard 2baacfa562 Handle case where ordering is not yet known 2018-01-03 14:12:28 +00:00
lukebarnard a2bb240dcb Fetch group data for all tags instead of those selected 
so that tag switching is not delayed by fetching group data, i.e group members and rooms.
 2018-01-03 14:07:29 +00:00
Weblate 3d836a6d76 Merge remote-tracking branch 'origin/develop' into develop 2018-01-03 13:41:19 +00:00
Osoitz 08e6d123a2 Translated using Weblate (Basque) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-03 13:41:18 +00:00
David Baker 613e3b7ac1 Remove extra full stop 2018-01-03 11:57:49 +00:00
lukebarnard d495519986 Fix shift-ctrl-click 
isOnlyCtrlOrCmdKeyEvent is predicated on !shiftKey, so another function was needed for cases where we ignore other keys
 2018-01-03 11:39:15 +00:00
lukebarnard 85cdd888e8 Combine TagOrderStore and FilterStore 
so that shift-click semantics can work. The store that computes the shift-click
rules has to be aware of the actual order of tags displayed, so they must be done
in the same store.
 2018-01-03 11:33:59 +00:00
nostradamos 2189fe9256 removed console.log 2018-01-03 01:52:02 +01:00
nostradamos e543f55572 refactored code 2018-01-03 01:50:03 +01:00
Michael Telatynski f67d405732
small refactor && warn on self-demotion 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-02 23:15:36 +00:00