mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-15 10:21:30 +03:00
Code Issues Projects Releases Packages Wiki Activity
7876 commits 219 branches 562 tags 474 MiB
Commit graph

7876 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
112c74a255 Add NotifProvider to offer @room as a completion 2017-11-02 18:54:25 +00:00
Richard Lewis
853ada027d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering 2017-11-02 18:34:46 +00:00
Richard Lewis
0e854ee356 Fix loading and initialisation spinners. 2017-11-02 18:33:11 +00:00
David Baker
843d797ded Better type checking 2017-11-02 18:17:57 +00:00
David Baker
7f9967389d Pass room into Autocompleter 2017-11-02 18:15:26 +00:00
David Baker
6ad4bb80dd == 2017-11-02 18:14:46 +00:00
David Baker
3b58f0ca2a Ignore removed events 2017-11-02 18:14:21 +00:00
David Baker
ee43c635d1 phrasing 2017-11-02 18:11:18 +00:00
David Baker
42589281d1 comment stub method 2017-11-02 18:10:13 +00:00
David Baker
f7201e8dee Revert unintentional changes 2017-11-02 18:08:24 +00:00
David Baker
498b117d5a copyrights 2017-11-02 18:01:28 +00:00
David Baker
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
Richard Lewis
a52bb9d603 Pass URL to check. 2017-11-02 17:27:59 +00:00
Krombel
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
Weblate
7bbae89235 Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 16:09:12 +00:00
David Baker
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
Luke Barnard
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
Weblate
ff3a555802 Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 15:38:08 +00:00
David Baker
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
Luke Barnard
982e87e01c Communities are communities, wrap div for label alignment 2017-11-02 15:04:40 +00:00
Weblate
b13bff77cb Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 14:23:05 +00:00
Bamstam
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
David Baker
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
Luke Barnard
bf77b51b5e Merge branch 'develop' into luke/groups-room-publicity 2017-11-02 13:39:33 +00:00
Luke Barnard
790db94fd7 Add toggle to alter the visibility of a room-group association 2017-11-02 13:31:11 +00:00
Weblate
8387fe7326 Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 11:10:50 +00:00
Krombel
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
David Baker
6baf6af332
Merge pull request #1563 from matrix-org/luke/groups-room-info 
Implement simple GroupRoomInfo
 2017-11-02 11:10:43 +00:00
Luke Barnard
e909d859ab
Merge branch 'develop' into luke/groups-room-info 2017-11-02 10:56:33 +00:00
Weblate
7ff50d01b8 Merge remote-tracking branch 'origin/develop' into develop 2017-11-01 22:18:10 +00:00
Andrey
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
Szimszon
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
Bamstam
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
Matthew Hodgson
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
Matthew Hodgson
7d7cd30e46 turn NPE on flair resolution errors into a logged error 2017-11-01 22:10:03 +00:00
Szimszon
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
Kévin C
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
David Baker
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
Luke Barnard
80f79e6b84 Generate translations 2017-11-01 17:58:45 +00:00
Weblate
fe495db6e2 Merge remote-tracking branch 'origin/develop' into develop 2017-11-01 17:44:09 +00:00
Luke Barnard
acd1f31010
Merge pull request #1484 from pafcu/departify 
Less translation in parts
 2017-11-01 17:44:03 +00:00
Luke Barnard
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
Luke Barnard
0dcd52d88f Fix some react warnings firing 2017-11-01 17:12:22 +00:00
Matthew Hodgson
b3a7d25ef8 lint hell 2017-11-01 15:31:44 +00:00
Matthew Hodgson
64d8c81897 Merge branch 'develop' into matthew/status 2017-11-01 15:24:30 +00:00
Matthew Hodgson
1ae9103d78 evil evil hack to temporarily hide avatar changes in status autojoin rooms 2017-11-01 15:24:02 +00:00
Stefan Parviainen
e1e4fc2dac Make eslint happy 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-01 16:18:48 +01:00
Stefan Parviainen
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
Stefan Parviainen
d6f1e12bee Fix merge conflict 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-01 15:50:45 +01:00
Weblate
ccf4150b43 Merge remote-tracking branch 'origin/develop' into develop 2017-11-01 11:44:33 +00:00