PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
8821 commits 1 branch 0 tags 338 MiB
Commit graph

8821 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
70afce73a7
Merge pull request #1726 from matrix-org/t3chguy/fix_usercontent_pointer 
This is actually MFileBody not MImageBody, change classname
 2018-02-05 14:27:17 +00:00
David Baker
0d04c8dab5
Merge pull request #1717 from matrix-org/t3chguy/fix_3pid_dm_rooms 
Use invite_3pid prop of createRoom instead of manual invite after create
 2018-02-05 12:07:43 +00:00
Richard Lewis
e508f06765 Add asset add / remove messaging clauses. 2018-02-05 11:50:25 +00:00
Richard Lewis
992c4771f4 Add button to remove all stickerpacks 2018-02-05 11:49:44 +00:00
Richard Lewis
34de3729fe Add method to remove all stickerpacks. 2018-02-05 11:49:26 +00:00
Richard Lewis
29962ed89d Add stickerpack strings. 2018-02-05 11:48:48 +00:00
lukebarnard
81eca49266 Merge branch 'luke/room-list-flux' of github.com:matrix-org/matrix-react-sdk into luke/room-list-flux 2018-02-05 11:40:42 +00:00
Luke Barnard
ff8fcb3139
Merge branch 'develop' into luke/room-list-flux 2018-02-05 11:39:39 +00:00
David Baker
ec3a37d9f3
Merge pull request #1729 from matrix-org/t3chguy/aliases_null_guard 
guard against m.room.aliases events with no keys (redaction?)
 2018-02-05 10:21:05 +00:00
David Baker
3275a56013
Merge pull request #1718 from matrix-org/t3chguy/fix_memberlist_3pid_invites 
Fix not showing Invited section if all invites are 3PID
 2018-02-05 10:14:23 +00:00
David Baker
916ab68506
Merge pull request #1720 from matrix-org/t3chguy/nvl/fix_rich_reply_on_image 
Fix Rich Replies on files
 2018-02-05 09:58:37 +00:00
