Commit Graph

889 Commits (f487c2b38cb04202abc5c220ba6f7b652d4a39f2)

Author SHA1 Message Date
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
Michael Telatynski bcba9a3e50 fix yarn test for bashy things v2 2019-12-17 12:23:51 +00:00
Michael Telatynski f06a94388f fix yarn test for bashy things 2019-12-17 12:22:11 +00:00
Michael Telatynski e6d8487302 Fix more tests 2019-12-17 11:47:01 +00:00
Michael Telatynski ab3fb6581b Down to 7 test failures 2019-12-17 11:24:37 +00:00
Michael Telatynski 85ade7e1a1 Switch to react-focus-lock for it to comprehend Portals 2019-12-16 12:16:41 +00:00
Michael Telatynski 0041dae664 26 test failures to go :D 2019-12-16 11:55:01 +00:00
Michael Telatynski 6ad31fe023 30 test failures to go :D 2019-12-16 11:12:48 +00:00
Michael Telatynski 18f81d80db Initial jest stuff. Blocked on Babel 7 2019-12-13 13:43:48 +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 97af0403e5 Upgrade to babel@7 and support typescript
This breaks the tests
2019-12-12 14:37:14 -07:00
J. Ryan Stinnett 108293dcba Flip back to develop 2019-12-11 10:39:04 +00:00
Michael Telatynski f079c2fdd2
Merge pull request #3709 from matrix-org/t3chguy/what-input
Add what-input to allow different scoping to focus-visible for MAB a11y
2019-12-09 13:45:59 +00:00
RiotRobot 0ac4e6f5a0 v1.7.5 2019-12-09 11:34:42 +00:00
RiotRobot 36a3fe7ecf released js-sdk 2019-12-09 11:29:39 +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
RiotRobot 9072a47f9d v1.7.5-rc.1 2019-12-04 12:03:50 +00:00
RiotRobot 8ef30245c9 js-sdk rc.1 2019-12-04 12:00:44 +00:00
J. Ryan Stinnett 54d6b6aa73 Flip JS SDK back to develop 2019-11-27 13:31:44 +00:00
RiotRobot 6223ca8243 Merge branch 'master' into develop 2019-11-27 10:39:33 +00:00
RiotRobot 1a98c0d04e v1.7.4 2019-11-27 10:38:35 +00:00
RiotRobot d9e322bbca Upgrade to JS SDK 2.4.5 2019-11-27 10:32:21 +00:00
RiotRobot a6fdd5e5dd Merge branch 'master' into develop 2019-11-25 13:35:30 +00:00
RiotRobot f62cd36745 v1.7.3 2019-11-25 13:30:40 +00:00
RiotRobot 942db34e92 released js-sdk 2019-11-25 13:27:15 +00:00
RiotRobot 730967fd3f v1.7.3-rc.2 2019-11-22 17:18:27 +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 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 ef475bbdad v1.7.3-rc.1 2019-11-20 18:29:16 +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 a0909df269 v1.7.2 2019-11-06 14:17:09 +00:00
RiotRobot 2f4f15d26c v1.7.1 2019-11-04 15:12:54 +00:00
RiotRobot aba557f023 Released react-sdk 2019-11-04 15:09:19 +00:00
RiotRobot 050ef95cd6 v1.7.1-rc.2 2019-11-01 10:17:54 +00:00
Travis Ralston e6e12df82d Add structural base for handling Mjolnir lists 2019-10-31 13:20:18 -06:00
RiotRobot 60731dabf4 v1.7.1-rc.1 2019-10-30 16:47:27 +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
Bruno Windels fc175a971c
Merge pull request #3537 from matrix-org/bwindels/merge-e2e-tests
Merge end-to-end tests
2019-10-21 08:31:35 +00: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 5333201823 Change back to develop branch for deps 2019-10-18 16:12:20 +01:00
RiotRobot 86a564b2f0 v1.7.0 2019-10-18 14:48:34 +01:00
RiotRobot 21bb1dc837 Upgrade to JS SDK v2.4.2 2019-10-18 14:43:08 +01:00
RiotRobot 558a8b72f8 v1.7.0-rc.1 2019-10-09 16:57:14 +01:00
RiotRobot bd7e909699 js-sdk rc.1 2019-10-09 16:54:05 +01:00
Bruno Windels 3e971e4880 provide yarn command to run e2e tests
this assumes the riot-web local dev server is running
2019-10-09 17:38:18 +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 dc9018dc11 js-sdk develop 2019-10-04 11:07:22 +01:00
RiotRobot 1a2add1f08 v1.6.2 2019-10-04 10:37:46 +01:00
RiotRobot 4ca0b957a7 v1.6.2-rc.1 2019-10-02 10:26:31 +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 617a5290f9 Change back to develop branch for deps 2019-10-01 13:30:13 +01:00
RiotRobot e457ef3679 v1.6.1 2019-10-01 11:40:47 +01:00
RiotRobot fa12b60c4a Upgrade to JS SDK 2.4.1 2019-10-01 11:35:33 +01:00
J. Ryan Stinnett 9221dcd154 Change back to develop branch for deps 2019-09-27 14:39:59 +01:00
RiotRobot 3cc67cfa6f v1.6.0 2019-09-27 11:52:15 +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 c3d8f2b5b7 v1.6.0-rc.2 2019-09-26 12:06:16 +01:00
RiotRobot bb49837e71 v1.6.0-rc.1 2019-09-25 17:28:34 +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 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
RiotRobot dd0ffa8e72 Merge branch 'master' into develop 2019-09-16 17:49:46 +01:00
RiotRobot 74cbdf28ed v1.5.3 2019-09-16 17:47:22 +01:00
RiotRobot 44cf99d5d4 released js-sdk 2019-09-16 17:44:16 +01:00
RiotRobot 0556d34534 v1.5.3-rc.3 2019-09-13 16:21:15 +01:00
RiotRobot 93d76cef36 js-sdk rc.1 to get report API 2019-09-13 16:17:40 +01:00
RiotRobot 63f75a36e4 v1.5.3-rc.2 2019-09-13 14:23:39 +01:00
RiotRobot d394e76254 v1.5.3-rc.1 2019-09-12 18:37:13 +01:00
RiotRobot b0abb52518 Merge branch 'master' into develop 2019-09-12 13:07:27 +01:00
RiotRobot 3f31666409 v1.5.2 2019-09-12 12:57:22 +01:00
RiotRobot bdcaaa95f8 Released js-sdk 2019-09-12 12:53:33 +01:00
RiotRobot 77ae78ad24 v1.5.2-rc.1 2019-09-11 18:46:13 +01:00
RiotRobot 491087c1cf js-sdk rc.1 2019-09-11 18:43:30 +01: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
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 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 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 0e973bf211 Merge branch 'release-v1.5.1' 2019-08-05 14:36:48 +01:00
RiotRobot 9016be22a4 v1.5.1 2019-08-05 14:33:58 +01:00
RiotRobot fbd2ba8863 v1.5.0 2019-08-05 12:01:29 +01:00
RiotRobot ec9be798ae released js-sdk 2019-08-05 11:58:25 +01:00
Michael Telatynski aa98a6dfcb Start using create-react-class polyfill
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-05 10:08:30 +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
RiotRobot db43a81c0a v1.5.0-rc.1 2019-07-31 16:46:26 +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 03151418af Merge branch 'master' into develop 2019-07-18 15:51:33 +01:00
RiotRobot 3c0c64af8e v1.4.0 2019-07-18 15:50:46 +01:00
RiotRobot 480061bde3 Upgrade JS SDK to v2.2.0 2019-07-18 15:46:38 +01:00
RiotRobot 008903470a v1.4.0-rc.3 2019-07-15 17:28:48 +01:00
RiotRobot f05a7b2195 v1.4.0-rc.2 2019-07-12 17:33:21 +01:00
RiotRobot 6a6108f496 Upgrade to JS SDK 2.2.0-rc.2 2019-07-12 17:29:36 +01:00
RiotRobot a0dc4db234 v1.4.0-rc.1 2019-07-12 11:28:50 +01:00
RiotRobot 34c642ce9a Upgrade JS SDK to 2.2.0-rc.1 2019-07-12 11:23:01 +01:00
Travis Ralston f6af464fff Verify i18n in CI
To protect developers from mistakes such as missing strings or getting them out of order.
2019-07-11 12:37:17 -06:00
RiotRobot bb1762d265 Merge branch 'master' into develop 2019-07-11 11:04:36 +01:00
RiotRobot 1184e05ea7 v1.3.1 2019-07-11 11:03:47 +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
J. Ryan Stinnett 4ebba43873 Run stylelint on all SCSS files
This adds quotes so that globbing actually works as intended with `stylelint`.
Previously, we were relying on whatever a shell does with `**` style globs,
which meant that many files weren't picked up.

