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
Matthew Hodgson
a5c8d061a8
Merge pull request #1362 from matrix-org/t3chguy/hide_notification_body
...
allow hiding of notification body for privacy reasons
2017-10-14 23:10:35 +01:00
Matthew Hodgson
d63a25a183
Merge branch 'develop' into t3chguy/hide_notification_body
2017-10-14 23:10:01 +01:00
Matthew Hodgson
dfc3dcff9d
Merge pull request #1466 from turt2live/travis/alone_warning
...
Suggest to invite people when speaking in an empty room
2017-10-14 22:44:31 +01:00
Matthew Hodgson
9f64261707
Merge branch 'develop' into travis/alone_warning
2017-10-14 22:43:36 +01: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
Matthew Hodgson
0284a582a1
Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist
...
T3chguy/fix memberlist
2017-10-14 22:09:55 +01: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
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
5214a867db
Fix labs again
2017-10-13 14:43:26 +01: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
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
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
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
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
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
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
7176185dc2
Merge pull request #1469 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
...
Update from Weblate.
2017-10-12 17:46:01 +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
91b888aa2d
Merge pull request #1467 from matrix-org/luke/fix-autocomplete-hover-bug
...
Fix bug that inserted emoji when typing
2017-10-12 12:39:09 +02: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
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
09b53d9f85
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-10-11 18:32:49 +01:00