Commit Graph

818 Commits (69dc725006960053be0fa69cd16f303074c7035d)

Author SHA1 Message Date
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
RiotRobot a3fe5bbd8c v1.7.6-rc.2 2020-01-08 11:20:29 +00:00
Travis Ralston 9213f88180 Re-add docs 2020-01-07 15:13:42 -07:00
RiotRobot 0df16631c2 v1.7.6-rc.1 2020-01-06 14:01:54 +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 c551f2983a Add TextualBody-test.js
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-01-06 13:28:29 +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 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
Travis Ralston 69424f4b42 Add package.json fields for riot-web's webpack
See a1c9551bc8
2019-12-22 21:34:39 -07:00
Travis Ralston d8da634c8b Cosmetic updates to package.json 2019-12-22 21:34:27 -07:00
Michael Telatynski affc8b8459 Merge branches 'develop' and 't3chguy/jest' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/jest
 Conflicts:
	yarn.lock
2019-12-19 10:50:14 +00:00
Michael Telatynski d35b01b63a Get rid of stripped-emoji.json in favour of an in-memory single truth source 2019-12-18 15:40:19 +00:00
Michael Telatynski a2246374f1 correct testMatch so it doesn't try run js-sdk tests 2019-12-17 13:05:18 +00:00
Michael Telatynski 409a111b02 wait additional tick 2019-12-17 12:42:47 +00:00