Commit Graph

889 Commits

Author SHA1 Message Date
RiotRobot
aa0c6f1f71 Reset matrix-js-sdk back to develop branch 2020-05-05 11:40:37 +01:00
RiotRobot
338486b561 Merge branch 'master' into develop 2020-05-05 11:27:52 +01:00
RiotRobot
854855a5aa v2.5.0 2020-05-05 11:10:36 +01:00
RiotRobot
1423c2e4bc Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:04:24 +01:00
RiotRobot
ccb6d91988 v2.5.0-rc.6 2020-05-01 16:30:10 +01:00
RiotRobot
b5cb912cfd Upgrade matrix-js-sdk to 6.0.0-rc.2 2020-05-01 16:24:59 +01:00
RiotRobot
619fbd6adc v2.5.0-rc.5 2020-04-30 11:30:14 +01:00
RiotRobot
5a29bf569d Upgrade matrix-js-sdk to 6.0.0-rc.1 2020-04-30 11:21:33 +01:00
Michael Telatynski
42a857cb5e Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support"
(cherry picked from commit 972f9d354d)
2020-04-24 13:24:54 +01:00
Michael Telatynski
972f9d354d
Revert "Update emojibase for fixed emoji codepoints and Emoji 13 support" 2020-04-24 12:25:19 +01:00
RiotRobot
941709d19a v2.5.0-rc.4 2020-04-23 15:55:37 +01:00
RiotRobot
86200812a5 Upgrade matrix-js-sdk to 5.3.1-rc.4 2020-04-23 15:49:21 +01:00
Travis Ralston
a55698e943 Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements 2020-04-20 09:22:38 -06:00
Michael Telatynski
3bc5a0a0b2 Convert submit-rageshake to typescript
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-19 12:06:56 +01:00
RiotRobot
1ee2d6f3a2 v2.5.0-rc.3 2020-04-17 17:51:49 +01:00
RiotRobot
383915d5cc Upgrade matrix-js-sdk to 5.3.1-rc.3 2020-04-17 17:46:55 +01:00
Travis Ralston
6d46ef548e Enable tests again to catch failures 2020-04-16 16:26:29 -06:00
RiotRobot
23f167d681 v2.5.0-rc.2 2020-04-16 20:01:46 +01:00
RiotRobot
c6746e68b2 Upgrade matrix-js-sdk to 5.3.1-rc.2 2020-04-16 19:56:11 +01:00
Travis Ralston
c3f90ed289 Short-circuit all end to end tests 2020-04-16 12:42:42 -06:00
Travis Ralston
1deece3fb5 Short-circuit all end to end tests 2020-04-16 12:41:48 -06:00
RiotRobot
6ee09cd688 v2.5.0-rc.1 2020-04-15 19:18:45 +01:00
RiotRobot
5022eaf483 Upgrade matrix-js-sdk to 5.3.1-rc.1 2020-04-15 19:13:00 +01:00
RiotRobot
a054ea0653 Merge branch 'release-v2.4.0' into release-v2.5.0 2020-04-15 19:07:11 +01:00
Travis Ralston
77bdde4021 Merge branch 'travis/moar-jitsi' into travis/addwidget-improvements 2020-04-14 12:58:16 -06:00
Michael Telatynski
4fc88d69a3 Remove unused react-addons-css-transition-group
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-12 01:04:54 +01:00
Travis Ralston
0165ff0bc9 Allow iframes and Jitsi URLs in /addwidget
Fixes https://github.com/vector-im/riot-web/issues/12784
2020-04-09 16:03:40 -06:00
RiotRobot
0d1b7b9963 v2.4.0-rc.1 2020-04-08 13:59:23 +01:00
RiotRobot
6095a00703 Upgrade matrix-js-sdk to 5.3.0-rc.1 2020-04-08 13:52:46 +01:00
Michael Telatynski
5ac68d4ce0 Update emojibase for fixed emoji codepoints and Emoji 13 support
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-04-06 11:10:00 +01:00
RiotRobot
d8d48275c3 Merge branch 'master' into develop 2020-04-01 14:59:01 +01:00
RiotRobot
adb2fc89e2 v2.3.1 2020-04-01 14:57:53 +01:00
RiotRobot
78fd8e4569 Reset matrix-js-sdk back to develop branch 2020-03-30 13:42:52 +01:00
RiotRobot
e32e9cec06 v2.3.0 2020-03-30 13:41:02 +01:00
RiotRobot
d369695e22 Upgrade matrix-js-sdk to 5.2.0 2020-03-30 13:31:42 +01:00
RiotRobot
2fe0edd3eb v2.3.0-rc.1 2020-03-26 13:21:11 +00:00
RiotRobot
a1c83a4f0e Upgrade matrix-js-sdk to 5.2.0-rc.1 2020-03-26 13:02:54 +00:00
Travis Ralston
94d23c815a Improve naming of Jitsi conferences
Fixes https://github.com/vector-im/riot-web/issues/12812
2020-03-20 14:19:47 -06:00
Michael Telatynski
d593a76f28 Merge branches 'develop' and 't3chguy/kbd' of github.com:matrix-org/matrix-react-sdk into t3chguy/kbd 2020-03-18 20:41:13 +00:00
Michael Telatynski
cad28c81c0 Add Keyboard shortcuts dialog
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-18 16:40:21 +00:00
Michael Telatynski
42ee157645
Merge pull request #4217 from matrix-org/t3chguy/gemini
Remove Gemini Scrollbars
2020-03-18 14:03:51 +00:00
RiotRobot
b09c063d1b Reset matrix-js-sdk back to develop branch 2020-03-17 14:25:44 +00:00
RiotRobot
8e8723bb36 Merge branch 'master' into develop 2020-03-17 14:24:35 +00:00
RiotRobot
1e3b917aed v2.2.3 2020-03-17 14:18:15 +00:00
RiotRobot
83b6155637 Upgrade matrix-js-sdk to 5.1.1 2020-03-17 14:12:15 +00:00
Michael Telatynski
44b0aa2d88 Remove remainders of gemini-scrollbar and react-gemini-scrollbar
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2020-03-17 10:31:45 +00:00
Travis Ralston
751bcfb1f5 Supply --jsx react to tsc 2020-03-11 18:24:01 -06:00
Travis Ralston
7dd7417f12 Enable support for TypeScript in components
Includes: compilation, translations, IDE support (use .tsx not .ts), typings, and other build tools.

TypeScript component have to import PropTypes and React with `import * as React from 'react';`
2020-03-11 18:03:43 -06:00
RiotRobot
9b6986e862 v2.2.3-rc.1 2020-03-11 17:33:57 +00:00
RiotRobot
57022d9355 Reset matrix-js-sdk back to develop branch 2020-03-11 16:25:15 +00:00