3b58f0ca2a
Ignore removed events
2017-11-02 18:14:21 +00:00
ee43c635d1
phrasing
2017-11-02 18:11:18 +00:00
42589281d1
comment stub method
2017-11-02 18:10:13 +00:00
f7201e8dee
Revert unintentional changes
2017-11-02 18:08:24 +00:00
498b117d5a
copyrights
2017-11-02 18:01:28 +00:00
4953d4de4d
Give autocomplete providers the room they're in
...
Removes the gut-wrenching that RoomView does to jam the user list
into the user autocomplete provider.
2017-11-02 17:51:08 +00:00
a52bb9d603
Pass URL to check.
2017-11-02 17:27:59 +00:00
322cd6a2f8
Translated using Weblate (German)
...
Currently translated at 100.0% (922 of 922 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-02 16:35:11 +00:00
7bbae89235
Merge remote-tracking branch 'origin/develop' into develop
2017-11-02 16:09:12 +00:00
8800081cb9
Merge pull request #1567 from matrix-org/luke/fix-flair-store
...
Fix multiple requests for publicised groups of given user
2017-11-02 16:09:07 +00:00
21e09840dc
Fix multiple requests for publicised groups of given user
...
Previously, a single user could end up in multiple batches, which would have been fine if the logic didn't assume otherwise. If a request took longer than 200ms, multiple batches would occur with intersecting sets of users, deleting promises that were then assumed to exist.
The logic now takes all "in flight" users to also not be "pending". Pending now means that the user will be processed in the next batch. "In flight" means the user is part of an ongoing batch.
2017-11-02 15:59:26 +00:00
ff3a555802
Merge remote-tracking branch 'origin/develop' into develop
2017-11-02 15:38:08 +00:00
7c17ad8509
Merge pull request #1566 from matrix-org/luke/groups-room-publicity
...
Add toggle to alter visibility of a room-group association
2017-11-02 15:38:03 +00:00
61287b5f08
Merge remote-tracking branch 'origin/develop' into develop
2017-11-02 15:37:58 +00:00
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
David Baker
Richard Lewis
Krombel
Weblate
David Baker
Luke Barnard
Bamstam
Luke Barnard
Andrey
Szimszon
Matthew Hodgson
Matthew Hodgson
Kévin C