Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 14:05:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,628 Commits 206 Branches 552 Tags 519 MiB
733401652b
Commit Graph

16628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weblate
2a8831d80e Merge branch 'origin/develop' into Weblate. 2019-06-29 06:31:24 +00:00
Michael Telatynski
4427e139be
Merge pull request #3155 from matrix-org/t3chguy/avatar_cmd 
Add /myavatar command
 2019-06-29 07:31:20 +01:00
Michael Telatynski
d0c8e09532 delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-29 07:30:16 +01:00
Michael Telatynski
e39c3298d6 Emojibase data includes blank variations, accept these when scanning 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-29 07:28:09 +01:00
Michael Telatynski
77dbc79386 clean up promises properly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-29 07:05:43 +01:00
Michael Telatynski
e591d3ef76 take dirty-flag into account for editing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-29 06:52:19 +01:00
Michael Telatynski
bf9353f3af Merge branches 'develop' and 't3chguy/edit_skip_if_no_edit' of github.com:matrix-org/matrix-react-sdk into t3chguy/edit_skip_if_no_edit 2019-06-29 06:45:06 +01:00
Michael Telatynski
443c7343a0 Merge branches 'develop' and 't3chguy/fix_MELS_labs' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix_MELS_labs 2019-06-29 06:36:20 +01:00
Travis Ralston
4f6db320e3
Appease the linter 2019-06-28 16:44:19 -06:00
Travis Ralston
8905566cfb Clean up legacy breadcrumbs persistence fallback 
It's been more than a few weeks.
 2019-06-28 16:30:59 -06:00
Travis Ralston
e65cc3b189 Correctly populate the dispatch for joining a room via servers 
Fixes https://github.com/vector-im/riot-web/issues/9817
 2019-06-28 16:26:28 -06:00
Travis Ralston
12e7953f64 Append keyshare request dialogs instead of replacing the current dialog 
Fixes https://github.com/vector-im/riot-web/issues/8798

By default, Modal dialogs are put up front. For this particular dialog we don't need to deal with it right away, therefore it can wait.
 2019-06-28 14:34:19 -06:00
Travis Ralston
083c1a78ab Use the event sender instead of event ID for viaServers off a tombstone 
Fixes https://github.com/vector-im/riot-web/issues/10206
 2019-06-28 12:34:46 -06:00
Travis Ralston
c2ad9d4f53 Attach timer finished state once 2019-06-28 12:29:03 -06:00
Weblate
741a17cf5c Merge branch 'origin/develop' into Weblate. 2019-06-28 17:13:29 +00:00
Osoitz
c3893975f2 Translated using Weblate (Basque) 
Currently translated at 100.0% (1662 of 1662 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-06-28 17:13:29 +00:00
J. Ryan Stinnett
35c0c3142f
Merge pull request #3158 from matrix-org/jryans/config-docs 
Update config.json docs location
 2019-06-28 18:13:24 +01:00
Weblate
25b5e4cae4 Merge branch 'origin/develop' into Weblate. 2019-06-28 14:21:26 +00:00
J. Ryan Stinnett
2d1325686d
Merge pull request #3148 from matrix-org/matthew/fix-horizontal-scrolling 
If on trackpad, don't mess with horizontal scrolling.
 2019-06-28 15:21:22 +01:00
J. Ryan Stinnett
00dfdfe7f1
Fix linter warning 2019-06-28 15:16:44 +01:00
Weblate
2b7778f869 Merge branch 'origin/develop' into Weblate. 2019-06-28 14:12:54 +00:00
Kévin C
231e3ebf2b Translated using Weblate (French) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2019-06-28 14:12:53 +00:00
Osoitz
bdd61701dd Translated using Weblate (Basque) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2019-06-28 14:12:53 +00:00
Besnik Bleta
31320c7994 Translated using Weblate (Albanian) 
Currently translated at 99.6% (1654 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2019-06-28 14:12:53 +00:00
J. Ryan Stinnett
33425240f6
Merge pull request #3152 from matrix-org/jryans/reactions-show-all 
Limit reactions row on initial display
 2019-06-28 15:12:48 +01:00
J. Ryan Stinnett
f9e158ff68 Rename link to button 2019-06-28 14:47:41 +01:00
J. Ryan Stinnett
04398b7853 Tweak limits so show all reveals more space than itself 2019-06-28 14:46:57 +01:00
J. Ryan Stinnett
527e1e94a4 Update config.json docs location 
Part of https://github.com/vector-im/riot-web/pull/10195
 2019-06-28 13:44:18 +01:00
Weblate
3d79ceb7b3 Merge branch 'origin/develop' into Weblate. 2019-06-27 23:24:17 +00:00
Tuomas Hietala
abdd9488f8 Translated using Weblate (Finnish) 
Currently translated at 99.6% (1655 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
 2019-06-27 23:24:17 +00:00
Travis Ralston
53d7cc6799
Merge pull request #3156 from matrix-org/t3chguy/unpin_hljs 
Unpin highlight.js
 2019-06-27 17:24:12 -06:00
Weblate
53fd641c9b Merge branch 'origin/develop' into Weblate. 2019-06-27 20:10:02 +00:00
Travis Ralston
9be40a27fc
Merge pull request #3154 from matrix-org/travis/syntax-error 
Flexboxify generic error page
 2019-06-27 14:09:57 -06:00
Michael Telatynski
5473f7ba45 Unpin HLJS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-27 20:36:45 +01:00
Weblate
005485a3b7 Merge branch 'origin/develop' into Weblate. 2019-06-27 19:14:45 +00:00
Nathan Follens
e7a05f0b41 Translated using Weblate (West Flemish) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/vls/
 2019-06-27 19:14:45 +00:00
Szimszon
abe37e5fa6 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-06-27 19:14:44 +00:00
Nathan Follens
5db0192415 Translated using Weblate (Dutch) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-06-27 19:14:44 +00:00
J. A. Durieux
85159d8f7d Translated using Weblate (Dutch) 
Currently translated at 100.0% (1661 of 1661 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2019-06-27 19:14:43 +00:00
Michael Telatynski
ff8ddd6073
Merge pull request #3153 from matrix-org/t3chguy/devtools_styling 
Fix weird scrollbar when devtools is in a narrow browser
 2019-06-27 20:14:39 +01:00
Michael Telatynski
e8db379fed rename helper method 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-27 19:41:29 +01:00
Michael Telatynski
cebb2b773f Add /myavatar command 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-27 19:38:12 +01:00
Travis Ralston
7e8eda33fc Flexboxify generic error page 2019-06-27 12:10:58 -06:00
Michael Telatynski
804a0c8507 Fix weird scrollbar when devtools is in a narrow browser 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-27 18:56:22 +01:00
Travis Ralston
8bb860e870 Use fewer functions for typing in the composer 2019-06-27 10:37:33 -06:00
Travis Ralston
17ed62de7d Move MessageComposer typing timeout to TypingStore 2019-06-27 10:35:44 -06:00
Travis Ralston
eb1f911d15 Use a Timer 2019-06-27 10:29:27 -06:00
Travis Ralston
67ecf9db62 expireMs -> expireTs 2019-06-27 09:44:13 -06:00
Weblate
b47e3016eb Merge branch 'origin/develop' into Weblate. 2019-06-27 15:24:30 +00:00
Szimszon
70eaf71920 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1660 of 1660 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2019-06-27 15:24:30 +00:00