mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-19 15:42:44 +03:00
Code Issues Projects Releases Packages Wiki Activity
62589 commits 219 branches 562 tags 474 MiB
Commit graph

3289 commits

Author SHA1 Message Date
RiotRobot
4fced076b7 Upgrade matrix-js-sdk to 5.1.0-rc.1 2020-02-26 14:33:57 +00:00
RiotRobot
9afa66364e Upgrade matrix-js-sdk to 5.1.0-rc.1 2020-02-26 14:24:58 +00:00
Travis Ralston
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
J. Ryan Stinnett
de71e36843 Reset matrix-react-sdk back to develop branch 2020-02-20 12:01:58 +00:00
J. Ryan Stinnett
120d36d70b Reset matrix-js-sdk back to develop branch 2020-02-20 12:01:58 +00:00
J. Ryan Stinnett
766f523c00 Reset matrix-js-sdk back to develop branch 2020-02-20 11:41:53 +00:00
Travis Ralston
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
RiotRobot
dafb2f01b1 released react-sdk & js-sdk 2020-02-19 16:20:44 +00:00
RiotRobot
a687d158e8 Released js-sdk 2020-02-19 15:59:37 +00:00
RiotRobot
9b5655c1fa Released js-sdk & react-sdk 2020-02-17 13:39:24 +00:00
RiotRobot
34dbeb0604 Released js-sdk 2020-02-17 13:21:07 +00:00
RiotRobot
35204416bf Upgrade JS SDK to 5.0.0-rc.1 and React SDK to 2.1.0-rc.2 2020-02-13 17:50:29 +00:00
RiotRobot
1970dbff94 Try JS SDK upgrade one more time 2020-02-13 17:43:27 +00:00
RiotRobot
163539d9f4 Upgrade JS SDK to 5.0.0-rc.1 2020-02-13 15:57:48 +00:00
J. Ryan Stinnett
3eb5eb1d21 Upgrade electron-builder 2020-02-13 14:50:19 +00:00
J. Ryan Stinnett
8ca6c2c433 Flip SDKs back to develop 2020-01-27 16:01:12 +00:00
J. Ryan Stinnett
805e9abb39 Flip back to develop 2020-01-27 16:00:25 +00:00
RiotRobot
dd26d43173 js-sdk 4.0.0 & react-sdk 2.0.0 2020-01-27 11:52:18 +00:00
RiotRobot
692c993a34 js-sdk v4.0.0 2020-01-27 11:40:05 +00:00
Travis Ralston
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
David Baker
eb5e14661d Actually pull in react-sdk rc.2 2020-01-22 14:20:46 +00:00
David Baker
8913eba60d react-sdk rc.2 2020-01-22 13:06:37 +00:00
David Baker
c3a5e2e5d3 react-sdk & js-sdk rc.1 2020-01-20 14:36:12 +00:00
David Baker
d2ef6ba3f5 js-sdk 4.0.0-rc.1 2020-01-20 14:27:19 +00:00
Michael Telatynski
f228f70987 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/deps 2020-01-18 02:02:51 +00:00
Michael Telatynski
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
Michael Telatynski
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
Travis Ralston
b965188a5f Run the react-sdk reskindexer for developers 
See https://github.com/matrix-org/matrix-react-sdk/pull/3856 for why chokidar was updated.
 2020-01-16 15:40:34 -07:00
Travis Ralston
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
Travis Ralston
5cd54e9f6d Use jsdom 14 instead of 13 2020-01-15 15:30:40 -07:00
Travis Ralston
5c915f3d02 Add canvas package so COLR check passes in tests 
This is required for jsdom to do the right thing.

We also have to bump the jsdom version, but to do that we need an alternative test environment because Jest has it pinned lower.
 2020-01-15 14:42:00 -07:00
