Commit Graph

10383 Commits

Author SHA1 Message Date
RiotRobot
f38aedae85 Reset matrix-js-sdk back to develop branch 2021-04-12 15:32:56 +01:00
RiotRobot
ecf41e6fa5 Merge branch 'master' into develop 2021-04-12 15:32:45 +01:00
RiotRobot
643897a204 Merge branch 'develop' of github.com:vector-im/element-web into develop 2021-04-12 15:32:40 +01:00
RiotRobot
0bc5a01228 v1.7.25 2021-04-12 15:29:40 +01:00
RiotRobot
95fb11a2b9 Prepare changelog for v1.7.25 2021-04-12 15:29:40 +01:00
RiotRobot
19748762a5 Upgrade matrix-react-sdk to 3.18.0 2021-04-12 15:27:10 +01:00
RiotRobot
d1d6ef55ff Upgrade matrix-js-sdk to 9.11.0 2021-04-12 15:26:37 +01:00
Travis Ralston
75aef71fe6
Merge pull request #16883 from vector-im/travis/no-staging
Switch develop to not-staging Scalar by default
2021-04-07 10:31:11 -06:00
Travis Ralston
5207e35488 Switch develop to not-staging Scalar by default 2021-04-07 10:20:16 -06:00
Travis Ralston
040058957f
Merge pull request #16880 from vector-im/travis/sso-redirect-auto
Support a config option to skip login/welcome and go to SSO
2021-04-07 07:40:50 -06:00
RiotRobot
11ce4fa41b v1.7.25-rc.1 2021-04-07 13:11:55 +01:00
RiotRobot
74b4c91d58 Prepare changelog for v1.7.25-rc.1 2021-04-07 13:11:54 +01:00
RiotRobot
c7d34ae926 Upgrade matrix-react-sdk to 3.18.0-rc.1 2021-04-07 13:09:19 +01:00
RiotRobot
9400bd1fd2 Upgrade matrix-js-sdk to 9.11.0-rc.1 2021-04-07 13:07:02 +01:00
J. Ryan Stinnett
e7301ffd74
Merge pull request #16882 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2021-04-07 12:44:56 +01:00
Weblate
43bc270284 Merge branch 'origin/develop' into Weblate. 2021-04-07 11:42:17 +00:00
Travis Ralston
5642fc4026 Doc the return 2021-04-06 19:43:24 -06:00
Travis Ralston
97a43d058d Support a config option to skip login/welcome and go to SSO
For deployments which want this sort of functionality for their users. Ideal for self-hosted deployments.
2021-04-06 19:39:26 -06:00
Hakim Oubouali
46082f63b3 Translated using Weblate (Central Atlas Tamazight)
Currently translated at 39.3% (13 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/tzm/
2021-04-05 01:34:17 +00:00
Travis Ralston
3f0f077ced
Merge pull request #16838 from vector-im/revert-16698-gzip-static
Revert "Docker image: serve pre-compressed assets using gzip_static"
2021-04-01 07:26:03 -06:00
Travis Ralston
dfa70b0637
Revert "Docker image: serve pre-compressed assets using gzip_static" 2021-03-31 17:59:39 -06:00
Germain
184efbbc44
Merge pull request #16814 from vector-im/gsouquet-docs 2021-03-31 12:51:40 +01:00
Germain
a9db513352
Update docs/native-node-modules.md
Co-authored-by: J. Ryan Stinnett <jryans@gmail.com>
2021-03-29 18:07:45 +01:00
Germain Souquet
1ea1d29d3e Move native node modules documentation to element-desktop 2021-03-29 15:59:21 +01:00
RiotRobot
ff74d3ce13 Reset matrix-react-sdk back to develop branch 2021-03-29 13:45:49 +01:00
RiotRobot
75f840a214 Reset matrix-js-sdk back to develop branch 2021-03-29 13:45:37 +01:00
RiotRobot
fd85d3f33d Merge branch 'master' into develop 2021-03-29 13:45:26 +01:00
RiotRobot
ac15f2755c v1.7.24 2021-03-29 13:42:29 +01:00
RiotRobot
d178286e2b Prepare changelog for v1.7.24 2021-03-29 13:42:28 +01:00
RiotRobot
929fa5d59d Upgrade matrix-react-sdk to 3.17.0 2021-03-29 13:38:52 +01:00
RiotRobot
20b1321818 Upgrade matrix-js-sdk to 9.10.0 2021-03-29 13:38:31 +01:00
Germain
47486e84dd
Merge pull request #16781 from vector-im/gsouquet-warn-before-exit
Add user settings for warn before exit
2021-03-29 12:07:59 +01:00
RainSlide
83ebda350a Translated using Weblate (Chinese (Simplified))
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/zh_Hans/
2021-03-29 09:17:03 +00:00
RainSlide
6fa5591cfe Translated using Weblate (Chinese (Simplified))
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/zh_Hans/
2021-03-26 11:34:14 +00:00
Travis Ralston
a2074cbc02
Merge pull request #16768 from ShadowJonathan/patch-1
Change ISSUE_TEMPLATE bold lines to proper headers
2021-03-25 09:01:11 -06:00
Germain Souquet
1d79f97a7a Add user settings for warn before exit 2021-03-25 14:15:34 +00:00
J. Ryan Stinnett
57d5206592
Merge pull request #16447 from nielsbasjes/AddK8sExampleConfig
Add example for deployment into Kubernetes
2021-03-25 13:18:14 +00:00
J. Ryan Stinnett
912e7c9f68
Merge pull request #16770 from ShadowJonathan/patch-2
Create bare-bones `PULL_REQUEST_TEMPLATE.md`
2021-03-25 13:13:55 +00:00
RiotRobot
a05c68e8d9 v1.7.24-rc.1 2021-03-25 12:30:33 +00:00
RiotRobot
9063f07b05 Prepare changelog for v1.7.24-rc.1 2021-03-25 12:30:33 +00:00
RiotRobot
a13863714c Upgrade matrix-react-sdk to 3.17.0-rc.1 2021-03-25 12:23:53 +00:00
RiotRobot
5e6ae6a855 Upgrade matrix-js-sdk to 9.10.0-rc.1 2021-03-25 12:23:18 +00:00
Jonathan de Jong
9e15000ea1
Create PULL_REQUEST_TEMPLATE.md 2021-03-24 17:00:59 +01:00
Travis Ralston
6201c3a3f5
Merge pull request #16705 from vector-im/travis/voice-messages/exp
Add webpack config and labs flag docs for voice messages
2021-03-24 09:56:39 -06:00
Jonathan de Jong
88bf562150
Update suggestion-or-feature-request.md 2021-03-24 16:53:08 +01:00
J. Ryan Stinnett
c5cff11fba
Merge pull request #16766 from RiotTranslateBot/weblate-element-web-element-web
Translations update from Weblate
2021-03-24 15:48:51 +00:00
Weblate
11d02f68da Merge branch 'origin/develop' into Weblate. 2021-03-24 15:47:50 +00:00
RainSlide
61ad5409ea Translated using Weblate (Chinese (Simplified))
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/zh_Hans/
2021-03-24 15:47:48 +00:00
Travis Ralston
8ad5640ece
Merge pull request #16698 from kvadevack/gzip-static
Docker image: serve pre-compressed assets using gzip_static
2021-03-23 19:06:22 -06:00
Travis Ralston
4eb7c1bc00 Add docs for where the worker comes from 2021-03-23 18:29:26 -06:00