David Baker
|
8370c823b6
|
Script to generate the translations base file
Also replaces the translations base file with the output of the
script.
|
2017-10-17 19:19:01 +01:00 |
|
David Baker
|
c9576c9065
|
Merge pull request #1492 from matrix-org/luke/fix-room-address-tile-no-room-id
Don't show room IDs when picking rooms
|
2017-10-17 18:10:58 +01:00 |
|
Luke Barnard
|
1b8c5b50db
|
Don't show room IDs when picking rooms
|
2017-10-17 18:02:35 +01:00 |
|
Luke Barnard
|
24c4c1edc7
|
Merge pull request #1489 from matrix-org/luke/groups-invited-users-hide-if-empty
Only show invited section if there are invited group members
|
2017-10-17 12:33:39 +02:00 |
|
Luke Barnard
|
85d99d429d
|
Use correct logic operator
|
2017-10-17 09:49:39 +01:00 |
|
Luke Barnard
|
14eee9a37a
|
Only show invited section if there are invited group members
|
2017-10-16 17:59:53 +01:00 |
|
Luke Barnard
|
760b3cc60a
|
Merge pull request #1488 from matrix-org/luke/groups-invited-users
Show "Invited" section in the user list
|
2017-10-16 18:29:15 +02:00 |
|
Luke Barnard
|
9b08f4d11f
|
Separate fetching indicator state
|
2017-10-16 17:21:05 +01:00 |
|
David Baker
|
9d2f5b0a8a
|
Merge pull request #1487 from matrix-org/luke/fix-overflow-entity-tile
Refactor class names for an entity tile being hovered over
|
2017-10-16 16:42:23 +01:00 |
|
Luke Barnard
|
008e8d4f54
|
Show "Invited" section in the user list
|
2017-10-16 16:38:32 +01:00 |
|
Luke Barnard
|
47ac0988ba
|
Refactor class names for an entity tile being hovered over
|
2017-10-16 16:31:13 +01:00 |
|
David Baker
|
bbf3550865
|
Merge branch 'master' into develop
|
2017-10-16 14:46:11 +01:00 |
|
David Baker
|
f58d89ef80
|
v0.10.7
|
2017-10-16 14:45:14 +01:00 |
|
David Baker
|
bb623ca0a7
|
Prepare changelog for v0.10.7
|
2017-10-16 14:45:13 +01:00 |
|
David Baker
|
bcb792a412
|
Released js-sdk
|
2017-10-16 14:41:23 +01:00 |
|
David Baker
|
e4a3309752
|
Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque
Modify GroupView UI
|
2017-10-16 10:17:44 +01:00 |
|
Matthew Hodgson
|
1d75d9e90d
|
yet more horrifically strict linting :/
|
2017-10-15 01:47:11 +01:00 |
|
Matthew Hodgson
|
635996c083
|
more bizarrely strict linting :/
|
2017-10-15 01:19:06 +01:00 |
|
Matthew Hodgson
|
247e32115f
|
bizarrely strict linting :/
|
2017-10-15 01:13:52 +01:00 |
|
Matthew Hodgson
|
2b367edccf
|
Merge pull request #1439 from turt2live/travis/pinned_messages
Message/event pinning
|
2017-10-15 01:03:18 +01: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 |
|
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 |
|
Matthew Hodgson
|
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 |
|
Matthew Hodgson
|
e57d9e686b
|
Merge branch 'develop' into t3chguy/jump_to_rr
|
2017-10-14 23:45:17 +01: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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|