Commit Graph

750 Commits (b52b8b484896f0f91577bcbfca0a42a0d5ac5ccb)

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