Commit Graph

10183 Commits (993c2e50b518842cf87f8c7c42a39048117ee34c)

Author SHA1 Message Date
J. Ryan Stinnett 993c2e50b5 Fix Electron type merging
This changes to an interface for Electron types so that other layers can merge
in further APIs as needed, such as the JS SDK.
2021-02-08 15:12:31 +00:00
Michael Telatynski 816ea3d904
Merge pull request #16307 from vector-im/t3chguy/spaces
Enable PostCSS Calc in webpack builds
2021-02-04 15:28:01 +00:00
J. Ryan Stinnett 4acdb7c715
Merge pull request #16367 from vector-im/add-readme-security-best-practices
Add configuration security best practices to the README.
2021-02-04 12:44:59 +00:00
RiotRobot 1b276c9e00 Reset matrix-react-sdk back to develop branch 2021-02-04 12:27:31 +00:00
RiotRobot fb67a14486 Reset matrix-js-sdk back to develop branch 2021-02-04 12:25:41 +00:00
RiotRobot ab828ac6d9 Merge branch 'master' into develop 2021-02-04 12:24:38 +00:00
Denis Kasak b22484d203 Add configuration security best practices to the README.
Closes #13870.
2021-02-04 13:24:19 +01:00
RiotRobot ff9df5dd1f v1.7.20 2021-02-04 12:19:46 +00:00
RiotRobot 5523d7e0f5 Prepare changelog for v1.7.20 2021-02-04 12:12:00 +00:00
RiotRobot f2bb636373 Upgrade matrix-react-sdk to 3.13.1 2021-02-04 12:09:36 +00:00
RiotRobot c6e94c61db Reset matrix-react-sdk back to develop branch 2021-02-03 12:29:53 +00:00
RiotRobot 9a32dd7071 Reset matrix-js-sdk back to develop branch 2021-02-03 12:29:42 +00:00
RiotRobot 8d604ced78 Merge branch 'master' into develop 2021-02-03 12:28:56 +00:00
RiotRobot 56caad3ef2 v1.7.19 2021-02-03 12:24:51 +00:00
RiotRobot 0bce2de538 Prepare changelog for v1.7.19 2021-02-03 12:24:50 +00:00
RiotRobot 7c8ecaaca3 Upgrade matrix-react-sdk to 3.13.0 2021-02-03 12:21:31 +00:00
RiotRobot db0897f78e Upgrade matrix-js-sdk to 9.6.0 2021-02-03 12:16:48 +00:00
J. Ryan Stinnett a34361fcd7
Merge pull request #16348 from vector-im/jryans/tally-ho-release
[Release] Upgrade matrix-widget-api
2021-02-02 15:28:14 +00:00
J. Ryan Stinnett d2c161b451 Upgrade matrix-widget-api 2021-02-02 15:22:24 +00:00
J. Ryan Stinnett 173ca66f29
Merge pull request #16347 from vector-im/jryans/tally-ho
Upgrade matrix-widget-api
2021-02-02 15:14:04 +00:00
J. Ryan Stinnett ade9babb80 Upgrade matrix-widget-api 2021-02-02 15:04:27 +00:00
RiotRobot 341c806ac1 v1.7.19-rc.1 2021-01-29 17:34:02 +00:00
RiotRobot 2f9395e4a4 Prepare changelog for v1.7.19-rc.1 2021-01-29 17:34:02 +00:00
RiotRobot 4b25054d92 Upgrade matrix-react-sdk to 3.13.0-rc.1 2021-01-29 17:30:39 +00:00
RiotRobot e010e27f9d Upgrade matrix-js-sdk to 9.6.0-rc.1 2021-01-29 17:30:19 +00:00
J. Ryan Stinnett e31051e5ea
Merge pull request #16314 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2021-01-29 17:13:42 +00:00
Weblate 3d47540846 Merge branch 'origin/develop' into Weblate. 2021-01-29 13:29:10 +00:00
Michael Telatynski d5a824d6dd
Merge pull request #16292 from vector-im/t3chguy/sso_fixes
Use history replaceState instead of redirect for SSO flow
2021-01-29 13:29:02 +00:00
Weblate 75f6c017c1 Merge branch 'origin/develop' into Weblate. 2021-01-29 11:18:20 +00:00
J. Ryan Stinnett 8f0537f9a3
Merge pull request #16301 from vector-im/jryans/maybe-mobile
Document the mobile guide toast option
2021-01-29 11:18:14 +00:00
Weblate 024549cef4 Merge branch 'origin/develop' into Weblate. 2021-01-29 11:02:33 +00:00
J. Ryan Stinnett 5af530c24e Lock new version of React SDK for widget API 2021-01-29 11:02:19 +00:00
Weblate 8cb5e47ee7 Merge branch 'origin/develop' into Weblate. 2021-01-29 10:12:56 +00:00
J. Ryan Stinnett 313e82ac2d
Merge pull request #16303 from vector-im/travis/update-deps/wapi-12
Update widget-api to beta.12
2021-01-29 10:12:49 +00:00
Michael Telatynski 9133b80f2b
Merge branch 'develop' into t3chguy/spaces 2021-01-29 09:19:40 +00:00
Michael Telatynski 97925a6ad9 Iterate SpacePanel, fix tooltips and give consistent expanded states 2021-01-29 09:16:55 +00:00
Travis Ralston e40fa8823a Update widget-api to beta.12 2021-01-28 20:44:53 -07:00
J. Ryan Stinnett bf5a69d3a0 Document the mobile guide toast option
Part of https://github.com/vector-im/element-web/issues/16283
2021-01-28 17:28:52 +00:00
Weblate 4517e6512e Merge branch 'origin/develop' into Weblate. 2021-01-27 14:59:39 +00:00
J. Ryan Stinnett 86310a4de0
Merge pull request #16294 from vector-im/jryans/upgrade-deps-2021-01
Upgrade deps 2021-01
2021-01-27 14:59:31 +00:00
J. Ryan Stinnett 8140a9618e Explicitly enable ES proposals already in use 2021-01-27 14:50:00 +00:00
J. Ryan Stinnett 0f3623393f Fix typing errors after upgrades 2021-01-27 14:35:02 +00:00
J. Ryan Stinnett c34a36a9e2 Nested upgrades via `yarn upgrade` 2021-01-27 14:33:53 +00:00
J. Ryan Stinnett d03edb91ea Apply somple major version upgrades 2021-01-27 14:31:17 +00:00
J. Ryan Stinnett ab0677530b Nested upgrades via `yarn upgrade` 2021-01-27 14:17:53 +00:00
J. Ryan Stinnett e7c722bb99 Pin React types to 16.x for now
This avoids type conflicts from other deps that depends on just `*`. Type deps
needs to be de-duplicated down to a single version to avoid errors (unlike code
deps).
2021-01-27 14:14:25 +00:00
J. Ryan Stinnett 48613027fc Upgrade to latest minor deps 2021-01-27 14:10:51 +00:00
Michael Telatynski d47948fb7b Improve SSO auth flow
Use replaceState instead of a redirect to strip the loginToken
Put user into the same post-auth flows of E2ESetup
Skip UIA prompt in this post-auth flow, happy path is a server grace period
2021-01-27 12:50:14 +00:00
Weblate a47be2236b Merge branch 'origin/develop' into Weblate. 2021-01-26 12:29:40 +00:00
@a2sc:matrix.org 49b2f37dc8 Translated using Weblate (German)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/de/
2021-01-26 12:29:40 +00:00