d63a25a183
Merge branch 'develop' into t3chguy/hide_notification_body
2017-10-14 23:10:01 +01:00
2667ed2561
Merge pull request #4988 from vector-im/t3chguy/hide_notification_body
...
allow hiding of notification body for privacy reasons
2017-10-14 23:07:31 +01:00
5bb2992f93
Merge pull request #5281 from turt2live/travis/display-name-lightbox
...
Don't use MXIDs on the lightbox if possible
2017-10-14 22:46:13 +01:00
b70bd1987a
Merge pull request #5267 from turt2live/travis/alone_warning_css
...
CSS for lonely room message
2017-10-14 22:44:58 +01:00
9051efeecf
Merge remote-tracking branch 'origin/develop' into develop
2017-10-14 21:44:35 +00: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
5c1e2a8a82
Merge pull request #5037 from turt2live/travis/code_block_border
...
Bring back dark theme code block border
2017-10-14 22:32:45 +01:00
dde0cc1baa
Merge remote-tracking branch 'origin/develop' into develop
2017-10-14 21:13:35 +00: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
6f81142bde
Merge pull request #5282 from turt2live/travis/unset_avatar
...
CSS for remove avatar buttons
2017-10-14 22:11:02 +01:00
538e0251ed
Merge remote-tracking branch 'origin/develop' into develop
2017-10-14 21:09:59 +00:00
0284a582a1
Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist
...
T3chguy/fix memberlist
2017-10-14 22:09:55 +01:00
fd6d1f0a75
Merge remote-tracking branch 'origin/develop' into develop
2017-10-14 21:06:20 +00:00
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
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
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
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
9d17ed7407
CSS for presence member avatar
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-14 14:33:55 -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
56e775c56a
Remove user avatar button CSS
2017-10-13 21:14:08 -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
c7723ba0b0
Remove room avatar button CSS
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-13 20:56:39 -06:00
1adb63ac74
Don't use MXIDs on the lightbox if possible
...
Signed-off-by: Travis Ralston <travpc@gmail.com >
2017-10-13 20:18:55 -06:00
a84b42bf24
Departify RoomSettings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-10-13 21:10:50 +02:00
3b91ada4c8
Departify sending emails and text messages
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-10-13 20:44:01 +02:00
6f20445a42
Explain topic click stopPropagation
2017-10-13 17:57:28 +01:00
3468abc975
Use GeminiScrollbar instead of ScrollPanel
2017-10-13 17:49:52 +01:00
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
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
aaf32ac9a0
Lint
2017-10-13 16:57:52 +01:00
83e7fc242a
Merge branch 'develop' into luke/groups-room-directory-esque
2017-10-13 17:48:35 +02:00
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
f5397acfa1
v0.12.7-rc.3
2017-10-13 16:36:57 +01:00
bdd96c6a9a
Prepare changelog for v0.12.7-rc.3
2017-10-13 16:36:56 +01:00
e0de9cbdfe
v0.12.7-rc.3
2017-10-13 16:36:07 +01:00
f555f2036e
react-sdk rc.3
2017-10-13 16:35:41 +01:00
3b2650e5ea
Merge remote-tracking branch 'origin/develop' into release-v0.12.7
2017-10-13 16:33:55 +01:00
3b515cdebe
v0.10.7-rc.3
2017-10-13 16:31:35 +01:00
8470a03530
Prepare changelog for v0.10.7-rc.3
2017-10-13 16:31:34 +01:00
ae2908ed65
Merge remote-tracking branch 'origin/develop' into release-v0.10.7
2017-10-13 16:29:36 +01:00
Matthew Hodgson
Weblate
Andrey
Carlos Marques
Bamstam
Travis Ralston
Michael Telatynski
Stefan Parviainen
Luke Barnard
Szimszon
Luke Barnard
David Baker