Michael Telatynski
7cde32ed2e
Update eslint-plugin-matrix-org
2021-07-20 09:15:26 +01:00
Michael Telatynski
e136afe2eb
Conform to new typescript eslint rules
2021-07-19 22:47:32 +01:00
RiotRobot
9d56b56116
Reset matrix-react-sdk back to develop branch
2021-07-19 16:27:02 +01:00
RiotRobot
bdb03c4490
Reset matrix-js-sdk back to develop branch
2021-07-19 16:26:51 +01:00
RiotRobot
cfa47eec00
Merge branch 'master' into develop
2021-07-19 16:26:38 +01:00
RiotRobot
d75b0b4ee8
v1.7.33
2021-07-19 16:22:37 +01:00
RiotRobot
85e1225a2c
Prepare changelog for v1.7.33
2021-07-19 16:22:36 +01:00
RiotRobot
bc07d91810
Upgrade matrix-react-sdk to 3.26.0
2021-07-19 16:19:36 +01:00
RiotRobot
183cf150e8
Upgrade matrix-js-sdk to 12.1.0
2021-07-19 16:19:11 +01:00
Michael Telatynski
7f735a6c6e
Merge pull request #18053 from vector-im/t3chguy/fix/18032
2021-07-19 12:53:37 +01:00
Michael Telatynski
331678b913
fix edge case around event permalinks
2021-07-19 09:48:50 +01:00
Michael Telatynski
b23aad28ca
Fix browser history getting stuck looping back to the same room
...
E.g if you click a link to room/#foo:bar?via=baz we'll redirect to room/#foo:bar and now hitting back takes you back to the ?via=baz and means you have to hit back twice without this change
2021-07-19 09:40:08 +01:00
Michael Telatynski
ae2e3e8502
Merge pull request #13138 from vector-im/t3chguy/querystring
2021-07-16 19:57:27 +01:00
Michael Telatynski
c7a935777d
Fix the jitsi qs parsing, as the ? after # here is optional, unlike in EW
2021-07-16 19:37:48 +01:00
Michael Telatynski
26fef6f294
actually run the new test and remove unrelated tweak
2021-07-16 13:45:10 +01:00
Michael Telatynski
75e4d16462
use js-sdk decodeParams utility
2021-07-16 13:10:58 +01:00
Michael Telatynski
b03b4582c0
Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/querystring
...
Conflicts:
package.json
src/@types/global.d.ts
src/vector/app.tsx
src/vector/jitsi/index.ts
src/vector/platform/WebPlatform.ts
yarn.lock
2021-07-16 12:45:37 +01:00
David Baker
1aa04fa83c
Merge pull request #18003 from vector-im/dbkr/new_changelogs
...
Update PR template for new changelog generation
2021-07-15 14:12:36 +01:00
Michael Telatynski
2635fc95f4
Merge pull request #17780 from SimonBrandner/fix/space-shortcut-local/17776
...
Fix space shortcuts on layouts with non-English keys in the places of numbers
2021-07-15 13:59:13 +01:00
Michael Telatynski
43695fbc58
Merge branch 'develop' into fix/space-shortcut-local/17776
2021-07-15 13:53:06 +01:00
Michael Telatynski
8289d6937f
Merge pull request #18006 from vector-im/t3chguy/spacesperf
2021-07-15 10:18:18 +01:00
Michael Telatynski
2877ef8fcf
Fix skinning
2021-07-15 08:29:18 +01:00
Michael Telatynski
f65231268d
Cache value of feature_spaces* flags as they cause page refresh so are immutable
2021-07-15 08:26:50 +01:00
Germain
bd4c6b8c6c
Merge pull request #17980 from psrpinto/fix/naming
...
Standardise casing of identity server
2021-07-15 08:07:10 +01:00
David Baker
a0f55c9e8f
Update PR template for new changelog stuff
2021-07-14 23:30:18 +01:00
David Baker
fcf1f06b31
Merge pull request #18002 from vector-im/dbkr/contributing_md
...
Convert CONTRIBUTING to markdown
2021-07-14 23:06:11 +01:00
David Baker
a79a05cd52
Convert CONTRIBUTING to markdown
2021-07-14 22:41:07 +01:00
Michael Telatynski
ca8cbacad7
Merge pull request #17999 from vector-im/t3chguy/ts/c4
2021-07-14 20:14:02 +01:00
Michael Telatynski
2194e4cc10
fix path to worker mock
2021-07-14 19:05:57 +01:00
Michael Telatynski
43afa4c1e0
Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ts/c4
2021-07-14 18:57:50 +01:00
Michael Telatynski
322c957f7f
ignore workers for jest tests because it disagrees with worker-loader
2021-07-14 18:56:35 +01:00
Michael Telatynski
6c476bdc0d
Merge pull request #17963 from vector-im/t3chguy/ts/c3
2021-07-14 18:25:28 +01:00
Michael Telatynski
7aca548f65
Add missing stylelint dependencies and run i18n
2021-07-14 18:13:00 +01:00
Michael Telatynski
80bc659b11
Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ts/c3
...
Conflicts:
src/vector/indexeddb-worker.ts
2021-07-14 17:50:40 +01:00
Michael Telatynski
5646f3aff8
Merge pull request #17962 from vector-im/t3chguy/ts/c2
2021-07-14 17:44:37 +01:00
RiotRobot
d58c4deebb
v1.7.33-rc.1
2021-07-14 17:25:04 +01:00
RiotRobot
280e6528f1
Prepare changelog for v1.7.33-rc.1
2021-07-14 17:25:04 +01:00
RiotRobot
d4638f8825
Bump to RC versions of js-sdk and react-sdk
2021-07-14 17:20:15 +01:00
Michael Telatynski
22a25f0e95
Merge pull request #17931 from vector-im/t3chguy/ts/c1
...
Improve and consolidate typing
2021-07-14 17:19:10 +01:00
David Baker
b79868c57d
Merge pull request #17991 from RiotTranslateBot/weblate-element-web-element-web
...
Translations update from Weblate
2021-07-14 11:51:53 +01:00
Weblate
55ca8d14bb
Merge branch 'origin/develop' into Weblate.
2021-07-14 10:44:15 +00:00
Michael Telatynski
c6a8675526
Merge pull request #17990 from vector-im/revert-17927-patch-1
2021-07-14 09:41:08 +01:00
Michael Telatynski
12b93c1696
Revert "Don't run nginx as root in docker"
2021-07-14 09:40:46 +01:00
Michael Telatynski
503995270c
Merge pull request #17927 from JuniorJPDJ/patch-1
2021-07-14 09:08:09 +01:00
Michael Telatynski
6155c5bea0
Merge pull request #17982 from SimonBrandner/ignore-vscode
2021-07-13 19:19:33 +01:00
Šimon Brandner
6a89d15807
Ignore vscode
...
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
2021-07-13 20:11:56 +02:00
Paulo Pinto
0b6789c290
Standardise casing of identity server
...
Signed-off-by: Paulo Pinto <paulo.pinto@automattic.com>
2021-07-13 16:19:56 +01:00
Michael Telatynski
202f3de54b
Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/ts/c4
2021-07-13 15:46:28 +01:00
J. Ryan Stinnett
20e5e86f1a
Merge pull request #17973 from vector-im/jryans/rm-canvas-docker-deps
...
Remove canvas native dependencies from Dockerfile
2021-07-13 10:17:09 +01:00
J. Ryan Stinnett
3c10bc54ba
Remove canvas native dependencies from Dockerfile
...
As of https://github.com/vector-im/element-web/pull/17967 , `canvas` is no longer
used, so we don't need install these native deps for building it on arm64.
2021-07-13 09:59:02 +01:00
