Luke Barnard
21a31b02d0
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-10-11 16:02:10 +01:00
Luke Barnard
060bf3bdf6
Remove inline CSS
2017-10-11 16:02:01 +01:00
Travis Ralston
0ab5b1a6af
_td translatable strings
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-11 08:50:28 -06:00
Travis Ralston
f874fc1203
Merge branch 'develop' into travis/pl_enhancements
2017-10-11 08:42:45 -06:00
Luke Barnard
ffb9dd844a
Merge pull request #868 from psaavedra/set_default_federate_by_settings
...
Added TextInputWithCheckbox dialog
2017-10-11 16:28:03 +02:00
Luke Barnard
c128655321
Merge branch 'develop' into luke/groups-invite-warm-fuzzy
2017-10-11 16:05:51 +02:00
Luke Barnard
36666b3fc3
Add warm fuzzy dialog for inviting users to a group
2017-10-11 15:04:52 +01:00
Luke Barnard
f6eca14bee
Merge pull request #1456 from matrix-org/dbkr/say_which_homeserver
...
Make it clearer which HS you're logging into
2017-10-11 15:11:22 +02:00
David Baker
0f84216a9f
Grey out login form when no valid HS
2017-10-11 14:05:34 +01:00
Luke Barnard
99aabd9025
Merge pull request #1451 from matrix-org/t3chguy/redundant_thing
...
Remove redundant stale onKeyDown
2017-10-11 14:31:08 +02:00
Andrey
6ad0f2d8f8
Translated using Weblate (Russian)
...
Currently translated at 100.0% (855 of 855 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-11 12:30:08 +00:00
Luke Barnard
8aee5e1c25
Merge pull request #1453 from matrix-org/t3chguy/textForEvent
...
Only allow event state event handlers on state events
2017-10-11 14:30:02 +02:00
David Baker
fa24b4bd2d
Remove this log - it's not an error worth logging
2017-10-11 09:48:12 +01:00
Pitchaya Boonsarngsuk
b4d6d654ca
Translated using Weblate (Thai)
...
Currently translated at 61.4% (525 of 855 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/
2017-10-11 08:42:48 +00:00
Andrey
9cee2b3662
Translated using Weblate (Russian)
...
Currently translated at 100.0% (855 of 855 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-11 08:42:47 +00:00
Miloslav Nenadál
ce607d18b9
Translated using Weblate (Czech)
...
Currently translated at 59.0% (505 of 855 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-10-11 08:42:47 +00:00
Luke Barnard
904c3aa9f0
Merge pull request #1452 from matrix-org/luke/groups-store-2
...
Modify the group store to include group rooms
2017-10-11 10:42:42 +02:00
Stefan Parviainen
581abcb4b7
Consistent subsitution variable in translations
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 09:15:24 +02:00
Stefan Parviainen
52f3e1295b
Don't use string interpolation in _tJsx as it uses regexes for that
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 09:14:11 +02:00
Stefan Parviainen
8266286e99
Ignore VS16 char in RTE
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-11 08:45:36 +02:00
David Baker
80ad7d4ad6
Update translations
2017-10-10 19:27:51 +01:00
David Baker
92be3af990
Make it clearer which HS you're logging into
...
Otherwise there's no indication without clicking 'custom server'
2017-10-10 19:16:42 +01:00
Michael Telatynski
dbb6f5a44d
i18n the Jump to Read Receipt in MemberInfo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-07 19:27:49 +01:00
Michael Telatynski
d54cea5429
Add a way to jump to a user's Read Receipt from MemberInfo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-07 19:25:13 +01:00
Iru Cai (vimacs)
8855a5e30a
Translated using Weblate (Chinese (Simplified))
...
Currently translated at 89.7% (767 of 855 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2017-10-07 11:44:25 +00:00
Michael Telatynski
152499a17d
DRY map lookup
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-06 12:16:54 +01:00
Michael Telatynski
91ba939e23
tiny bit of de-lint for consistency
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-06 12:10:07 +01:00
Michael Telatynski
6a4e3792d4
split handlers into state and non-states
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-06 12:07:38 +01:00
Luke Barnard
917957c1dc
Modify the group store to include group rooms
...
and modify components to use this new part of the store such that feedback can be given
when adding or removing a room from the room list.
2017-10-05 14:30:04 +01:00
Michael Telatynski
a8231f7bf9
Remove redundant stale onKeyDown
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-05 08:26:57 +01:00
Michael Telatynski
c115980f21
remove redundant&stale onKeyDown
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-05 08:08:39 +01:00
Michael Telatynski
38de4ae152
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-05 08:00:22 +01:00
Michael Telatynski
7492f2dffa
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings
2017-10-04 22:35:29 +01:00
Luke Barnard
2ba0a801c4
Merge pull request #1449 from matrix-org/luke/groups-store
...
Factor-out GroupStore and create GroupStoreCache
2017-10-04 18:11:11 +01:00
Luke Barnard
cbb36b163b
Typo
2017-10-04 18:05:40 +01:00
Luke Barnard
c1318e9102
Only maintain one GroupStore in the GroupStoreCache
...
So that the group store data is up-to-date and to prevent group stores hanging around in memory
2017-10-04 17:51:38 +01:00
Luke Barnard
b16eb1713e
Typo
2017-10-04 17:01:44 +01:00
Luke Barnard
4017fa7f1d
Factor-out GroupStore and create GroupStoreCache
...
In order to provide feedback when adding a room to a group, the group summarry store needs to be extended to store the list of rooms in a group. This commit is the first step required.
The next step is to get the GroupRoomList listening to updates from GroupStore and expose the list of rooms from GroupStore.
(We're running out of words to describe the hierachy of things that store things)
2017-10-04 16:56:35 +01:00
Luke Barnard
6875005e30
Merge pull request #1448 from matrix-org/luke/fix-related-groups-in-labs
...
Put related groups UI behind groups labs flag
2017-10-04 15:00:08 +01:00
Luke Barnard
ed74ac394b
Put related groups UI behind groups labs flag
2017-10-04 14:35:13 +01:00
Luke Barnard
a400c03768
Merge pull request #1447 from matrix-org/luke/feature-flair-related-only
...
Restrict Flair in the timeline to related groups of the room
2017-10-04 14:24:59 +01:00
Luke Barnard
54ba164862
Merge pull request #1446 from matrix-org/luke/feature-related-groups-ui
...
Implement UI for editing related groups of a room
2017-10-04 14:21:48 +01:00
Luke Barnard
0c6b5776ec
Remove commented imports
2017-10-04 14:09:51 +01:00
Luke Barnard
02e7287123
Remove constraint on groups being local, remove logging
2017-10-04 14:08:31 +01:00
Luke Barnard
8d46b19916
Restrict Flair in the timeline to related groups of the room
2017-10-04 14:06:49 +01:00
Luke Barnard
9f39a15163
Merge pull request #1445 from matrix-org/luke/fix-editable-item-list
...
Fix a couple of bugs with EditableItemList
2017-10-04 13:22:46 +01:00
Luke Barnard
7be5e685f7
Implement UI for editing related groups of a room
...
(using the new EditableItemList)
2017-10-04 13:19:57 +01:00
Luke Barnard
9e3954865a
Fix a couple of bugs with EditableItemList
...
- fix entering the same thing twice (which had the bug of not emptying the "new" field)
- fix editing items in the list (which would stack overflow because of typo)
2017-10-04 13:15:38 +01:00
Luke Barnard
1938a767a2
Merge pull request #1444 from matrix-org/luke/refactor-editable-list-from-alias-settings
...
Factor out EditableItemList from AliasSettings
2017-10-04 10:56:17 +01:00
Luke Barnard
28b8582bd6
Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings
2017-10-04 10:37:45 +01:00