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

10706 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruno Windels
3e14cd2190
Merge pull request #2024 from matrix-org/t3chguy/improve_eventtile_error_handling 
fix nullguard on EventTile, getComponent never returns falsey, it throws
 2018-07-11 09:12:49 +01:00
Bruno Windels
4231c08951
Merge pull request #2051 from matrix-org/dbkr/fix_stickerpicker_persistedelement_usage 
Fix stickerpicker PersistedElement usage
 2018-07-11 09:10:27 +01:00
David Baker
25e453badd Fix stickerpicker PersistedElement usage 
Earlier PR changed the prop to persistKey in PersistedElement but
containerId here, so this was ending up as 'undefined'.
 2018-07-10 17:32:17 +01:00
Matthew Hodgson
b482a4cdd3
Merge pull request #2042 from matrix-org/matthew/encrypt-for-invited-users 
encrypt for invited users if history visibility allows.
 2018-07-10 16:12:45 +01:00
Matthew Hodgson
02c6f3d168 fix typo 2018-07-10 15:18:07 +01:00
Matthew Hodgson
ffec1b5a95 fix lint 2018-07-09 20:11:17 +01:00
David Baker
e90837f10b Merge branch 'master' into develop 2018-07-09 13:14:49 +01:00
David Baker
487e3cb988 v0.12.9 2018-07-09 13:11:02 +01:00
David Baker
788955aa34 Prepare changelog for v0.12.9 2018-07-09 13:11:01 +01:00
David Baker
6245d78584 Released js-sdk 2018-07-09 13:08:28 +01:00
Bruno Windels
e61317284b
Merge pull request #2031 from matrix-org/t3chguy/notif_nag_bar 
move nag bar clear statement to any desktop notif toggle not just 0->1
 2018-07-09 11:17:15 +01:00
David Baker
1646c3180c
Merge pull request #2041 from matrix-org/t3chguy/improve_devtools_perf 
use TruncatedList to prevent rendering hundreds/thousands of DOM nodes
 2018-07-09 10:17:05 +01:00
Michael Telatynski
83a7f126f9
Merge pull request #2047 from matrix-org/hs/fix-server-acl-renderer 
Fix stuff
 2018-07-06 20:28:07 +01:00
Will Hunt
6e1f62d16a
Fix stuff 2018-07-06 20:22:37 +01:00
Matthew Hodgson
aa9208d6b4
Merge pull request #2046 from Half-Shot/hs/show-server-bans 
Show m.room.server_acl
 2018-07-06 19:17:30 +01:00
Matthew Hodgson
4044185cdd
add space after commas 2018-07-06 19:17:01 +01:00
Will Hunt
83221da7d7 Delint 2018-07-06 16:54:28 +01:00
Will Hunt
9a4075c637 Semicolons 2018-07-06 16:38:04 +01:00
Will Hunt
52b1d946be Remove unused console.log 2018-07-06 16:37:52 +01:00
Will Hunt
1db803ccfc "/n" -> " " 2018-07-06 16:37:40 +01:00
Will Hunt
1ca164f1a9 Change all ban message and move further up 2018-07-06 16:36:44 +01:00
Will Hunt
12ce7839f3 Const things 2018-07-06 16:36:26 +01:00
David Baker
64542da7cb v0.12.9-rc.2 2018-07-06 15:52:10 +01:00
David Baker
584adc35ef Prepare changelog for v0.12.9-rc.2 2018-07-06 15:52:10 +01:00
David Baker
467423e0b4 js-sdk rc.1 2018-07-06 15:48:49 +01:00
David Baker
983ea950be
Merge pull request #2045 from matrix-org/luke/track-decryption-failures-specific 
Implement aggregation by error type for tracked decryption failures
 2018-07-06 15:48:22 +01:00
David Baker
7f3b5939c6
Merge pull request #2044 from matrix-org/t3chguy/optional_new_behaviour_roomsublist 
make new hiding of roomsublist behaviour opt-in
 2018-07-06 15:47:01 +01:00
Will Hunt
8b9fd7ddcb Clean up rules. 2018-07-06 15:31:21 +01:00
Luke Barnard
e6330f3136
Merge pull request #2043 from matrix-org/luke/track-decryption-failures-specific 
Implement aggregation by error type for tracked decryption failures
 2018-07-06 11:45:46 +01:00
Will Hunt
526459a9e0 Capitalise 2018-07-06 11:06:31 +01:00
Will Hunt
a6cff4a969 Show server bans in the timeline 2018-07-06 11:06:31 +01:00
Luke Barnard
5af8ddcf10 Fix import 2018-07-06 11:00:39 +01:00
Luke Barnard
15bd2e157f Test everything 2018-07-05 14:55:29 +01:00
Luke Barnard
d53c836fd7 Implement aggregation by error type for tracked decryption failures 2018-07-05 13:54:44 +01:00
Matthew Hodgson
1811d3f148 encrypt for invited users if history visibility allows. 
fixes https://github.com/vector-im/riot-web/issues/2713. requires equivalent branch in js-sdk
 2018-07-05 01:48:28 +02:00
Michael Telatynski
dc6b3cb081
showing all is pretty slow, show an additional 50 instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-04 13:07:57 +01:00
Michael Telatynski
e5392e2c00
use TruncatedList to prevent rendering hundreds/thousands of DOM nodes 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-04 12:57:22 +01:00
David Baker
de33cf1afe
Merge pull request #2030 from matrix-org/t3chguy/optional_new_behaviour_roomsublist 
make new hiding of roomsublist behaviour opt-in
 2018-07-04 11:42:33 +01:00
David Baker
6e92cc3ea3 v0.12.9-rc.1 2018-07-04 11:23:21 +01:00
David Baker
8d54cbd09e Prepare changelog for v0.12.9-rc.1 2018-07-04 11:23:20 +01:00
Michael Telatynski
168edbca16
Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist 2018-07-04 11:21:16 +01:00
David Baker
4b4864abed
Merge pull request #2040 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-07-04 11:16:13 +01:00
Weblate
64048665ad Merge remote-tracking branch 'origin/develop' into develop 2018-07-04 10:11:58 +00:00
Michael Telatynski
6c91952d26
Merge pull request #2039 from akihikodaki/sticker_upstream 
Import react as React in src/components/views/messages/MStickerBody.js
 2018-07-04 11:11:53 +01:00
Weblate
f4db42351a Merge remote-tracking branch 'origin/develop' into develop 2018-07-04 09:29:58 +00:00
Michael Telatynski
5551855133
Merge pull request #2038 from akihikodaki/group_upstream 
Import react as React in src/GroupAddressPicker.js
 2018-07-04 10:29:53 +01:00
Akihiko Odaki
f941c93322 Import react as React in src/components/views/messages/MStickerBody.js 
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
 2018-07-04 18:28:56 +09:00
Weblate
71b11199e3 Merge remote-tracking branch 'origin/develop' into develop 2018-07-04 08:20:56 +00:00
Andrey
36d3c3952b Translated using Weblate (Russian) 
Currently translated at 99.8% (1208 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-07-04 08:20:56 +00:00
RainSlide
537e8da553 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 94.5% (1144 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-07-04 08:20:55 +00:00