69a82f7859
Merge pull request #5497 from vector-im/luke/groups-room-info
...
Add toggle to alter visibility of room-group association
2017-11-02 15:37:52 +00:00
ee71c72685
Use margin to separate "perms" in the room directory
...
instead of a space.
2017-11-02 15:13:55 +00:00
06ce467876
Add CSS for group room visibility label alignment
2017-11-02 15:05:08 +00:00
982e87e01c
Communities are communities, wrap div for label alignment
2017-11-02 15:04:40 +00:00
b13bff77cb
Merge remote-tracking branch 'origin/develop' into develop
2017-11-02 14:23:05 +00:00
d698f9f8fd
Translated using Weblate (German)
...
Currently translated at 99.8% (918 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-02 14:23:04 +00:00
8895ab7e5b
Merge pull request #1564 from matrix-org/dbkr/pillify_at_room
...
Pillify room notifs in the timeline
2017-11-02 14:22:58 +00:00
c01ea56676
Add toggle to alter visibility of room-group association
2017-11-02 13:40:07 +00:00
bf77b51b5e
Merge branch 'develop' into luke/groups-room-publicity
2017-11-02 13:39:33 +00:00
790db94fd7
Add toggle to alter the visibility of a room-group association
2017-11-02 13:31:11 +00:00
ac89b5dc5e
Merge remote-tracking branch 'origin/develop' into develop
2017-11-02 12:53:34 +00:00
fb8e41a9c1
Merge pull request #5494 from vector-im/dbkr/pillify_at_room
...
CSS for room notification pills
2017-11-02 12:53:29 +00:00
8387fe7326
Merge remote-tracking branch 'origin/develop' into develop
2017-11-02 11:10:50 +00:00
d9f19726a3
Translated using Weblate (German)
...
Currently translated at 99.8% (918 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-02 11:10:49 +00:00
6baf6af332
Merge pull request #1563 from matrix-org/luke/groups-room-info
...
Implement simple GroupRoomInfo
2017-11-02 11:10:43 +00:00
7ab3be0a11
Merge remote-tracking branch 'origin/develop' into develop
2017-11-02 11:07:06 +00:00
2e8f960ee3
Merge pull request #5493 from vector-im/luke/groups-room-info
...
Implement simple GroupRoomInfo
2017-11-02 11:07:00 +00:00
e909d859ab
Merge branch 'develop' into luke/groups-room-info
2017-11-02 10:56:33 +00:00
65ea7a8460
Use more spercific selector instead of !important
2017-11-02 10:37:25 +00:00
7ff50d01b8
Merge remote-tracking branch 'origin/develop' into develop
2017-11-01 22:18:10 +00:00
e68ab44596
Translated using Weblate (Russian)
...
Currently translated at 98.6% (907 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-01 22:18:10 +00:00
9b5fd76dc7
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (919 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-01 22:18:10 +00:00
b2ccf3fdf7
Translated using Weblate (German)
...
Currently translated at 96.5% (887 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-01 22:18:09 +00:00
815b42f0ac
Merge pull request #1565 from matrix-org/matthew/group-promise-npe
...
turn NPE on flair resolution errors into a logged error
2017-11-01 22:18:05 +00:00
7d7cd30e46
turn NPE on flair resolution errors into a logged error
2017-11-01 22:10:03 +00:00
6586a6ff36
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (919 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-01 20:44:43 +00:00
819122c111
Translated using Weblate (French)
...
Currently translated at 100.0% (215 of 215 strings)
Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
2017-11-01 20:04:22 +00:00
44e408ca91
Translated using Weblate (French)
...
Currently translated at 100.0% (919 of 919 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-01 19:59:55 +00:00
cd84d86fd1
CSS for room notification pills
2017-11-01 19:45:59 +00:00
4f8d6d8fbe
Pillify room notifs in the timeline
...
This scans text nodes in the DOM for room notifications and turns
them into pills. Changes the pillification code around a bit so it
works with text nodes. Uses the push processor directly to test
the event against the room notifiation rule so we know whether
this event would actually trigger a room notification (needs to
hook into push at a lower level because otherwise our own room
notifications would not pillify since our own events never
generate notifications).
Requires https://github.com/matrix-org/matrix-js-sdk/pull/565
2017-11-01 19:42:47 +00:00
80f79e6b84
Generate translations
2017-11-01 17:58:45 +00:00
fe495db6e2
Merge remote-tracking branch 'origin/develop' into develop
2017-11-01 17:44:09 +00:00
acd1f31010
Merge pull request #1484 from pafcu/departify
...
Less translation in parts
2017-11-01 17:44:03 +00:00
2163a54617
Implement simple GroupRoomInfo
...
See matrix-org/matrix-react-sdk#1563
2017-11-01 17:32:01 +00:00
64a369216a
Implement simple GroupRoomInfo
...
which replaces the "X" on the GroupRoomTile with "Remove from community" under Admin Tools.
2017-11-01 17:27:35 +00:00
0dcd52d88f
Fix some react warnings firing
2017-11-01 17:12:22 +00:00
b3a7d25ef8
lint hell
2017-11-01 15:31:44 +00:00
8ef3811f28
Merge branch 'develop' into matthew/status
2017-11-01 15:25:50 +00:00
8f289519e1
fix chevron cosmetics
2017-11-01 15:25:23 +00:00
64d8c81897
Merge branch 'develop' into matthew/status
2017-11-01 15:24:30 +00:00
1ae9103d78
evil evil hack to temporarily hide avatar changes in status autojoin rooms
2017-11-01 15:24:02 +00:00
e1e4fc2dac
Make eslint happy
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-11-01 16:18:48 +01:00
15bafd6818
Convert from weblate to counterpart at runtime to make tests happy
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-11-01 15:55:58 +01:00
d6f1e12bee
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi >
2017-11-01 15:50:45 +01:00
ccf4150b43
Merge remote-tracking branch 'origin/develop' into develop
2017-11-01 11:44:33 +00:00
ec260fb70c
Translated using Weblate (German)
...
Currently translated at 100.0% (913 of 913 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-01 11:44:32 +00:00
44aea85792
Merge pull request #1562 from matrix-org/luke/redact-group-ids
...
Redact group IDs from analytics
2017-11-01 11:44:27 +00:00
047bf6e4dd
Redact group IDs from analytics
2017-11-01 11:30:25 +00:00
9ee7a2ea70
Translated using Weblate (German)
...
Currently translated at 100.0% (913 of 913 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-31 23:44:18 +00:00
df58bdd529
use absolute url for og:image
2017-10-31 22:56:57 +00:00
David Baker
Luke Barnard
Weblate
Bamstam
Luke Barnard
Krombel
David Baker
Andrey
Szimszon
Matthew Hodgson
Matthew Hodgson
Kévin C
Stefan Parviainen