e5a4092adc
Reset matrix-react-sdk back to develop branch
2020-09-01 17:51:03 +01:00
3ed750a9ab
Reset matrix-js-sdk back to develop branch
2020-09-01 17:50:49 +01:00
a20b9c4c24
Upgrade matrix-react-sdk to 3.3.0
2020-09-01 17:41:33 +01:00
a09ab52be3
Upgrade matrix-js-sdk to 8.2.0
2020-09-01 17:40:19 +01:00
0d290c9bd2
Reset matrix-js-sdk back to develop branch
2020-09-01 17:39:09 +01:00
bb248670a6
Upgrade matrix-js-sdk to 8.2.0
2020-09-01 17:02:49 +01:00
9163aee0fc
Upgrade matrix-react-sdk to 3.3.0-rc.1
2020-08-26 12:10:33 +01:00
de4550099e
Upgrade matrix-js-sdk to 8.2.0-rc.1
2020-08-26 12:08:33 +01:00
b142d72e97
Upgrade matrix-js-sdk to 8.2.0-rc.1
2020-08-26 11:52:28 +01:00
0a4d4e4df3
Revert "update js-sdk reference in lockfile"
...
This reverts commit cac4e6c920
2020-08-18 12:53:43 -06:00
cac4e6c920
update js-sdk reference in lockfile
2020-08-18 12:50:25 -06:00
8cff59f123
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
2020-08-18 17:36:04 +01:00
d969a96cd2
Reset matrix-react-sdk back to develop branch
2020-08-17 13:17:44 +01:00
4a7c2318dd
Reset matrix-js-sdk back to develop branch
2020-08-17 13:17:27 +01:00
5ac891d70e
Upgrade matrix-react-sdk to 3.2.0
2020-08-17 13:09:23 +01:00
16be9e4774
Upgrade matrix-js-sdk to 8.1.0
2020-08-17 13:09:04 +01:00
c91fc99d4b
Reset matrix-js-sdk back to develop branch
2020-08-17 13:08:45 +01:00
32ca810809
Upgrade matrix-js-sdk to 8.1.0
2020-08-17 12:53:33 +01:00
871733388c
Upgrade matrix-react-sdk to 3.2.0-rc.1
2020-08-13 12:20:41 +01:00
89ee32a32d
Upgrade matrix-js-sdk to 8.1.0-rc.1
2020-08-13 12:20:15 +01:00
47bb6d0b25
Upgrade matrix-js-sdk to 8.1.0-rc.1
2020-08-13 12:12:10 +01:00
df980dbf92
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
2020-08-12 22:48:03 +01:00
04afd0232b
Reset matrix-react-sdk back to develop branch
2020-08-05 16:20:15 +01:00
5935e3b145
Reset matrix-js-sdk back to develop branch
2020-08-05 16:20:01 +01:00
6b7909c732
Upgrade matrix-react-sdk to 3.1.0
2020-08-05 16:12:43 +01:00
d283b4161c
Upgrade matrix-js-sdk to 8.0.1
2020-08-05 16:12:29 +01:00
45b79a0b7c
Reset matrix-js-sdk back to develop branch
2020-08-05 16:11:28 +01:00
f8cdd51fe3
Merge branch 'master' into develop
2020-08-05 16:10:29 +01:00
57814a40c1
Upgrade matrix-js-sdk to 8.0.1
2020-08-05 15:50:03 +01:00
cbcac9dd49
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into travis/download-logs
...
Conflicts:
package.json
2020-08-03 12:54:06 +01:00
fed20d46c5
Replace i18n generation script with something matching our project
...
We've been relying on flow being close enough to TypeScript for so long that it is starting to run into issues. Here we switch to babel's parser given we already use babel in the project.
Babel's parser is also *slightly* faster, allowing us to generate strings 0.1s faster.
2020-07-31 13:33:33 -06:00
7f0c8216ae
Upgrade matrix-react-sdk to 3.1.0-rc.1
2020-07-31 13:35:05 +01:00
6004d02b98
Upgrade matrix-js-sdk to 8.0.1-rc.1
2020-07-31 13:33:19 +01:00
31c66a1128
Upgrade matrix-js-sdk to 8.0.1-rc.1
2020-07-31 13:24:17 +01:00
703179be22
Merge pull request #14810 from vector-im/jryans/cleanup-lint-deps
...
Remove redundant lint dependencies
2020-07-31 11:42:49 +01:00
0404c7d9ae
Merge pull request #5059 from matrix-org/jryans/cleanup-lint-deps
...
Remove redundant lint dependencies
2020-07-31 11:42:29 +01:00
6f688102e7
Bump elliptic from 6.5.2 to 6.5.3
...
Bumps [elliptic](https://github.com/indutny/elliptic ) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases )
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3 )
Signed-off-by: dependabot[bot] <support@github.com >
2020-07-30 12:58:42 +00:00
8610760288
Bump elliptic from 6.5.2 to 6.5.3
...
Bumps [elliptic](https://github.com/indutny/elliptic ) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases )
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.2...v6.5.3 )
Signed-off-by: dependabot[bot] <support@github.com >
2020-07-30 12:52:17 +00:00
269e82edc9
Remove redundant lint dependencies
...
These are no longer needed with the new standard lint repo.
2020-07-29 12:05:50 +01:00
50bc7fc62f
Remove redundant lint dependencies
...
These are no longer needed with the new standard lint repo.
2020-07-29 12:00:42 +01:00
f4e6828949
Reset matrix-react-sdk back to develop branch
2020-07-27 21:39:12 +01:00
b799a6eb84
Reset matrix-js-sdk back to develop branch
2020-07-27 21:39:01 +01:00
36802afe92
Upgrade matrix-react-sdk to 3.0.0
2020-07-27 21:30:30 +01:00
c20776a264
Upgrade matrix-js-sdk to 8.0.0
2020-07-27 21:30:13 +01:00
96ba645cbd
Reset matrix-js-sdk back to develop branch
2020-07-27 21:29:22 +01:00
ebb4d2ff87
Upgrade matrix-js-sdk to 8.0.0
2020-07-27 21:05:55 +01:00
66eb069651
Pin flow-parser for i18n
2020-07-23 15:43:53 -06:00
9d091e5e02
Update packages to modern versions
2020-07-23 15:27:10 -06:00
c4fc70b9be
Post-merge fix
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2020-07-21 22:28:36 +01:00
70c81cc377
Merge branches 'develop' and 'travis/download-logs' of github.com:matrix-org/matrix-react-sdk into travis/download-logs
...
Conflicts:
src/i18n/strings/en_EN.json
src/rageshake/submit-rageshake.ts
2020-07-21 22:22:28 +01:00
RiotRobot
Travis Ralston
Michael Telatynski
J. Ryan Stinnett
dependabot[bot]