PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
7109 commits 1 branch 0 tags 338 MiB
Commit graph

5878 commits

Author SHA1 Message Date
Weblate
2f9e3104de Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:14:00 +00:00
Matthew Hodgson
247e32115f bizarrely strict linting :/ 2017-10-15 01:13:52 +01:00
Weblate
10019fb890 Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:03:23 +00:00
Bamstam
b171636e1b Translated using Weblate (German) 
Currently translated at 99.5% (917 of 921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-15 00:03:22 +00:00
Matthew Hodgson
2b367edccf Merge pull request #1439 from turt2live/travis/pinned_messages 
Message/event pinning
 2017-10-15 01:03:18 +01:00
Weblate
dd948272c5 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:49:39 +00:00
Matthew Hodgson
40c682008b Merge pull request #1483 from turt2live/travis/fix-oct14 
Remove duplicate declaration that breaks the build
 2017-10-14 23:49:35 +01:00
Weblate
57296d03e8 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:48:47 +00:00
Matthew Hodgson
67ba0e59a2 Merge pull request #1301 from zeroware/develop 
Include magnet scheme in sanitize HTML params
 2017-10-14 23:48:43 +01:00
Weblate
8f86a58261 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:45:53 +00:00
Matthew Hodgson
e57d9e686b Merge branch 'develop' into t3chguy/jump_to_rr 2017-10-14 23:45:17 +01:00
Weblate
a6a0fbfc91 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:43:16 +00:00
Matthew Hodgson
f32ba0b54c Merge pull request #1462 from pafcu/translation-fixes 
Use standard subsitution syntax in _tJsx
 2017-10-14 23:43:12 +01:00
Weblate
463e17b223 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:41:36 +00:00
Matthew Hodgson
71d25bf787 Merge pull request #1442 from turt2live/travis/no_grey 
Don't suggest grey as a color scheme for a room
 2017-10-14 23:41:32 +01:00
Travis Ralston
c55ffe1be7 Remove duplicate declaration that breaks the build 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:41:02 -06:00
Travis Ralston
8a641c7173 Hide message pinning behind a labs setting 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-14 16:40:10 -06:00
Travis Ralston
838b9957da Merge remote-tracking branch 'matrix-org/develop' into travis/pinned_messages 2017-10-14 16:33:46 -06:00
Weblate
3428c1c3d3 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:10:39 +00:00
Travis Ralston
c34b55c6c7 Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:10:32 -06:00
Matthew Hodgson
d63a25a183 Merge branch 'develop' into t3chguy/hide_notification_body 2017-10-14 23:10:01 +01:00
Weblate
9051efeecf Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:44:35 +00:00
Matthew Hodgson
9f64261707 Merge branch 'develop' into travis/alone_warning 2017-10-14 22:43:36 +01:00
Weblate
dde0cc1baa Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:13:35 +00:00
Matthew Hodgson
3efa0d2a76 Merge pull request #1478 from turt2live/travis/unset-avatar 
Buttons to remove room/self avatar
 2017-10-14 22:13:32 +01:00
Matthew Hodgson
8d6f0db3e2 be explicit in remove button height 2017-10-14 22:13:00 +01:00
Weblate
538e0251ed Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:09:59 +00:00
Matthew Hodgson
0284a582a1 Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist 
T3chguy/fix memberlist
 2017-10-14 22:09:55 +01:00
Weblate
fd6d1f0a75 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:06:20 +00:00
Andrey
6dad6da66e Translated using Weblate (Russian) 
Currently translated at 94.8% (870 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-14 21:06:20 +00:00
Carlos Marques
8efeab924a Translated using Weblate (Portuguese) 
Currently translated at 93.0% (853 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
 2017-10-14 21:06:19 +00:00
Bamstam
329e258122 Translated using Weblate (German) 
Currently translated at 99.8% (916 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-14 21:06:19 +00:00
Michael Telatynski
c7c28c7ad2
make linter happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 19:53:08 +01:00
Michael Telatynski
c1edc0c32e
add option to disable BigEmoji 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 19:40:45 +01:00
Michael Telatynski
b0b7472901
undo bad merge 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:14:57 +01:00
Michael Telatynski
e79f9ef011
=== > == 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:10:51 +01:00
Michael Telatynski
6ad8532bed
lowerCase query so that searching for Erik will actually find Erik.. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:09:58 +01:00
Michael Telatynski
a000439948
pass search query to filter fn in _updateList 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-10-14 17:09:30 +01:00
Travis Ralston
97ebd27175 Add missing translation 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 23:08:41 -06:00
Travis Ralston
6e7f0d649b Add option to unset your own avatar 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 21:13:47 -06:00
Travis Ralston
e5c8e3e7ad Add option to unset room avatar 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-13 20:57:15 -06:00
Luke Barnard
6f20445a42 Explain topic click stopPropagation 2017-10-13 17:57:28 +01:00
Luke Barnard
3468abc975 Use GeminiScrollbar instead of ScrollPanel 2017-10-13 17:49:52 +01:00
Szimszon
34e9b10e95 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (917 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-10-13 16:44:09 +00:00
Luke Barnard
4b24eab8fd Merge branch 'luke/groups-room-directory-esque' of github.com:matrix-org/matrix-react-sdk into luke/groups-room-directory-esque 2017-10-13 17:19:58 +01:00
Luke Barnard
aaf32ac9a0 Lint 2017-10-13 16:57:52 +01:00
Luke Barnard
83e7fc242a Merge branch 'develop' into luke/groups-room-directory-esque 2017-10-13 17:48:35 +02:00
Luke Barnard
77418f535e Modify GroupView UI 
- Remove featured users/rooms
 - Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode.
 - Make the group view body scrollable
 2017-10-13 16:46:33 +01:00
Weblate
a4cdbd5fd4 Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 15:14:45 +00:00
Szimszon
f5abd1c2c8 Translated using Weblate (Hungarian) 
Currently translated at 93.5% (858 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-10-13 15:14:44 +00:00
David Baker
d0759a537b Fix the enableLabs flag, again 
We were showing the options but ignoring them
 2017-10-13 16:06:17 +01:00
Weblate
98a5669eb1 Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 13:43:44 +00:00
David Baker
5214a867db Fix labs again 2017-10-13 14:43:26 +01:00
Weblate
efc906dd0f Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 13:22:11 +00:00
Krombel
8405ec327e Translated using Weblate (German) 
Currently translated at 99.8% (916 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-13 13:22:10 +00:00
David Baker
4e793d4f68 skip unnecessary filter 2017-10-13 14:11:21 +01:00
David Baker
f94873bd5d Honour the (now legacy) enableLabs flag 2017-10-13 13:58:24 +01:00
Weblate
27f6781499 Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 10:53:43 +00:00
Krombel
a9831f342f Translated using Weblate (German) 
Currently translated at 93.4% (857 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-13 10:53:42 +00:00
Bamstam
e9cc088f7b Translated using Weblate (German) 
Currently translated at 92.9% (852 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-13 10:50:50 +00:00
David Baker
cd64c9bcbb Don't show labs features by default 
Previous PR disabled them but still showed the (broken) option
 2017-10-13 11:48:44 +01:00
Weblate
07e197dfa1 Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 10:20:25 +00:00
David Baker
f5f0c7e715 Merge pull request #1470 from matrix-org/dbkr/features_disabled_by_default 
Make features disabled by default
 2017-10-13 11:20:21 +01:00
Weblate
872fc948c4 Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 09:31:54 +00:00
Andrey
ead0b5d43f Translated using Weblate (Russian) 
Currently translated at 92.8% (850 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-13 09:31:54 +00:00
Bamstam
264fe81f20 Translated using Weblate (German) 
Currently translated at 93.1% (852 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-10-13 09:31:53 +00:00
Luke Barnard
065ae9580d Merge pull request #1459 from matrix-org/luke/groups-invite-warm-fuzzy 
Add warm fuzzy dialog for inviting users to a group
 2017-10-13 11:31:48 +02:00
Stefan Parviainen
45137f030b Fix merge conflict 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-12 22:18:50 +02:00
David Baker
710c952428 Make features disabled by default 
So we can then put them in labs on /develop & others can enable
them as desired.
 2017-10-12 18:45:04 +01:00
Weblate
6c6751e14d Merge remote-tracking branch 'origin/develop' into develop 2017-10-12 17:38:22 +00:00
Andrey
915c15b454 Translated using Weblate (Russian) 
Currently translated at 91.4% (837 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-10-12 17:38:22 +00:00
Osoitz
a0b3b29b68 Translated using Weblate (Basque) 
Currently translated at 92.4% (846 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2017-10-12 17:38:21 +00:00
David Baker
047daec587 Merge pull request #1468 from matrix-org/dbkr/labs_config 
enable/disable features in config.json
 2017-10-12 18:38:18 +01:00
David Baker
ff3a2c1807 Translated using Weblate (English (United States)) 
Currently translated at 99.6% (852 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
 2017-10-12 16:39:41 +00:00
David Baker
65eacff3d3 redundant code is redundant 2017-10-12 17:28:53 +01:00
David Baker
ef3df3e3fa comment 2017-10-12 17:28:14 +01:00
David Baker
20f9d71782 oops 2017-10-12 17:27:09 +01:00
Weblate
11b4ffe302 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 
Conflicts:
	src/i18n/strings/cs.json
	src/i18n/strings/de_DE.json
	src/i18n/strings/fi.json
	src/i18n/strings/fr.json
	src/i18n/strings/it.json
	src/i18n/strings/nl.json
	src/i18n/strings/ru.json
	src/i18n/strings/th.json
 2017-10-12 16:20:59 +00:00
David Baker
e50478aa1d enable/disable features in config.json 
As per https://docs.google.com/document/d/1Kn-mz2dDce9Cqc4oUTl5yJXGvmTlky1_KezuwUg58x0/edit#

Replaces:
 * enableLabs setting
 * 'override' flag in labs
 * 'default' flag in labs

Un-feature-flags matrix apps since this was now overidden to be
enabled.
 2017-10-12 17:03:38 +01:00
Kevin Brubeck Unhammer
55cdbe6655 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 0.1% (1 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2017-10-12 15:29:32 +00:00
Luke Barnard
b73e28add3 Merge pull request #1463 from turt2live/travis/peek_rr 
Don't send RR or RM when peeking at a room
 2017-10-12 17:29:26 +02:00
Travis Ralston
df7f1b46bf Stop peeking if anything went wrong, not just explicit failure 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-12 07:24:20 -06:00
Travis Ralston
f1032bb115 Set isPeeking to false if peeking failed 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-12 07:05:09 -06:00
Carlos Marques
5955eab29a Translated using Weblate (Portuguese) 
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/pt/
 2017-10-12 10:39:16 +00:00
Luke Barnard
36bb8b7dc4 Fix bug that inserted emoji when typing 
This was quite simple in the end -- the mouse doens't move, but on some browsers, the autocomplete appearing beneath the mouse would cause the `onMouseOver`, which is not `onMouseMove`.

The fix was to use `onMouseMove`.

Fixes vector-im/riot-web#4974
 2017-10-12 11:31:31 +01:00
Travis Ralston
f3b1baa3c0 Suggest to invite people when speaking in an empty room 
Adds vector-im/riot-web#1053

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-11 21:15:00 -06:00
Travis Ralston
6ce7eb952a Don't send RR or RM when peeking at a room 
Fixes vector-im/riot-web#696

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-11 18:43:24 -06:00
Stefan Parviainen
f694fb24ff Fix merge-conflict 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-10-11 20:02:14 +02:00
Luke Barnard
757e42ddca Merge pull request #1458 from pafcu/emoji-fix2 
Ignore VS16 char in RTE
 2017-10-11 19:49:29 +02:00
Luke Barnard
e0e5d51451 Merge pull request #1460 from matrix-org/dbkr/show_send_message_error 
Show failures when sending messages
 2017-10-11 19:46:32 +02:00
Luke Barnard
d3f9a3aeb5 Run eslint --fix 
Fixing 1000s of lint issues. Some rules cannot be `--fix`ed but this goes some way to linting the entire codebase.
 2017-10-11 17:56:17 +01:00
David Baker
5626c06b3c Show failures when sending messages 
This is useful for the spam checking where otherwise you don't
really know why your message has failed to send
 2017-10-11 17:42:54 +01:00
Luke Barnard
8958be9321 Merge pull request #1441 from turt2live/travis/who_banned 
Show who banned the user on hover
 2017-10-11 17:33:53 +02:00
Luke Barnard
d2b9fcc7aa Merge pull request #1440 from turt2live/travis/pl_enhancements 
Enhancements to room power level settings
 2017-10-11 17:31:20 +02:00
Travis Ralston
8a2813ac08 Fallback to MXID instead of relying on the user being in the room 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-11 09:08:40 -06:00
Travis Ralston
d1fdd20809 Show who banned the user on hover 
Fixes https://github.com/vector-im/riot-web/issues/5039

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-10-11 09:08:29 -06:00
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
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
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
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
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
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
28b8582bd6 Merge branch 'develop' into luke/refactor-editable-list-from-alias-settings 2017-10-04 10:37:45 +01:00
Luke Barnard
4e9694be6d Maintain "blur to add" function to match previous UX 2017-10-04 10:28:26 +01:00
Luke Barnard
407a632a8d Fix typo 2017-10-04 10:26:43 +01:00
Luke Barnard
d25ebfb844 Remove cruft from EIL 2017-10-04 10:15:44 +01:00
Walter
5abf30f373 Translated using Weblate (Ukrainian) 
Currently translated at 13.6% (117 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2017-10-04 09:09:15 +00:00
Walter
a9a2b60dfc 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-04 09:09:14 +00:00
Danilo Resende
00a89f8263 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 92.3% (790 of 855 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
 2017-10-04 09:09:14 +00:00
Luke Barnard
011aadcb94 Merge pull request #1421 from pafcu/develop 
Add dummy translation function to mark translatable strings
 2017-10-04 10:09:09 +01:00
Luke Barnard
8243c39d83 Factor out EditableItemList from AliasSettings 
Such that we can reuse the same UI elsewhere, namely when editing related groups of a room (which is an upcoming feature).
 2017-10-04 10:00:01 +01:00
Pitchaya Boonsarngsuk
fa0a87ae39 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-03 10:45:08 +00:00
Luke Barnard
03581adf85 Merge pull request #1438 from matrix-org/luke/groups-remove-room 
Implement button to remove a room from a group
 2017-10-03 11:45:03 +01:00