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

7580 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
e84e4ed5f5 Add CSS classes to group ID input in CreateGroupDialog 2017-11-03 15:38:12 +00:00
Krombel
f96c0d8533 Translated using Weblate (German) 
Currently translated at 100.0% (923 of 923 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-03 15:35:45 +00:00
David Baker
49ee78dab1 Merge remote-tracking branch 'origin/develop' into dbkr/composer_at_room_pills 2017-11-03 14:39:52 +00:00
Weblate
6a5162b047 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 14:30:06 +00:00
David Baker
43a23d7e89
Merge pull request #1568 from matrix-org/dbkr/autocomplete_provider_room 
Give autocomplete providers the room they're in
 2017-11-03 14:29:59 +00:00
Weblate
ec8afd185f Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 14:24:37 +00:00
David Baker
2c9a93a8ac
Merge pull request #1572 from matrix-org/dbkr/fix_multiple_pills 
Fix multiple pills on one line
 2017-11-03 14:24:33 +00:00
David Baker
802ab16746 Fix multiple pills on one line 2017-11-03 14:06:59 +00:00
Weblate
1cc65044d4 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 13:54:04 +00:00
Luke Barnard
d0b3368445
Merge pull request #1570 from matrix-org/luke/fix-groups-invites-appearance 
Fix group invites such that they look similar to room invites
 2017-11-03 13:53:58 +00:00
Michael Telatynski
b2cd65e182
Fixes React warning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-03 12:30:58 +00:00
Luke Barnard
151f9917b1 Fix group invites such that they look similar to room invites 
- Change GroupInviteTile to use RoomTile CSS
 - Give group invites their own sub list, with heading "Community Invites"
 2017-11-03 12:19:37 +00:00
Weblate
41cd3f0412 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 12:03:18 +00:00
Szimszon
fefe157c56 Translated using Weblate (Hungarian) 
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/hu/
 2017-11-03 12:03:17 +00:00
Bamstam
d43481d555 Translated using Weblate (German) 
Currently translated at 99.8% (921 of 922 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-03 12:03:17 +00:00
Luke Barnard
4511856d3b
Merge pull request #1569 from matrix-org/luke/groups-fix-my-groups-layout 
Add a GeminiScrollbar to Your Communities
 2017-11-03 12:03:12 +00:00
Luke Barnard
71c59eff2c Add a GeminiScrollbar to Your Communities 2017-11-03 11:19:29 +00:00
Szimszon
b559e123d7 Translated using Weblate (Hungarian) 
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/hu/
 2017-11-02 21:41:04 +00:00
Kévin C
d4668d6c11 Translated using Weblate (French) 
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/fr/
 2017-11-02 19:12:48 +00:00
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