Michael Telatynski
d1a24ac87b
guard against m.room.aliases events with no keys (redaction?) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-02 08:12:56 +00:00
David Baker
e51dbd49f9
Merge pull request #1728 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-02-01 10:38:08 +00:00
David Baker
497cf21c86 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (984 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-02-01 10:35:12 +00:00
Weblate
ee81d6aea1 Merge remote-tracking branch 'origin/develop' into develop 2018-01-31 18:10:59 +00:00
Nathan van Beelen
3a33eea5e9 Translated using Weblate (Dutch) 
Currently translated at 75.5% (743 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2018-01-31 18:10:57 +00:00
David Baker
4c17b5f1c7
Merge pull request #1724 from matrix-org/t3chguy/nvl/rich_quoting_nullguard 
Null guard against falsey (non-null) props.node, to make react happy
 2018-01-31 18:10:52 +00:00
Weblate
f193b3ae2c Merge remote-tracking branch 'origin/develop' into develop 2018-01-30 15:21:19 +00:00
David Baker
cfd1f28258
Merge pull request #1722 from matrix-org/luke/load-tags-after-first-sync 
Use correct condition for getting account data after first sync
 2018-01-30 15:21:12 +00:00
Michael Telatynski
8a6727ea98
This is actually MFileBody not MImageBody, change classname 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-30 10:55:23 +00:00
Weblate
1fa9e7420f Merge remote-tracking branch 'origin/develop' into develop 2018-01-30 10:27:20 +00:00
Марко М. Костић
977dec40a3 Translated using Weblate (Serbian) 
Currently translated at 60.8% (599 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sr/
 2018-01-30 10:27:19 +00:00
Szimszon
fd4fc883c1 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (984 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-01-30 10:27:19 +00:00
Walter
5e34c8043f Translated using Weblate (German) 
Currently translated at 98.9% (974 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-01-30 10:27:19 +00:00
Xose M
8d902010f8 Translated using Weblate (Galician) 
Currently translated at 99.1% (976 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/gl/
 2018-01-30 10:27:18 +00:00
Nathan van Beelen
4afdefb926 Translated using Weblate (Dutch) 
Currently translated at 73.9% (728 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2018-01-30 10:27:18 +00:00
Simó Albert i Beltran
5c7bdcec4f Translated using Weblate (Catalan) 
Currently translated at 88.5% (871 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
 2018-01-30 10:27:18 +00:00
Osoitz
819dd93d1f Translated using Weblate (Basque) 
Currently translated at 100.0% (984 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-30 10:27:18 +00:00
David Baker
c7afaed3a7
Merge pull request #1725 from matrix-org/luke/fix-room-list-reordering 
Fix order calculation logic when reordering a room
 2018-01-30 10:27:13 +00:00
lukebarnard
c5a3a02e1d Fix order calculation logic when reordering a room 2018-01-30 10:14:05 +00:00
Michael Telatynski
6dd63ae644
Null guard against falsey (non-null) props.node, to make react happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-29 19:17:46 +00:00
Michael Telatynski
5764280588
Persist contentState when sending SlashCommand via MessageComposerInput 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-29 09:09:22 +00:00
Michael Telatynski
56927b23e6
pass onWidgetLoad (which is required for SOME EventTileTypes) 
XXX: they should follow an interface, this is somewhat nasty

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-28 22:14:22 +00:00
lukebarnard
40907ecf29 Use correct condition for getting account data after first sync 
so that we can get tags sooner.
 2018-01-26 19:39:06 +01:00
d1d4c
6fa217742f Translated using Weblate (Catalan) 
Currently translated at 88.5% (871 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
 2018-01-26 13:06:57 +00:00
lukebarnard
4820a195ab Remove logging 2018-01-26 09:15:03 +01:00
Simó Albert i Beltran
18bf9ef598 Translated using Weblate (Catalan) 
Currently translated at 88.5% (871 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
 2018-01-26 02:45:23 +00:00
lukebarnard
73e3a594ac Prevent TagTiles from being dragged into other droppables 
for the time being at least.
 2018-01-25 22:52:19 +01:00
lukebarnard
701abb6a21 Move management of room lists to RoomListStore 
this is part maintenance to make RoomList clearer and part
allowing room list state to be modified via a dispatch.
 2018-01-25 22:16:03 +01:00
lukebarnard
d0e3319bd9 Remove DragDropContext from TagPanel and RoomList 
So that we can have one context that can handle DND between
the TagPanel and RoomList.
 2018-01-25 22:05:20 +01:00
lukebarnard
815f52587b Move TagPanel out of LoggedInView 
(...and into LeftPanel in riot-web. Can we merge the projects yet?)
 2018-01-25 21:53:34 +01:00
lukebarnard
38de8a129b Add transaction capability to asyncActions 
for relating pending/success/failure actions. Particularly useful for mapping
a failure to a pending action to roll back any optimistic updates.
 2018-01-25 21:45:21 +01:00
d1d4c
9223a5db9e Translated using Weblate (Catalan) 
Currently translated at 83.6% (823 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
 2018-01-25 17:48:58 +00:00
Szimszon
e78659642e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (984 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-01-25 15:23:22 +00:00
Michael Telatynski
56bd4b7d06 Fix not showing Invited section if all invites are 3PID 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-25 12:18:02 +00:00
Osoitz
c86c12de40 Translated using Weblate (Basque) 
Currently translated at 100.0% (984 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-25 10:28:23 +00:00
Michael Telatynski
3060ec1053 Use invite_3pid prop of createRoom instead of manual invite after create 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-25 09:54:31 +00:00
Andrey
dd4cef4c3e Translated using Weblate (Russian) 
Currently translated at 100.0% (984 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-25 04:48:39 +00:00
Jeff Huang
00f52edf4c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (984 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-01-25 03:04:15 +00:00
Kévin C
899192b019 Translated using Weblate (French) 
Currently translated at 100.0% (984 of 984 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-01-24 20:27:07 +00:00