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

11089 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
Weblate
d8d7ff223f Merge remote-tracking branch 'origin/develop' into develop 2018-07-11 08:10:33 +00: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
Michael Telatynski
abbb69dc36
fix fn call, fixes usage of SlashCommands 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-10 17:35:13 +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
Weblate
f2e3e30af8 Merge remote-tracking branch 'origin/develop' into develop 2018-07-10 15:12:51 +00: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
Weblate
ab625d489b Merge remote-tracking branch 'origin/develop' into develop 2018-07-10 14:18:27 +00:00
Matthew Hodgson
02c6f3d168 fix typo 2018-07-10 15:18:07 +01:00
Michael Telatynski
100ecfe7ce
remove trailing spaces to make linter happy (no-trailing-spaces) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-10 10:29:52 +01:00
Michael Telatynski
58301e5dd4
navigateHistory only when at edges of document, to prevent Firefox bug 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-10 10:28:17 +01:00
Matthew Hodgson
51591a4d62 fix lint 2018-07-09 20:49:31 +01:00
Michael Telatynski
8bcb987f50
delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-07-09 20:14:37 +01:00
Weblate
2018523bdb Merge remote-tracking branch 'origin/develop' into develop 2018-07-09 19:11:29 +00:00
Matthew Hodgson
ffec1b5a95 fix lint 2018-07-09 20:11:17 +01:00
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
Weblate
288d95121f Merge remote-tracking branch 'origin/develop' into develop 2018-07-09 12:15:10 +00: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
Weblate
42b77bfc48 Merge remote-tracking branch 'origin/develop' into develop 2018-07-09 10:17:20 +00: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
Weblate
2847a5355c Merge remote-tracking branch 'origin/develop' into develop 2018-07-09 09:17:14 +00: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
Osoitz
0f1ae2b48d Translated using Weblate (Basque) 
Currently translated at 100.0% (1211 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-07-08 08:54:54 +00:00
Weblate
51dc8d9528 Merge remote-tracking branch 'origin/develop' into develop 2018-07-06 19:28:14 +00: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
Weblate
86dc444e37 Merge remote-tracking branch 'origin/develop' into develop 2018-07-06 18:17:35 +00: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