Commit Graph

7123 Commits (f29f627c318cde3d6586d4d216cf021cf1c3d88a)

Author SHA1 Message Date
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
Matthew Hodgson 20ca318543 Merge pull request #1481 from matrix-org/t3chguy/disable_big_emoji
add option to disable BigEmoji
2017-10-14 22:06:15 +01: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
David Baker 3b515cdebe v0.10.7-rc.3 2017-10-13 16:31:35 +01:00
David Baker 8470a03530 Prepare changelog for v0.10.7-rc.3 2017-10-13 16:31:34 +01:00
David Baker ae2908ed65 Merge remote-tracking branch 'origin/develop' into release-v0.10.7 2017-10-13 16:29:36 +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
Luke Barnard d7c3fc9adb Merge pull request #1474 from matrix-org/dbkr/fix_enablelabs_again
Fix the enableLabs flag, again
2017-10-13 17:14:40 +02: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
David Baker b95c2368a6 v0.10.7-rc.2 2017-10-13 15:02:37 +01:00
David Baker 56825efc72 Prepare changelog for v0.10.7-rc.2 2017-10-13 15:02:36 +01:00
David Baker 705254ac55 Merge remote-tracking branch 'origin/develop' into release-v0.10.7 2017-10-13 15:00:49 +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
Luke Barnard 42e31ecba6 Merge pull request #1473 from matrix-org/dbkr/honour_enablelabs
Honour the (now legacy) enableLabs flag
2017-10-13 15:22:06 +02:00
David Baker 4e793d4f68 skip unnecessary filter 2017-10-13 14:11:21 +01:00
David Baker 04b27f8678 Merge remote-tracking branch 'origin/develop' into dbkr/honour_enablelabs 2017-10-13 14:00:11 +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
David Baker 5292b0dba9 Merge pull request #1472 from matrix-org/dbkr/labs_really_disabled_by_default
Don't show labs features by default
2017-10-13 11:53:38 +01: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
David Baker 9036f786e7 v0.10.7-rc.1 2017-10-13 11:10:21 +01:00
David Baker 5fe48e44a0 Prepare changelog for v0.10.7-rc.1 2017-10-13 11:10:21 +01:00
David Baker 289fc230fe js-sdk rc.1 2017-10-13 11:05:58 +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