OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
11,368 Commits
203 Branches
553 Tags
457 MiB
Commit Graph

11368 Commits (be66f98381f50941b15bf67e7e038c597bed39b0)

Author SHA1 Message Date
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
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
Weblate fdd3b966e3 Merge remote-tracking branch 'origin/develop' into develop 2018-07-06 10:45:53 +00:00
kR c4d66b6c56 Translated using Weblate (Polish) 
Currently translated at 93.6% (1134 of 1211 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-07-06 10:45:53 +00:00
Bamstam db860441bc Translated using Weblate (German) 
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/de/
 2018-07-06 10:45:52 +00: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
David Baker b6f854abe4 Simplify event name as it's the only one 2018-07-05 20:00:42 +01:00
David Baker 3f20eb9610 Use more helpful dialog tracking title 2018-07-05 19:58:54 +01:00
David Baker c26b300f30 more comments 2018-07-05 19:58:10 +01:00
David Baker 658ac73064 comments 2018-07-05 19:57:24 +01:00
David Baker 3f60300983 Remove redundant check 2018-07-05 19:51:12 +01:00
David Baker 8c10dc1860 Remove unhelpful commented code 2018-07-05 19:50:11 +01:00
David Baker 7e2b559ccd Make if clearer 2018-07-05 19:46:37 +01:00
David Baker fb7ce9dd7f More doc 2018-07-05 19:40:45 +01:00
David Baker 1f2d279a0a Consistency, redundant check & doc 2018-07-05 19:38:42 +01:00