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

20706 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
9f04f94c65 Enable e2e and Riot tests, removing Karma 2020-01-09 17:55:57 -07:00
Travis Ralston
3591f802a8
Merge pull request #3824 from matrix-org/travis/sm-misc 
Regenerate i18n for sourcemaps branch
 2020-01-09 17:47:32 -07:00
Travis Ralston
4b65cdf3f2 Regenerate i18n 
Apparently we need to do this.
 2020-01-09 17:40:57 -07:00
Travis Ralston
4c3703a5ea
Merge pull request #3823 from matrix-org/travis/sm-fix-tests 
Fix tests for sourcemaps branch
 2020-01-09 17:38:21 -07:00
Travis Ralston
d7dd67f69e Remove subtly irrelevant package 2020-01-09 17:28:32 -07:00
Travis Ralston
aa38946166 Actually define some tests in TextualBody's test 
Jest really wants you to do things the right way.
 2020-01-09 17:24:13 -07:00
Travis Ralston
4bc5ada50e Fix test bootstrap for new skinning approach 2020-01-09 17:23:46 -07:00
Travis Ralston
54f3288dea Fix imports for tests 
This doesn't fix the fact that someone called it "peg".
 2020-01-09 17:23:27 -07:00
Travis Ralston
4dfbce3108 Fix languageHandler's use of $webapp languages.json for Jest 2020-01-09 17:22:50 -07:00
Travis Ralston
ffd037dfa8 Fix resolution of files for Jest 2020-01-09 17:22:21 -07:00
Travis Ralston
0e8af15b9c Add webcrypto dep back 
Probably accidentally merge-conflicted out
 2020-01-09 17:15:13 -07:00
Travis Ralston
5f51432987 Convert babel config to a different babel config 
This is needed because of https://github.com/facebook/jest/issues/6229
 2020-01-09 17:14:50 -07:00
Travis Ralston
23eb6cbeb3 Upgrade Jest and babel-jest to match js-sdk 
This also magically gets rid of a ton of errors
 2020-01-09 16:17:27 -07:00
Travis Ralston
a8c8406ac4 Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps 2020-01-09 16:06:46 -07:00
Travis Ralston
a27f2d8379
Merge pull request #3817 from matrix-org/travis/sourcemaps-develop 
Sourcemaps: develop -> feature branch
 2020-01-09 14:59:22 -07:00
Travis Ralston
135c84251c Fix more imports post-merge 2020-01-09 14:19:19 -07:00
Travis Ralston
dc914774fb Delete files that were conflicting in the merge and deleted on develop 2020-01-09 14:19:19 -07:00
Travis Ralston
a6376461d0 Use yarn's updated lockfile 
Didn't manually handle this conflict, just let yarn do its thing.
 2020-01-09 14:19:19 -07:00
Travis Ralston
19f78d4d97 Fix class construction in MemberList 2020-01-09 14:17:33 -07:00
Travis Ralston
727ce892de Fix remaining RoomView conflict 
RoomContext was pulled out to its own file.
 2020-01-09 14:17:33 -07:00
Travis Ralston
3e5cc9550b Fix import merge conflicts, removing any that aren't needed anymore 
Many imports were removed as part of refactoring work, so here we are.
 2020-01-09 14:17:33 -07:00
Travis Ralston
a0da13200f Fix conflicts in package.json 
We removed the emojistrip script
 2020-01-09 14:15:16 -07:00
Travis Ralston
fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Weblate
96125a6cbd Merge branch 'origin/develop' into Weblate. 2020-01-09 21:14:00 +00:00
Travis Ralston
d40091afc5
Merge pull request #3820 from matrix-org/travis/ftue/user-lists/4.5.5-paste 
Support pasting a bunch of identifiers into the invite dialog
 2020-01-09 14:13:55 -07:00
Weblate
664c505c2f Merge branch 'origin/develop' into Weblate. 2020-01-09 21:13:37 +00:00
Travis Ralston
ad33a2322e
Merge pull request #3819 from matrix-org/travis/ftue/user-lists/4.5-3pids 
Support 3PIDs (email addresses) in the invite dialog
 2020-01-09 14:13:32 -07:00