Travis Ralston
161a1342b2 Swap over to Jest, breaking everything 2020-01-15 13:24:19 -07:00
Travis Ralston
d763d7e633 Merge branch 'develop' into travis/ftue/user-lists/5.2-i18n 2020-01-15 10:49:38 -07:00
Travis Ralston
b69b284efa Humanize the recent DM rooms ourselves for translations 2020-01-13 21:20:01 -07:00
Travis Ralston
f73d2bae1f Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:22:47 -07:00
Travis Ralston
5fd27a10bb Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:19:41 -07:00
RiotRobot
057f78fadc released react-sdk & js-dk 2020-01-13 13:12:29 +00:00
RiotRobot
389e1194ff Merge branch 'master' into develop 2020-01-13 13:09:56 +00:00
RiotRobot
9a3ca28978 js-sdk 3.0.0 2020-01-13 13:01:36 +00:00
Travis Ralston
d7dd67f69e Remove subtly irrelevant package 2020-01-09 17:28:32 -07:00
Travis Ralston
0e8af15b9c Add webcrypto dep back 
Probably accidentally merge-conflicted out
 2020-01-09 17:15:13 -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
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
fde32f13a5 [CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop 2020-01-09 14:15:09 -07:00
Michael Telatynski
f3f929207c Update yarn.lock 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-09 12:18:14 +00:00
Travis Ralston
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
Travis Ralston
ec66069e96 Update build scripts for new process 
We have to convert *something* to TypeScript so it doesn't complain that there's nothing to compile, so this converts the easiest utility library.

Many of the scripts are copied from the react-sdk.
 2020-01-08 16:09:42 -07:00
RiotRobot
a1b14751e5 bump to matrix-react-sdk rc.2 2020-01-08 11:22:50 +00:00
RiotRobot
f7618e3c73 react-sdk & js-sdk rc.1 2020-01-06 14:05:47 +00:00
RiotRobot
6b8f6239c5 js-sdk 3.0.0-rc.1 2020-01-06 13:58:43 +00:00
RiotRobot
93c4439045 js-sdk rc.1 2020-01-06 13:30:56 +00:00
Michael Telatynski
d31c863563 Remove all usages of slate in favour of CIDER 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-06 00:15:48 +00:00
Michael Telatynski
4bea87f00d Merge branches 'develop' and 't3chguy/render_html_entities_in_og-description' of github.com:matrix-org/matrix-react-sdk into t3chguy/render_html_entities_in_og-description 
 Conflicts:
	package.json
 2020-01-05 22:23:03 +00:00
Michael Telatynski
378a82e6fb Use html-entities instead 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-01-05 22:22:09 +00:00
Travis Ralston
4de0f7257a Initial implementation of FTUE user lists design 
This covers the "recents" section and rough design exclusively. It is known that the Field does nothing and that there's a bunch of missing functionality - this is to be iterated upon in future PRs. Labs flag is to aide development and should be removed in a very near future PR.

Also, this is focusing on DMs and not user lists in general because I misinterpreted the scope. I'll fix this in a future PR and instead make this the best DM invite dialog it can be.

Closes https://github.com/vector-im/riot-web/issues/11197
 2020-01-02 17:40:18 -07:00
Travis Ralston
1b41dc3291 Make the webpack config work for us 
This moves the babel and postcss configs into the webpack config for ease of maintenance (and because we need variations of them). The typescript config is left outside the webpack config for IDEs to pick it up.
 2019-12-23 19:51:01 -07:00
Travis Ralston
23e5333935 Introduce babel's export-default-from plugin to fix build errors 
We do a lot of default exporting, so we kinda need this. It even asks for it to be installed when it is missing.
 2019-12-22 21:36:56 -07:00
Michael Telatynski
4fe0150944 Regen yarn.lock 2019-12-19 10:51:55 +00:00
Michael Telatynski
4a2217bb79 Regenerate yarn.lock 2019-12-16 12:23:21 +00:00
Michael Telatynski
6f06716954 Regenerate yarn.lock 2019-12-13 13:10:30 +00:00
Travis Ralston
20a615396b Implementation of new potential skinning mechanism 
With a switch to Only One Webpack™ we need a way to help developers generate the component index without a concurrent watch task. The best way to do this is to have developers import their components, but how do they do that when we support skins? The answer in this commit is to change skinning.

Skinning now expects to receive your list of overrides instead of the react-sdk+branded components. For Riot this means we send over *only* the Vector components and not Vector+react-sdk. 

Components can then be annotated with the `replaceComponent` decorator to have them be skinnable. The decorator must take a string with the dot path of the component because we can't reliably calculate it ourselves, sadly. 

The decorator does a call to `getComponent` which is where the important part of the branded components not including the react-sdk is important: if the branded app includes the react-sdk then the decorator gets executed before the skin has finished loading, leading to all kinds of fun errors. This is also why the skinner lazily loads the react-sdk components to avoid importing them too early, breaking the app.

The decorator will end up receiving null for a component because of the getComponent loop mentioned: the require() call is still in progress when the decorator is called, therefore we can't error out. All usages of getComponent() within the app are safe to not need such an error (the return won't be null, and developers shouldn't use getComponent() after this commit anyways).

The AuthPage, being a prominent component, has been converted to demonstrate this working. Changes to riot-web are required to have this work.

The reskindex script has also been altered to reflect these skinning changes - it no longer should set the react-sdk as a parent. The eventual end goal is to get rid of `getComponent()` entirely as it'll be easily replaced by imports.
 2019-12-12 19:48:45 -07:00
Travis Ralston
ff584d1644 yarn.lock changes for upgrade 2019-12-12 14:38:12 -07:00
J. Ryan Stinnett
0930424406 Further attempt to flip to develop 2019-12-11 15:56:59 +00:00
J. Ryan Stinnett
108293dcba Flip back to develop 2019-12-11 10:39:04 +00:00
J. Ryan Stinnett
dd9eda8f97 Flip back to develop 2019-12-11 10:37:36 +00:00
RiotRobot
b7f6d7b102 Merge branch 'master' into develop 2019-12-09 11:43:27 +00:00
RiotRobot
45d51f56f2 Released js-sdk & react-sdk 2019-12-09 11:38:11 +00:00
Michael Telatynski
4be8b87869 Add what-input to allow different scoping to focus-visible for MessageActionBar keyboard a11y 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-12-07 13:07:52 +00:00
David Baker
60467ffd02 yarn upgrade 
attempt 2
 2019-12-06 15:58:44 +00:00
David Baker
e2b1a86a29 Remove draft-js dependency 
...which for some reason was still kicking around
 2019-12-06 13:33:30 +00:00
David Baker
f93b7a1675 Add transform-async-to-bluebird 
Add babel plugin until the js-sdk stop using bluebird, since we
force-recompile the js-sdk so we need the plugin installed for that
to work (and it's a devDependency on js-sdk so doesn't otherwise get
installed).
 2019-12-04 14:25:21 +00:00
David Baker
5b64c1c6e7 yarn upgrade 2019-12-04 14:22:00 +00:00
David Baker
577e614fa4 Add transform-async-to-bluebird 
Add babel plugin until the js-sdk stop using bluebird, since we
force-recompile the js-sdk so we need the plugin installed for that
to work (and it's a devDependency on js-sdk so doesn't otherwise get
installed).
 2019-12-04 13:52:59 +00:00
RiotRobot
c99cd9fc58 js-sdk & react-sdk rc.1 2019-12-04 12:05:56 +00:00
J. Ryan Stinnett
31ee75f14f Flip SDKs back to develop 2019-11-27 13:33:27 +00:00
J. Ryan Stinnett
54d6b6aa73 Flip JS SDK back to develop 2019-11-27 13:31:44 +00:00
RiotRobot
ff452b9d87 Merge branch 'master' into develop 2019-11-27 10:54:58 +00:00
RiotRobot
10c5485373 Upgrade to JS SDK 2.4.5 and React SDK 1.7.4 2019-11-27 10:44:15 +00:00
RiotRobot
6223ca8243 Merge branch 'master' into develop 2019-11-27 10:39:33 +00:00
RiotRobot
d9e322bbca Upgrade to JS SDK 2.4.5 2019-11-27 10:32:21 +00:00
David Baker
f09a123a87 Add postcss-easings 
So we can use names like easeInSine in CSS transitions rather than
cubic-bezier(0.47, 0, 0.745, 0.715)

Required for https://github.com/matrix-org/matrix-react-sdk/pull/3674
 2019-11-26 19:12:28 +00:00
RiotRobot
acd7e028d5 Merge branch 'master' into develop 2019-11-25 13:43:52 +00:00
RiotRobot
83591b4567 Released js-sdk & react-sdk 2019-11-25 13:36:37 +00:00
RiotRobot
a6fdd5e5dd Merge branch 'master' into develop 2019-11-25 13:35:30 +00:00
RiotRobot
942db34e92 released js-sdk 2019-11-25 13:27:15 +00:00
RiotRobot
1cebd3dcd1 react-sdk rc.2 2019-11-22 17:27:27 +00:00
Michael Telatynski
eac6c46d28 Merge branches 'develop' and 't3chguy/remove_bluebird' of https://github.com/vector-im/riot-web into t3chguy/remove_bluebird 2019-11-22 14:00:02 +00:00
Michael Telatynski
d3f872bf7a Merge branches 'develop' and 't3chguy/remove_bluebird' of github.com:matrix-org/matrix-react-sdk into t3chguy/remove_bluebird 2019-11-21 11:15:32 +00:00
Michael Telatynski
97abce1ca6 Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-20 22:32:12 +00:00
Michael Telatynski
fccf9f138e Add eslint-plugin-jest because we inherit js-sdk's eslintrc and it wants 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-11-20 22:32:11 +00:00
RiotRobot
f07e3c3b25 react-sdk & js-sdk rc.1 2019-11-20 18:31:32 +00:00
RiotRobot
966f84115d js-sdk rc.1 2019-11-20 18:26:29 +00:00
Michael Telatynski
d4d51dc61f Rip out the remainder of Bluebird 2019-11-18 10:03:05 +00:00
Travis Ralston
6d0b388fa2
Merge branch 'develop' into travis/mjolnir 2019-11-12 10:00:01 -07:00
Travis Ralston
bdcf3890a5 Fix HTML fallback in replies 
Correctly encode the `body` to avoid problems down the line. We also convert newlines to `<br/>` to better represent the message as a fallback.

Fixes https://github.com/vector-im/riot-web/issues/9413
 2019-11-08 16:07:11 -07:00
RiotRobot
15c0561588 released react-sdk 2019-11-06 14:24:59 +00:00
Michael Telatynski
385ad5f9ce Don't transform async at all, all browsers we care about support it 2019-11-05 10:43:05 +00:00
David Baker
e006e92255 Upgrade electron-notarize 
To include https://github.com/electron/electron-notarize/pull/14
 2019-11-04 18:56:41 +00:00
Michael Telatynski
7391846eda
Merge pull request #11306 from vector-im/t3chguy/add_eslint-plugin-react-hooks 
Add dependency to eslint-plugin-react-hooks as react-sdk did
 2019-11-04 16:58:26 +00:00
Michael Telatynski
f3656c2792 Add dependency to eslint-plugin-react-hooks as react-sdk did 2019-11-04 16:52:23 +00:00
RiotRobot
6d553d1ecd Released react-sdk & js-sdk 2019-11-04 15:14:59 +00:00
RiotRobot
aba557f023 Released react-sdk 2019-11-04 15:09:19 +00:00
Michael Telatynski
10e1d9093e transform-async-to-promises: get rid of bluebird 2019-11-04 12:46:28 +00:00
RiotRobot
0c18f944cc react-sdk rc.2 2019-11-01 10:22:09 +00:00
Travis Ralston
e6e12df82d Add structural base for handling Mjolnir lists 2019-10-31 13:20:18 -06:00
RiotRobot
f7bb2c02fb js-sdk & react-sdk rc.1 2019-10-30 16:50:31 +00:00
RiotRobot
8dfa464202 js-sdk rc.1 2019-10-30 16:44:18 +00:00
Michael Telatynski
c5d5cd72bc
Merge pull request #3465 from matrix-org/t3chguy/nvl/userinfo 
UserInfo consolidation of GroupMemberInfo and MemberInfo panels
 2019-10-21 15:50:08 +01:00
Michael Telatynski
0e6359ab24 replace @use-it/event-listener as it doesn't like Node EE's 2019-10-19 16:39:06 +01:00
J. Ryan Stinnett
14f59801d7 Change back to develop branch for deps 2019-10-18 16:14:28 +01:00
J. Ryan Stinnett
5333201823 Change back to develop branch for deps 2019-10-18 16:12:20 +01:00
RiotRobot
e275441701 Upgrade to JS SDK v2.4.2 and React SDK v1.7.0 2019-10-18 14:54:02 +01:00
RiotRobot
d05ef40694 Merge branch 'master' into develop 2019-10-18 14:49:40 +01:00
RiotRobot
21bb1dc837 Upgrade to JS SDK v2.4.2 2019-10-18 14:43:08 +01:00
J. Ryan Stinnett
77731b5674 Merge 'dbkr/windows_signing' into v1.5.0 2019-10-18 14:24:57 +01:00
David Baker
5a7efcd738 Sign the main executable on windows 
and automate the signing of the installers
 2019-10-11 12:01:50 +01:00
David Baker
0259eb6419 Go back to upstream electron-notarize 
It doesn't work as a github dependency because the typescript
doesn't get built.
 2019-10-10 18:34:26 +01:00
David Baker
a7d1d9880b Use my fork of electron-notarize 
if only to test it
 2019-10-10 14:56:35 +01:00
David Baker
29f186bc18 add electron-notarize 2019-10-10 11:57:39 +01:00
RiotRobot
b18e4f079f js-sdk & react-sdk rc.1 2019-10-09 17:00:22 +01:00
RiotRobot
bd7e909699 js-sdk rc.1 2019-10-09 16:54:05 +01:00
David Baker
b6d1d0bf5d Bump Olm to 3.1.4 for olm_session_describe 2019-10-09 15:40:25 +01:00
Michael Telatynski
aae5bb9f39 Use new React Shallow renderer with hooks support 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-09 13:08:16 +02:00
Michael Telatynski
efeb6e87c4 Use new React Shallow renderer with hooks support 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-09 12:51:08 +02:00
Michael Telatynski
df02eb8e92 Add UserInfo panel (consolidation of MemberInfo & GroupMemberInfo) Labs 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-10-07 16:52:50 +01:00
David Baker
40969c60a9
Revert "Run yarn upgrade" 2019-10-04 16:28:13 +01:00
David Baker
b99bdbcd4e
Revert "Run yarn upgrade" 2019-10-04 16:19:29 +01:00
David Baker
64a961ec00 Run yarn upgrade 2019-10-04 11:13:03 +01:00
David Baker
eda8434444 run yarn upgrade 2019-10-04 11:09:46 +01:00
David Baker
af57c9e321 js-sdk & react-sdk develop 2019-10-04 11:08:08 +01:00
David Baker
dc9018dc11 js-sdk develop 2019-10-04 11:07:22 +01:00
RiotRobot
b333058b57 released react-sdk 2019-10-04 10:39:53 +01:00
David Baker
d83c942fe5 released js-sdk & react-sdk 2019-10-02 10:30:13 +01:00
David Baker
3c5880e5ee use released js-sdk 2019-10-02 10:19:51 +01:00
Michael Telatynski
c5fd92bfeb
Merge pull request #3501 from TheTimeWalker/patch-1 
Update stripped emoji and bump emojidata to 4.0.2
 2019-10-01 17:28:37 +01:00
Tony Stipanic
cfff39b58b Update stripped emoji and bump emojidata to 4.0.2 2019-10-01 18:05:25 +02:00
J. Ryan Stinnett
f7a08e8d27 Change back to develop branch for deps 2019-10-01 13:32:36 +01:00
J. Ryan Stinnett
617a5290f9 Change back to develop branch for deps 2019-10-01 13:30:13 +01:00
RiotRobot
55fe24e72c Upgrade to React SDK 1.6.1 and JS SDK 2.4.1 2019-10-01 11:47:44 +01:00
RiotRobot
fa12b60c4a Upgrade to JS SDK 2.4.1 2019-10-01 11:35:33 +01:00
J. Ryan Stinnett
ee827c917e Upgrade deps 2019-09-27 15:18:47 +01:00
J. Ryan Stinnett
de3e0c45f9 Upgrade deps 2019-09-27 15:18:11 +01:00
J. Ryan Stinnett
6094b8be9a Change back to develop branch for deps 2019-09-27 14:46:05 +01:00
J. Ryan Stinnett
9221dcd154 Change back to develop branch for deps 2019-09-27 14:39:59 +01:00
RiotRobot
d76ed50625 Upgrade to React SDK 1.6.0 and JS SDK 2.4.0 2019-09-27 12:09:11 +01:00
RiotRobot
709504ff80 Upgrade to JS SDK 2.4.0 2019-09-27 11:48:33 +01:00
J. Ryan Stinnett
5a8943353f Merge branch 't3chguy/accesibility' into release-v1.6.0 2019-09-27 10:17:30 +01:00
Michael Telatynski
8d1d3090f3 Improve keyboard accessibility using :focus-visible CSS polyfill 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-27 09:00:54 +01:00
RiotRobot
0e6b3eab11 Upgrade to React SDK 1.6.0-rc.2 2019-09-26 12:15:43 +01:00
RiotRobot
6db826005c Upgrade to React SDK 1.6.0-rc.1 and JS SDK 2.4.0-rc.1 2019-09-25 17:42:57 +01:00
RiotRobot
eea0999b90 Upgrade to JS SDK 2.4.0-rc.1 2019-09-25 17:22:43 +01:00
Travis Ralston
10b2501785 Upgrade lolex to pull in a clock fix 
See https://github.com/sinonjs/lolex/issues/136

We don't use fake timers, but we do use lolex's clock, which probably causes the same thing. Jumping from 2.x to 4.x looks largely compatible - tests pass.
 2019-09-17 14:37:59 -06:00
Travis Ralston
99b8193ce7 Use the new ShallowRenderer over ReactTestUtils 
Mostly because the ReactTestUtils renderer doesn't exist anymore.
 2019-09-17 14:33:32 -06:00
Travis Ralston
43d85521c4 Upgrade to develop dependencies 2019-09-17 11:05:05 -06:00
Travis Ralston
9c474da831 Bump to master commit of react-gemini-scrollbar 2019-09-17 10:55:49 -06:00
Travis Ralston
11c7d02a2d Point to develop dependencies and fixed react-gemini-scrollbar 
Fixes https://github.com/vector-im/riot-web/issues/10894

See https://github.com/matrix-org/react-gemini-scrollbar/pull/3
 2019-09-17 10:44:29 -06:00
Travis Ralston
e88c5a0da7 Use the same gemini-scrollbar version as the react-sdk 
Might fix an issue?
 2019-09-17 09:35:14 -06:00
J. Ryan Stinnett
c212b525d2 Update yarn.lock 2019-09-17 14:05:41 +01:00
RiotRobot
b0934c9121 Merge branch 'master' into develop 2019-09-16 17:59:09 +01:00
RiotRobot
9bb007f4b5 released js-sdk & react-sdk 2019-09-16 17:51:52 +01:00
RiotRobot
dd0ffa8e72 Merge branch 'master' into develop 2019-09-16 17:49:46 +01:00
RiotRobot
44cf99d5d4 released js-sdk 2019-09-16 17:44:16 +01:00
J. Ryan Stinnett
8ad667c43e Tweak lock file to pull in only one React version 
Yarn deps can be a bit fiddly when targeting specific versions. This tweaks the
lock file to only pull in a single React version.

For others who may need to do something like this again, I recommend deleting
specific package entries from `yarn.lock` and re-running `yarn install`. That
should make it pick the right thing while also leaving other packages as they
were.
 2019-09-16 14:37:52 +01:00
J. Ryan Stinnett
16a412e7d0 Tweak lock file to pull in only one React version 
Yarn deps can be a bit fiddly when targeting specific versions. This tweaks the
lock file to only pull in a single React version.

For others who may need to do something like this again, I recommend deleting
specific package entries from `yarn.lock` and re-running `yarn install`. That
should make it pick the right thing while also leaving other packages as they
were.
 2019-09-16 14:07:05 +01:00
RiotRobot
dbd5d891db js-sdk rc.1 (and updated react sdk) for report api 2019-09-13 16:23:39 +01:00
RiotRobot
93d76cef36 js-sdk rc.1 to get report API 2019-09-13 16:17:40 +01:00
RiotRobot
09492b15e8 react-sdk rc.2 2019-09-13 14:48:23 +01:00
RiotRobot
0d53eb5386 react-sdk rc.1 2019-09-12 18:42:53 +01:00
RiotRobot
eaf3bdbf34 Merge branch 'master' into develop 2019-09-12 13:26:17 +01:00
RiotRobot
5a6e889bd4 Released js-sdk & react-sdk 2019-09-12 13:16:26 +01:00
RiotRobot
b0abb52518 Merge branch 'master' into develop 2019-09-12 13:07:27 +01:00
RiotRobot
bdcaaa95f8 Released js-sdk 2019-09-12 12:53:33 +01:00
RiotRobot
03b5b622d0 js-sdk & react-sdk rc.1 2019-09-11 18:48:59 +01:00
RiotRobot
491087c1cf js-sdk rc.1 2019-09-11 18:43:30 +01:00
Travis Ralston
0b6c29d274
Merge pull request #10480 from vector-im/t3chguy/react16 
Switch to React 16
 2019-09-11 10:42:24 -06:00
Michael Telatynski
034c35b07e Switch to React 16.9 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-09-06 19:19:06 +01:00
dependabot[bot]
f0884b8e47
Bump eslint-utils from 1.4.0 to 1.4.2 
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.4.0...v1.4.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-08-29 14:47:34 +00:00
dependabot[bot]
8ff2c42f39
Bump eslint-utils from 1.4.0 to 1.4.2 
Bumps [eslint-utils](https://github.com/mysticatea/eslint-utils) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/mysticatea/eslint-utils/releases)
- [Commits](https://github.com/mysticatea/eslint-utils/compare/v1.4.0...v1.4.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2019-08-29 14:23:57 +00:00
Michael Telatynski
33c17a6f2e Switch to React 16.9 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-28 11:07:46 +01:00
Michael Telatynski
accb0abe2d Switch from react-addons-test-utils to react-dom/test-utils. React 16 :D 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-24 11:47:07 +01:00
Michael Telatynski
7eefc9d856 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/react16 2019-08-24 11:42:03 +01:00
J. Ryan Stinnett
24e59ccedd Upgrade electron-builder to 21.2.0 
This is meant to help with:

* macOS packaging for Electron 6 (https://github.com/vector-im/riot-web/issues/10473)
* Linux desktop file should not have quotes (https://github.com/vector-im/riot-web/issues/6421)

It did not help with:

* Linux sandbox for Electron 5 (https://github.com/vector-im/riot-web/issues/10509)

Fixes https://github.com/vector-im/riot-web/issues/6421
Part of https://github.com/vector-im/riot-web/issues/10473
 2019-08-16 12:57:03 +01:00
Michael Telatynski
7145d0e1a6 Hit yarn with a hammer until it works 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-12 18:06:37 +01:00
Michael Telatynski
773dd0805b Bump matrix-react-test-utils for React 16 compatibility 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-12 17:41:51 +01:00
Michael Telatynski
387fa75da8 Bump matrix-react-test-utils for React 16 compatibility 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-12 17:41:36 +01:00
Michael Telatynski
d347ab08e7 Merge branches 'develop' and 't3chguy/react16' of github.com:vector-im/riot-web into t3chguy/react16 2019-08-10 00:20:30 +01:00
Travis Ralston
feb62793d2 Revert "Upgrade to babel@7 and support TypeScript" 
This reverts commit 7b89893645.
 2019-08-08 13:30:33 -06:00
Travis Ralston
7b89893645 Upgrade to babel@7 and support TypeScript 
See https://github.com/matrix-org/matrix-react-sdk/pull/3292

Like react-sdk#3292, this fixes the couple source files which mix imports and module exports (they can't be mixed anymore).
 2019-08-08 13:30:11 -06:00
J. Ryan Stinnett
e0fb0de83d Relock gemini-scrollbar deps 2019-08-08 16:01:41 +01:00
Michael Telatynski
daf1a794e6
Merge pull request #3276 from matrix-org/t3chguy/react16_1 
Progress towards React 16 compatibility
 2019-08-06 18:09:30 +01:00
RiotRobot
c7b691e2d7 Merge branch 'master' into develop 2019-08-05 12:13:51 +01:00
RiotRobot
90b26a98d3 Released js-sdk & react-sdk 2019-08-05 12:04:57 +01:00
RiotRobot
6c1268f5a6 Merge branch 'master' into develop 2019-08-05 12:02:22 +01:00
RiotRobot
ec9be798ae released js-sdk 2019-08-05 11:58:25 +01:00
Michael Telatynski
64d542dc4a Update react-gemini-scrollbar to include React 16.8 compatibility 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-05 10:07:25 +01:00
Michael Telatynski
06e7a48aaf Switch to React 16.8 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-01 15:31:33 +01:00
J. Ryan Stinnett
67e31e0e30 Upgrade dependencies 2019-07-31 17:46:02 +01:00
J. Ryan Stinnett
e5c3d91e53 Upgrade dependencies 2019-07-31 17:41:36 +01:00
RiotRobot
61228d112e Upgrade to JS SDK 2.3.0-rc.1 and React SDK 1.5.0-rc.1 2019-07-31 16:52:52 +01:00
RiotRobot
6834083d88 Upgrade to JS SDK 2.3.0-rc.1 2019-07-31 16:36:02 +01:00
J. Ryan Stinnett
8304522b7f Upgrade emojibase to fix :anxious: 
Fixes https://github.com/vector-im/riot-web/issues/10372
 2019-07-30 18:15:21 +01:00
Bruno Windels
3753e5261d Implement diffing html messages in the edit history 2019-07-24 11:28:56 +02:00
Bruno Windels
f305d8ac08 Basic diff visualisation for plain text edits 2019-07-19 16:09:23 +02:00
RiotRobot
72f3f1afee Upgrade to JS SDK 2.2.0 and React SDK 1.4.0 2019-07-18 15:53:25 +01:00
RiotRobot
480061bde3 Upgrade JS SDK to v2.2.0 2019-07-18 15:46:38 +01:00
RiotRobot
fab0d70f21 react-sdk rc.3 2019-07-15 17:31:13 +01:00
RiotRobot
be601d4654 Upgrade to JS SDK 2.2.0-rc.2 and React SDK 1.4.0-rc.2 2019-07-12 17:37:01 +01:00
RiotRobot
6a6108f496 Upgrade to JS SDK 2.2.0-rc.2 2019-07-12 17:29:36 +01:00
RiotRobot
f771f607d6 Upgrade to React SDK 1.4.0-rc.1 and JS SDK 2.2.0-rc.1 2019-07-12 11:39:07 +01:00
RiotRobot
34c642ce9a Upgrade JS SDK to 2.2.0-rc.1 2019-07-12 11:23:01 +01:00
J. Ryan Stinnett
1199554be7 Upgrade dependencies 2019-07-11 11:49:12 +01:00
J. Ryan Stinnett
c9eac27079 Upgrade dependencies 2019-07-11 11:47:31 +01:00
RiotRobot
d3a3115298 Merge branch 'master' into develop 2019-07-11 11:31:48 +01:00
J. Ryan Stinnett
ff1a5e0539 Upgrade lodash 2019-07-11 11:13:37 +01:00
J. Ryan Stinnett
6ccf88f808 Upgrade to JS SDK 2.1.1 and React SDK 1.3.1 2019-07-11 11:09:56 +01:00
RiotRobot
bb1762d265 Merge branch 'master' into develop 2019-07-11 11:04:36 +01:00
J. Ryan Stinnett
cc1d3aae4b Upgrade lodash 2019-07-11 10:52:18 +01:00
J. Ryan Stinnett
c34128dae6 Upgrade to JS SDK 2.1.1 2019-07-11 10:40:14 +01:00
J. Ryan Stinnett
6c9bf25199 Add stylelint-scss plugin 
This adds extra SCSS-specific rules. In particular, there's a modified at rule
processing rule which understands `mixin` and friends.
 2019-07-10 16:56:40 +01:00
RiotRobot
5f1d6f333c Merge branch 'master' into develop 2019-07-08 11:14:40 +01:00
RiotRobot
090b2dbd30 Upgrade to JS SDK 2.1.0 and React SDK 1.3.0 2019-07-08 10:58:13 +01:00
RiotRobot
0347c42798 Merge branch 'master' into develop 2019-07-08 10:53:53 +01:00
RiotRobot
33eba0e500 Upgrade to JS SDK 2.1.0 2019-07-08 10:49:43 +01:00
J. Ryan Stinnett
7424c776e5 Upgrade dependencies 2019-07-04 15:14:44 +01:00
J. Ryan Stinnett
b095042084 Upgrade dependencies 2019-07-04 15:08:20 +01:00
RiotRobot
751316f388 Upgrade to JS SDK 2.1.0-rc.1 and React SDK 1.3.0-rc.1 2019-07-03 17:25:05 +01:00
RiotRobot
137c531d51 Upgrade to JS SDK 2.1.0-rc.1 2019-07-03 16:45:05 +01:00
J. Ryan Stinnett
ba5cae554c Upgrade electron-builder, electron-builder-squirrel-windows to latest 2019-07-03 16:06:12 +01:00
Michael Telatynski
5473f7ba45 Unpin HLJS 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-06-27 20:36:45 +01:00
RiotRobot
48b6f8c954 Released js-sdk & react-sdk 2019-06-19 15:55:02 +01:00
RiotRobot
21344609a4 released js-sdk 2019-06-19 15:47:31 +01:00
RiotRobot
589aa19246 js-sdk & react-sdk rc.2 2019-06-18 15:57:30 +01:00
RiotRobot
27a94bb250 js-sdk rc.2 2019-06-18 15:46:23 +01:00
RiotRobot
974da9947c js-sdk & react-sdk rc.1 2019-06-12 12:10:37 +01:00
RiotRobot
b2dfd3e84e js-sdk rc.1 2019-06-12 11:56:30 +01:00
RiotRobot
ada47d476c Merge branch 'master' into develop 2019-05-31 12:02:00 +01:00
RiotRobot
7c03bd128b Upgrade JS SDK to 2.0.0 and React SDK to 1.2.1 2019-05-31 11:52:42 +01:00
RiotRobot
2a41471df3 Upgrade to JS SDK 2.0.0 which fixes an error during key backup 2019-05-31 11:06:06 +01:00
RiotRobot
fcf8e246cf Merge branch 'master' into develop 2019-05-29 16:27:46 +01:00
RiotRobot
f4b1e3307d Upgrade SDKs to 1.2.0 2019-05-29 16:14:25 +01:00
RiotRobot
3f1bb494e2 Upgrade JS SDK to 1.2.0 2019-05-29 15:58:17 +01:00
J. Ryan Stinnett
e129db4978 Upgrade electron-builder 2019-05-24 11:29:02 +01:00
RiotRobot
59fa374491 Upgrade SDKs to 1.2.0-rc.1 2019-05-23 17:39:03 +01:00
RiotRobot
bba4029165 Upgrade JS SDK to 1.2.0-rc.1 2019-05-23 16:52:45 +01:00
J. Ryan Stinnett
913bc6da93 Update yarn.lock 2019-05-21 13:27:02 +01:00
Matthew Hodgson
a8297a7698 fix build 2019-05-19 16:11:12 +01:00
David Baker
05a2cb1020 Merge branch 'master' into develop 2019-05-15 14:40:16 +01:00
David Baker
d0def4a80f react-sdk 1.1.2 2019-05-15 14:34:13 +01:00
David Baker
da9cde6d18 Merge branch 'master' into develop 2019-05-14 14:04:34 +01:00
David Baker
8ed44e6b64 matrix-react-sdk v1.1.1 2019-05-14 13:52:05 +01:00
David Baker
814b5297ad Merge branch 'master' into develop 2019-05-07 16:05:58 +01:00
David Baker
c81b9bab79 Released react-sdk and js-sdk 2019-05-07 15:52:50 +01:00
David Baker
09a9b2e15e Merge branch 'master' into develop 2019-05-07 15:50:14 +01:00
David Baker
aec1e98086 Released js-sdk 2019-05-07 15:30:21 +01:00
David Baker
1a1f2254e5 Remove karma junit output 
See https://github.com/matrix-org/matrix-react-sdk/pull/2944
 2019-05-03 11:40:53 +01:00
David Baker
908a72e00e yarn upgrade 
ALL THE UPDATES!

(so many updates)
 2019-05-03 11:13:04 +01:00
David Baker
4b9be2aec4 Remove the karma junit reporter 
We may have used it in our jenkins tests at some point but we don't
have those anymore. It weas pulling in ancient dependencies because
we were using version 2.0.0 which is fact much older than the
current version (1.2.0). We have little use for junit output anymore
so just remove it.
 2019-05-03 10:39:13 +01:00
David Baker
4e57993094 yarn upgrade 2019-05-03 10:22:10 +01:00
David Baker
846797be76 add new babel plugins to deps 2019-04-30 12:48:18 +01:00
David Baker
cc8eaea5a7 js-sdk & react-sdk rc.1, electron 4.1.5 2019-04-30 12:10:06 +01:00
David Baker
5b92693cb3 js-sdk rc.1 2019-04-30 11:53:10 +01:00
Hubert Chathi
2c64a4f3a1 update yarn.lock with olm release 2019-04-24 12:02:41 -04:00
Travis Ralston
86bbe156db
Merge pull request #9498 from vector-im/travis/packages.matrix.org 
Use packages.matrix.org for Olm
 2019-04-16 08:28:38 -06:00
J. Ryan Stinnett
bb5dedeeb9 Update yarn.lock 2019-04-16 13:31:58 +01:00
Travis Ralston
cbaa7a81bf Use packages.matrix.org for Olm 
Fixes https://github.com/vector-im/riot-web/issues/9497
 2019-04-15 19:18:33 -06:00
Bruno Windels
0592a1711a
Merge pull request #2439 from matrix-org/matthew/retina 
Fix for retina thumbnails being massive
 2019-04-09 16:14:25 +00:00
David Baker
7b87229e29 Add stylelint 
Not added to the CI / default linting phases yet as, predictably
enough, it's very unhappy with our CSS. Just added one rule which is
that our CSS is indented with 4 spaces (the default being 2).
 2019-04-09 14:05:53 +01:00
Bruno Windels
d400ebde65 add new dependencies to lock file 2019-04-08 15:34:51 +02:00
Hubert Chathi
ec08cd99aa bump olm version 2019-04-05 16:22:06 -04:00
J. Ryan Stinnett
ba7caaa115 Update yarn.lock 2019-04-03 11:50:39 +01:00
J. Ryan Stinnett
57d72b4deb
Merge pull request #2841 from jryans/storage-eviction-modal 
Notify user when crypto data is missing
 2019-04-01 17:31:39 +01:00
David Baker
51f6d02cf1 Released js-sdk & react-sdk, and bump electron version 2019-04-01 13:52:11 +01:00
David Baker
6cde0eb1b2 released js-sdk 2019-04-01 13:38:06 +01:00
J. Ryan Stinnett
328f0cd6bf Notify user when crypto data is missing 
If we have account data in local storage but nothing in the crypto store, it
generally means the browser has evicted IndexedDB out from under us. This adds a
modal to explain the situation and offer to completely clear storage to get
things back to normal.

Fixes https://github.com/vector-im/riot-web/issues/9109
 2019-03-29 16:06:08 +00:00
David Baker
d747896354 react-sdk & js-sdk rc.1 2019-03-27 17:44:30 +00:00
David Baker
fef36d3e1d react-sdk rc.1 2019-03-27 17:35:36 +00:00
J. Ryan Stinnett
a8e4949616 Update matrix-mock-request 2019-03-27 15:09:34 +00:00
J. Ryan Stinnett
86cf83e178 Update matrix-mock-request 2019-03-27 15:07:14 +00:00
Bruno Windels
7fb4b32e8f update react-sdk version in yarn lockfile 2019-03-21 13:55:46 +01:00
David Baker
1a8fe4dd43 Go back to using mainine velocity 
We moved off to our own fork of velocity many moons ago to fix
a memory leak bug when velocity was being barely maintained. They
have now merged the bugfix, so go back to mainline.
 2019-03-20 10:54:06 +00:00
David Baker
9735c332ff Merge branch 'master' into develop 2019-03-18 16:27:39 +00:00
David Baker
2de1f375fa Update yarn.lock 
which wasn't updated at release time
 2019-03-18 16:27:01 +00:00
David Baker
bb111dc6c5 Update yarn.lock 
Which wasn't updated at release time
 2019-03-18 16:25:52 +00:00
Travis Ralston
bdc94f3847 Fix Chrome for Karma 2019-03-13 22:11:45 -06:00
Travis Ralston
1fb8b23d4c Set up BuildKite for Chrome 2019-03-13 22:03:37 -06:00
J. Ryan Stinnett
75a7e7ce82 Update webpack-dev-server 2019-03-13 15:07:50 +00:00
J. Ryan Stinnett
a5b8d6381f Convert from npm to yarn lock file 
The npm lock file was imported into yarn. A yarn install pass was then run to
double-check the lock file for sanity.
 2019-03-11 14:35:03 +00:00
J. Ryan Stinnett
db5b76b225 Add yarn lock file 
For the React SDK, we did not commit npm lock files, so there is no correct copy
to import from. For this repo, I created a fresh yarn lock file using yarn
install.
 2019-03-11 13:53:34 +00:00