mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-22 17:25:50 +03:00
Code Issues Projects Releases Packages Wiki Activity
62591 commits 201 branches 553 tags 406 MiB
Commit graph

3289 commits

Author SHA1 Message Date
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