5c9970950b
Undo i18n change to make merge easier
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:21:12 -06:00
7307bc412f
Respond to updates from presence context menu
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 23:16:12 -06:00
c483717282
Make onClick be a context menu for presence
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 21:44:07 -06:00
03800b7476
Support more positioning options on context menus
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 21:43:47 -06:00
788e16a716
Linting
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 20:23:50 -06:00
0b20681f6a
Put presence management behind a labs setting
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 19:13:46 -06:00
854394cb2e
Merge branch 'develop' into travis/presence
2017-10-14 18:49:58 -06:00
1d75d9e90d
yet more horrifically strict linting :/
2017-10-15 01:47:11 +01:00
635996c083
more bizarrely strict linting :/
2017-10-15 01:19:06 +01:00
247e32115f
bizarrely strict linting :/
2017-10-15 01:13:52 +01:00
2b367edccf
Merge pull request #1439 from turt2live/travis/pinned_messages
...
Message/event pinning
2017-10-15 01:03:18 +01:00
49c19bc9b4
Merge branch 'develop' into travis/presence
2017-10-14 17:26:54 -06:00
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
67ba0e59a2
Merge pull request #1301 from zeroware/develop
...
Include magnet scheme in sanitize HTML params
2017-10-14 23:48:43 +01:00
b552b45a96
Merge pull request #1454 from matrix-org/t3chguy/jump_to_rr
...
Add a way to jump to a user's Read Receipt from MemberInfo
2017-10-14 23:45:49 +01:00
e57d9e686b
Merge branch 'develop' into t3chguy/jump_to_rr
2017-10-14 23:45:17 +01:00
f32ba0b54c
Merge pull request #1462 from pafcu/translation-fixes
...
Use standard subsitution syntax in _tJsx
2017-10-14 23:43:12 +01:00
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
c55ffe1be7
Remove duplicate declaration that breaks the build
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:41:02 -06:00
8a641c7173
Hide message pinning behind a labs setting
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:40:10 -06:00
838b9957da
Merge remote-tracking branch 'matrix-org/develop' into travis/pinned_messages
2017-10-14 16:33:46 -06:00
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
c34b55c6c7
Merge branch 'develop' into travis/pinned_messages
2017-10-14 16:10:32 -06:00
d63a25a183
Merge branch 'develop' into t3chguy/hide_notification_body
2017-10-14 23:10:01 +01:00
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
9f64261707
Merge branch 'develop' into travis/alone_warning
2017-10-14 22:43:36 +01:00
3efa0d2a76
Merge pull request #1478 from turt2live/travis/unset-avatar
...
Buttons to remove room/self avatar
2017-10-14 22:13:32 +01:00
8d6f0db3e2
be explicit in remove button height
2017-10-14 22:13:00 +01:00
0284a582a1
Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist
...
T3chguy/fix memberlist
2017-10-14 22:09:55 +01:00
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
6cd07731c4
Add MemberPresenceAvatar and control presence ourselves
...
Includes rudimentary support for custom statuses and user-controlled status. Some minor tweaks have also been made to better control how we advertise our presence.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 14:37:47 -06:00
c7c28c7ad2
make linter happy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 19:53:08 +01:00
c1edc0c32e
add option to disable BigEmoji
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 19:40:45 +01:00
b0b7472901
undo bad merge
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:14:57 +01:00
e79f9ef011
=== > ==
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:10:51 +01:00
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
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
97ebd27175
Add missing translation
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 23:08:41 -06:00
6e7f0d649b
Add option to unset your own avatar
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 21:13:47 -06:00
e5c8e3e7ad
Add option to unset room avatar
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 20:57:15 -06:00
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
d0759a537b
Fix the enableLabs flag, again
...
We were showing the options but ignoring them
2017-10-13 16:06:17 +01:00
5214a867db
Fix labs again
2017-10-13 14:43:26 +01:00
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
4e793d4f68
skip unnecessary filter
2017-10-13 14:11:21 +01:00
04b27f8678
Merge remote-tracking branch 'origin/develop' into dbkr/honour_enablelabs
2017-10-13 14:00:11 +01:00
f94873bd5d
Honour the (now legacy) enableLabs flag
2017-10-13 13:58:24 +01:00
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
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
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
Travis Ralston