OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
10,779 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

10779 Commits (0d0934add7d83d7b1eac6ca5f92c9b985eee58c9)

Author SHA1 Message Date
Matthew Hodgson 0d0934add7
unbreak modifier+space (e.g. emoji insert on macOS) 
(cherry picked from commit c490f87)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:58:04 +01:00
Matthew Hodgson 021409aafe
apply review feedback from @lukebarnard1 
(cherry picked from commit 37d4bce)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:54:57 +01:00
Matthew Hodgson 83f2614919
add guide to slate's data formats and how we convert 
(cherry picked from commit e7e4ee8)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:54:10 +01:00
Matthew Hodgson 8665f10f27
pin slate to 0.33.4 to avoid https://github.com/ianstormtaylor/slate/pull/1958 
(cherry picked from commit 445faca)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:53:47 +01:00
Michael Telatynski 5bd4104c96
modify ComposerHistoryManager 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit d139dd6)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:43:57 +01:00
Michael Telatynski 5b74c615ae
add missing import 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 47b6099)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:42:57 +01:00
Michael Telatynski 43204ea177
fix Control-Backspace after select-all 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 0f32ec0)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:42:10 +01:00
Michael Telatynski faf17f06c6
remove debugger statement 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit b6f7940)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:40:36 +01:00
Michael Telatynski 483116fb03
add rule to slate-md-serializer: make underlined and removed work for CM 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit b521efd)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:40:29 +01:00
Michael Telatynski 372fa29ad3
take edge into consideration when moving focus region on arrow keys 
fixes: >Pressing right when the caret is immediately left of some entity (pill, emojione emoji, etc..) causes the caret to jump to the left of the next entity (or end of the message if there are no more entities)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 0982617)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:40:20 +01:00
Michael Telatynski c6837af398
import-type Change from slate 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 85ed499)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 19:40:00 +01:00
Matthew Hodgson efdc5430d7 merge develop 2018-07-09 17:50:07 +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
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
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
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
Luke Barnard bfbd499737
Merge pull request #2036 from matrix-org/dbkr/many_persistedelements 
Give PersistedElement a key
 2018-07-04 09:20:50 +01:00
Akihiko Odaki 2ddcb83e8d Import react as React in src/GroupAddressPicker.js 
Signed-off-by: Akihiko Odaki <nekomanma@pixiv.co.jp>
 2018-07-04 10:57:03 +09:00
David Baker ad35fbf208 Pull out z-index to the sticker picker 
As it's not a thing that's necessary for other PersistedElements,
only the sticker picker because it has to sit above the ContextMenu
it sits in.
 2018-07-03 18:25:33 +01:00
Paweł Kozioł b69eb8fc88 Translated using Weblate (Polish) 
Currently translated at 92.8% (1124 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-07-03 17:15:28 +00:00
Slavi Pantaleev c0aa1f1196 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (1210 of 1210 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-07-03 14:35:34 +00:00
David Baker 74f2d0a360 Use inline class field for PropTypes 2018-07-03 14:54:43 +01:00