Commit Graph

835 Commits (3cff6d72394efe8c942841c49c0473459480f6bb)

Author SHA1 Message Date
RiotRobot 00dc187f71 Reset matrix-js-sdk back to develop 2020-03-02 17:43:21 +00:00
RiotRobot 134ca31b25 v2.2.0 2020-03-02 17:33:23 +00:00
RiotRobot 7fcad8c82c Upgrade matrix-js-sdk to 5.1.0 2020-03-02 17:29:36 +00:00
RiotRobot c7246f8eab v2.2.0-rc.1 2020-02-26 14:29:31 +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 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 2d05205c9e v2.1.1 2020-02-19 16:03:58 +00:00
RiotRobot a687d158e8 Released js-sdk 2020-02-19 15:59:37 +00:00
David Baker 281cc223ed back to develop dep 2020-02-17 14:16:03 +00:00
RiotRobot f99d347b23 v2.1.0 2020-02-17 13:36:06 +00:00
RiotRobot 34dbeb0604 Released js-sdk 2020-02-17 13:21:07 +00:00
RiotRobot ab91e859d9 v2.1.0-rc.2 2020-02-13 17:47:20 +00:00
RiotRobot 1970dbff94 Try JS SDK upgrade one more time 2020-02-13 17:43:27 +00:00
RiotRobot 242f1afb55 v2.1.0-rc.1 2020-02-13 17:35:56 +00:00
RiotRobot 163539d9f4 Upgrade JS SDK to 5.0.0-rc.1 2020-02-13 15:57:48 +00:00
Michael Telatynski e65404b631 Explicitly (not transitively) depend on minimist as bin script uses it 2020-02-04 11:13:18 +00:00
J. Ryan Stinnett 805e9abb39 Flip back to develop 2020-01-27 16:00:25 +00:00
RiotRobot 7a79b78292 Merge branch 'master' into develop 2020-01-27 11:46:56 +00:00
RiotRobot 8c56c59922 v2.0.0 2020-01-27 11:44:10 +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
Travis Ralston 4aa3be9b42 Move & upgrade babel runtime into dependencies (like it wants)
https://babeljs.io/docs/en/babel-runtime
2020-01-23 15:43:22 -07:00
David Baker 2842e8dee8 Change prepublish script to prepare
prepublish is deprecated (prepare also runs for git checkouts, and
lib will need to be built in this case).
2020-01-22 14:15:17 +00:00
RiotRobot 4521ef1a7b v2.0.0-rc.2 2020-01-20 17:27:00 +00:00
David Baker d3ae65698f Add prepublish script
https://github.com/matrix-org/matrix-react-sdk/pull/3723 removed
the prepare script which was how the SDK got built before being
published. Add it back as a more modern prepublish script.
2020-01-20 17:20:57 +00:00
David Baker 34c69a59b2 Add prepublish script
https://github.com/matrix-org/matrix-react-sdk/pull/3723 removed
the prepare script which was how the SDK got built before being
published. Add it back as a more modern prepublish script.
2020-01-20 15:26:34 +00:00
RiotRobot 4ee2fce1f1 v2.0.0-rc.1 2020-01-20 14:34:07 +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 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 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 5fd27a10bb Merge branch 'develop' into travis/sourcemaps 2020-01-13 11:19:41 -07:00
RiotRobot 389e1194ff Merge branch 'master' into develop 2020-01-13 13:09:56 +00:00
RiotRobot 8091cadc46 v1.7.6 2020-01-13 13:06:31 +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 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 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 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
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
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 85c4c72bf3
Merge pull request #3767 from matrix-org/travis/babel7-wp-package
Update package.json for new build process + cosmetics
2020-01-08 11:10:05 -07:00