PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
10927 commits 1 branch 0 tags 338 MiB
Commit graph

10927 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
2f0129425d Merge branch 'origin/develop' into Weblate. 2021-07-21 15:59:35 +00:00
David Baker
5ec0ca9175
Merge pull request #18150 from vector-im/dbkr/yarn_upgrade_210721 
yarn upgrade
 2021-07-21 16:59:30 +01:00
David Baker
25b15d084d yarn upgrade 2021-07-21 15:44:13 +01:00
Weblate
3840fc23bd Merge branch 'origin/develop' into Weblate. 2021-07-21 13:53:52 +00:00
Michael Telatynski
9babd7bcd8
Merge pull request #18065 from vector-im/t3chguy/eslint 2021-07-21 14:53:47 +01:00
Weblate
f64b1a9f0e Merge branch 'origin/develop' into Weblate. 2021-07-20 14:40:09 +00:00
Travis Ralston
81da85dac4
Merge pull request #18102 from libexus/translations_guide 
Add the Matrix Space to the translations guide
 2021-07-20 08:40:04 -06:00
Libexus
bf88906de8 Add the Matrix Space to the translations guide 2021-07-20 16:18:33 +02:00
Michael Telatynski
fba49186ed
Merge branch 'develop' into t3chguy/eslint 2021-07-20 09:44:04 +01:00
Michael Telatynski
4b5b0e9244 delint 2021-07-20 09:27:12 +01:00
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
Weblate
cdb4c88b8c Merge branch 'origin/develop' into Weblate. 2021-07-19 20:27:34 +00:00
David Baker
77edbc27f8
Merge pull request #18058 from vector-im/dbkr/upgrade_eslint_plugin_matrix_org 
Update eslint-plugin-matrix-org
 2021-07-19 21:27:29 +01:00
Weblate
87fedc27b1 Merge branch 'origin/develop' into Weblate. 2021-07-19 15:27:09 +00: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
Weblate
b70eb4aba7 Merge branch 'origin/develop' into Weblate. 2021-07-19 15:26:45 +00: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
David Baker
13efb396a9 Update eslint-plugin-matrix-org 2021-07-19 15:34:47 +01:00
Weblate
7619e35638 Merge branch 'origin/develop' into Weblate. 2021-07-19 11:53:42 +00: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
Weblate
ebc1d01f30 Merge branch 'origin/develop' into Weblate. 2021-07-16 18:57:32 +00: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
Weblate
827be982b7 Merge branch 'origin/develop' into Weblate. 2021-07-16 12:26:53 +00:00
justin-cv
c3382199bf Translated using Weblate (Indonesian) 
Currently translated at 100.0% (35 of 35 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/id/
 2021-07-16 12:26:53 +00: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