94d23c815a
Improve naming of Jitsi conferences
...
Fixes https://github.com/vector-im/riot-web/issues/12812
2020-03-20 14:19:47 -06:00
d593a76f28
Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd
2020-03-18 20:41:13 +00:00
cad28c81c0
Add Keyboard shortcuts dialog
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 16:40:21 +00:00
42ee157645
Merge pull request #4217 from matrix-org/t3chguy/gemini
...
Remove Gemini Scrollbars
2020-03-18 14:03:51 +00:00
b09c063d1b
Reset matrix-js-sdk back to develop branch
2020-03-17 14:25:44 +00:00
8e8723bb36
Merge branch 'master' into develop
2020-03-17 14:24:35 +00:00
83b6155637
Upgrade matrix-js-sdk to 5.1.1
2020-03-17 14:12:15 +00:00
44b0aa2d88
Remove remainders of gemini-scrollbar and react-gemini-scrollbar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 10:31:45 +00:00
57a61efabf
Remove stuff that yarn install doesn't think we need
2020-03-12 10:46:42 -06:00
1a1782fc06
Merge pull request #4201 from matrix-org/dbkr/yarn_upgrade_20200311
...
yarn upgrade
2020-03-12 09:45:32 +00:00
7dd7417f12
Enable support for TypeScript in components
...
Includes: compilation, translations, IDE support (use .tsx not .ts), typings, and other build tools.
TypeScript component have to import PropTypes and React with `import * as React from 'react';`
2020-03-11 18:03:43 -06:00
57022d9355
Reset matrix-js-sdk back to develop branch
2020-03-11 16:25:15 +00:00
15d5190b9b
js-sdk rc.1
2020-03-11 16:18:08 +00:00
6b4d3cad7c
yarn upgrade
2020-03-11 14:54:03 +00:00
845656064e
Reset matrix-js-sdk back to develop branch
2020-03-04 11:58:00 +00:00
00dc187f71
Reset matrix-js-sdk back to develop
2020-03-02 17:43:21 +00:00
55419a1bf5
Merge branch 'master' into develop
2020-03-02 17:39:51 +00:00
7fcad8c82c
Upgrade matrix-js-sdk to 5.1.0
2020-03-02 17:29:36 +00:00
65e002cfe9
Upgrade deps
2020-02-26 15:03:24 +00:00
9afa66364e
Upgrade matrix-js-sdk to 5.1.0-rc.1
2020-02-26 14:24:58 +00:00
f74b283287
Merge pull request #4091 from matrix-org/travis/qr-binary
...
Use binary packing for verification QR codes
2020-02-21 10:05:12 -07:00
766f523c00
Reset matrix-js-sdk back to develop branch
2020-02-20 11:41:53 +00:00
45963adeb4
Use binary packing for verification QR codes
...
Fixes https://github.com/vector-im/riot-web/issues/12257
Fixes https://github.com/vector-im/riot-web/issues/12375
We do not remove the existing QR code library in this commit because it is still used elsewhere (like the share dialog).
This should be as accurate as possible to what [MSC1543](https://github.com/matrix-org/matrix-doc/pull/1544 ) asks for.
2020-02-19 17:02:14 -07:00
a687d158e8
Released js-sdk
2020-02-19 15:59:37 +00:00
34dbeb0604
Released js-sdk
2020-02-17 13:21:07 +00:00
1970dbff94
Try JS SDK upgrade one more time
2020-02-13 17:43:27 +00:00
163539d9f4
Upgrade JS SDK to 5.0.0-rc.1
2020-02-13 15:57:48 +00:00
805e9abb39
Flip back to develop
2020-01-27 16:00:25 +00:00
692c993a34
js-sdk v4.0.0
2020-01-27 11:40:05 +00:00
a330ee186a
Move & upgrade babel runtime into dependencies (like it wants)
...
https://babeljs.io/docs/en/babel-runtime
2020-01-23 15:43:48 -07:00
d2ef6ba3f5
js-sdk 4.0.0-rc.1
2020-01-20 14:27:19 +00:00
f228f70987
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/deps
2020-01-18 02:02:51 +00:00
c97de43f69
Remove unused fetch polyfills, querystring, require-json. Move glob to dev-dep
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-18 02:01:45 +00:00
9365a9cb30
Remove lolex where its not needed and move to dev-deps. Remove unused optimist
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-18 01:39:14 +00:00
f535fdbcaa
Update chokidar to fix reskindex not working
...
The major version bump doesn't appear to affect us. It wasn't working before on Windows, but now it is.
2020-01-16 15:39:07 -07:00
d763d7e633
Merge branch 'develop' into travis/ftue/user-lists/5.2-i18n
2020-01-15 10:49:38 -07:00
b69b284efa
Humanize the recent DM rooms ourselves for translations
2020-01-13 21:20:01 -07:00
5fd27a10bb
Merge branch 'develop' into travis/sourcemaps
2020-01-13 11:19:41 -07:00
389e1194ff
Merge branch 'master' into develop
2020-01-13 13:09:56 +00:00
9a3ca28978
js-sdk 3.0.0
2020-01-13 13:01:36 +00:00
d7dd67f69e
Remove subtly irrelevant package
2020-01-09 17:28:32 -07:00
0e8af15b9c
Add webcrypto dep back
...
Probably accidentally merge-conflicted out
2020-01-09 17:15:13 -07:00
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
a8c8406ac4
Merge remote-tracking branch 'origin/t3chguy/jest' into travis/sourcemaps
2020-01-09 16:06:46 -07:00
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
fde32f13a5
[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop
2020-01-09 14:15:09 -07:00
f3f929207c
Update yarn.lock
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-09 12:18:14 +00:00
1d9d706b9c
Merge pull request #3789 from matrix-org/t3chguy/render_html_entities_in_og-description
...
Render encoded html entities in og:description
2020-01-08 21:38:31 -07:00
6b8f6239c5
js-sdk 3.0.0-rc.1
2020-01-06 13:58:43 +00:00
93c4439045
js-sdk rc.1
2020-01-06 13:30:56 +00:00
Travis Ralston