Travis Ralston
6ca9a7c998
Merge pull request #3766 from matrix-org/travis/babel7-wp-es6-fixes 
Misc fixes for ES6 imports/exports
 2020-01-09 14:00:59 -07:00
Weblate
57dd462807 Merge branch 'origin/develop' into Weblate. 2020-01-09 20:57:32 +00:00
catborise
5b1246324e Translated using Weblate (Turkish) 
Currently translated at 58.2% (1162 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-09 20:57:32 +00:00
Osoitz
8a2efd77ed Translated using Weblate (Basque) 
Currently translated at 100.0% (1998 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-01-09 20:57:29 +00:00
Travis Ralston
ba73600cf0
Merge pull request #3815 from matrix-org/travis/ftue/user-lists/4-composer 
Wire up the invite targets dialog to a real composer and show selections
 2020-01-09 13:57:22 -07:00
Travis Ralston
4e4871c281 Move lang import to the top of the file 2020-01-09 13:56:25 -07:00
David Baker
5019eff1e3 Don't allow upgrade from untrusted key backup. 
If we trust the key backup at upgrade time then we can sign it so
key backup will work automatically when cross-signing is trusted.
If we don't sign it at this point we'll end up with cross-signing
and key backup set up but key backup untrusted by the cross-signing
key which is a bit of a broken situation.

With https://github.com/matrix-org/matrix-js-sdk/pull/1144 fixes
https://github.com/vector-im/riot-web/issues/11747
 2020-01-09 20:49:37 +00:00
Travis Ralston
2caebef7a1 Make the SVG smaller 2020-01-09 13:40:35 -07:00
Travis Ralston
cb9e4376b8 Fix flow comment 2020-01-09 13:39:50 -07:00
Travis Ralston
94e9c6ac9f Make the SVG smaller 2020-01-09 13:38:47 -07:00
Travis Ralston
f452ea225a
FlowJS is not Flow 2020-01-09 12:31:16 -07:00
Zoe
e9032a9f61 Move the lock icon within the feather-customised directory 2020-01-09 16:00:36 +00:00
Michael Telatynski
0a9d7f43c6 pass the correct phase params for consistency 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-09 15:51:19 +00:00
Michael Telatynski
7dfc392a2b Merge branches 'develop' and 't3chguy/rightpanel' of github.com:matrix-org/matrix-react-sdk into t3chguy/rightpanel 2020-01-09 15:48:06 +00:00
Zoe
5d22561815 Display a padlock icon beside encrypted rooms in the room list 
https://github.com/vector-im/riot-web/issues/11226
 2020-01-09 15:42:31 +00:00
Weblate
3f5663071a Merge branch 'origin/develop' into Weblate. 2020-01-09 12:26:22 +00:00
Kenneth Larsson
e0d80fb8b2 Translated using Weblate (Swedish) 
Currently translated at 76.8% (1535 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2020-01-09 12:26:22 +00:00
Michael Telatynski
71b3005f1d
Merge pull request #3711 from matrix-org/t3chguy/clean_up_TextualBody 
Change ref handling in TextualBody to prevent it parsing generated nodes
 2020-01-09 12:26:15 +00:00
Michael Telatynski
f3f929207c Update yarn.lock 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-09 12:18:14 +00:00
Michael Telatynski
245a68b3ba Merge branches 'develop' and 't3chguy/clean_up_TextualBody' of github.com:matrix-org/matrix-react-sdk into t3chguy/clean_up_TextualBody 
 Conflicts:
	yarn.lock
 2020-01-09 12:17:21 +00:00
Michael Telatynski
8116ac74ce
Update src/components/views/context_menus/MessageContextMenu.js 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2020-01-09 12:10:44 +00:00
Weblate
9b8ce0de52 Merge branch 'origin/develop' into Weblate. 2020-01-09 04:38:44 +00:00
Kenneth Larsson
9cd364b0e2 Translated using Weblate (Swedish) 
Currently translated at 76.3% (1525 of 1998 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
 2020-01-09 04:38:44 +00:00