This means many files weren't being linted before, so the remaining commits will
fix those new errors.
2019-07-10 16:56:25 +01:00
RiotRobot 61e2d87152 v1.3.0 2019-07-08 10:53:03 +01:00
RiotRobot 33eba0e500 Upgrade to JS SDK 2.1.0 2019-07-08 10:49:43 +01:00
RiotRobot a36c520362 v1.3.0-rc.1 2019-07-03 16:56:10 +01:00
RiotRobot 137c531d51 Upgrade to JS SDK 2.1.0-rc.1 2019-07-03 16:45:05 +01:00
Michael Telatynski 5473f7ba45 Unpin HLJS
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-06-27 20:36:45 +01:00
RiotRobot 2d6317fdd0 v1.2.2 2019-06-19 15:52:18 +01:00
RiotRobot 21344609a4 released js-sdk 2019-06-19 15:47:31 +01:00
RiotRobot a835d916e1 v1.2.2-rc.2 2019-06-18 15:52:29 +01:00
RiotRobot 27a94bb250 js-sdk rc.2 2019-06-18 15:46:23 +01:00
RiotRobot 3f37fc0cbb v1.2.2-rc.1 2019-06-12 12:00:15 +01:00
RiotRobot b2dfd3e84e js-sdk rc.1 2019-06-12 11:56:30 +01:00
RiotRobot 21c8a64ce1 v1.2.1 2019-05-31 11:26:02 +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 6d383bea1f v1.2.0 2019-05-29 16:02:26 +01:00
RiotRobot 3f1bb494e2 Upgrade JS SDK to 1.2.0 2019-05-29 15:58:17 +01:00
RiotRobot 6cab9dd1d5 v1.2.0-rc.1 2019-05-23 17:16:19 +01:00
RiotRobot bba4029165 Upgrade JS SDK to 1.2.0-rc.1 2019-05-23 16:52:45 +01:00