5688079f72
Merge branch 'origin/develop' into Weblate.
2021-07-23 17:48:06 +00:00
c5280f0d83
Merge pull request #18207 from vector-im/t3chguy/eslint1
2021-07-23 18:48:03 +01:00
153f6f1583
Merge branch 'develop' of github.com:vector-im/element-web into t3chguy/eslint1
2021-07-23 18:42:24 +01:00
940f44c6d3
manually revert bit of yarn going mad
2021-07-23 18:25:34 +01:00
481f67514b
Update matrix-org-eslint-plugin and tighten max warning limit
...
Whilst it is down, make the most of it!
2021-07-23 16:12:07 +01:00
90919c20c3
Merge branch 'origin/develop' into Weblate.
2021-07-23 15:09:25 +00:00
3219cc7605
Translated using Weblate (Romanian)
...
Currently translated at 97.0% (33 of 34 strings)
Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/ro/
2021-07-23 15:09:25 +00:00
89128f28fa
Translated using Weblate (Persian)
...
Currently translated at 100.0% (34 of 34 strings)
Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/fa/
2021-07-23 15:09:25 +00:00
e0c9a6cc8e
Merge pull request #18187 from vector-im/travis/voice-messages/code-cleanup-1
...
Update webpack path for new voice message worker location
2021-07-23 09:09:20 -06:00
5e6b791617
Update webpack path for new worker location
2021-07-22 09:26:53 -06:00
858d71218c
Remove voice messages labs flag docs
...
For https://github.com/matrix-org/matrix-react-sdk/pull/6437
2021-07-21 18:11:06 -06:00
2f0129425d
Merge branch 'origin/develop' into Weblate.
2021-07-21 15:59:35 +00:00
5ec0ca9175
Merge pull request #18150 from vector-im/dbkr/yarn_upgrade_210721
...
yarn upgrade
2021-07-21 16:59:30 +01:00
25b15d084d
yarn upgrade
2021-07-21 15:44:13 +01:00
3840fc23bd
Merge branch 'origin/develop' into Weblate.
2021-07-21 13:53:52 +00:00
9babd7bcd8
Merge pull request #18065 from vector-im/t3chguy/eslint
2021-07-21 14:53:47 +01:00
f64b1a9f0e
Merge branch 'origin/develop' into Weblate.
2021-07-20 14:40:09 +00:00
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
bf88906de8
Add the Matrix Space to the translations guide
2021-07-20 16:18:33 +02:00
fba49186ed
Merge branch 'develop' into t3chguy/eslint
2021-07-20 09:44:04 +01:00
4b5b0e9244
delint
2021-07-20 09:27:12 +01:00
7cde32ed2e
Update eslint-plugin-matrix-org
2021-07-20 09:15:26 +01:00
e136afe2eb
Conform to new typescript eslint rules
2021-07-19 22:47:32 +01:00
cdb4c88b8c
Merge branch 'origin/develop' into Weblate.
2021-07-19 20:27:34 +00:00
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
87fedc27b1
Merge branch 'origin/develop' into Weblate.
2021-07-19 15:27:09 +00:00
9d56b56116
Reset matrix-react-sdk back to develop branch
2021-07-19 16:27:02 +01:00
bdb03c4490
Reset matrix-js-sdk back to develop branch
2021-07-19 16:26:51 +01:00
b70eb4aba7
Merge branch 'origin/develop' into Weblate.
2021-07-19 15:26:45 +00:00
cfa47eec00
Merge branch 'master' into develop
2021-07-19 16:26:38 +01:00
d75b0b4ee8
v1.7.33
2021-07-19 16:22:37 +01:00
85e1225a2c
Prepare changelog for v1.7.33
2021-07-19 16:22:36 +01:00
bc07d91810
Upgrade matrix-react-sdk to 3.26.0
2021-07-19 16:19:36 +01:00
183cf150e8
Upgrade matrix-js-sdk to 12.1.0
2021-07-19 16:19:11 +01:00
13efb396a9
Update eslint-plugin-matrix-org
2021-07-19 15:34:47 +01:00
7619e35638
Merge branch 'origin/develop' into Weblate.
2021-07-19 11:53:42 +00:00
7f735a6c6e
Merge pull request #18053 from vector-im/t3chguy/fix/18032
2021-07-19 12:53:37 +01:00
331678b913
fix edge case around event permalinks
2021-07-19 09:48:50 +01:00
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
ebc1d01f30
Merge branch 'origin/develop' into Weblate.
2021-07-16 18:57:32 +00:00
ae2e3e8502
Merge pull request #13138 from vector-im/t3chguy/querystring
2021-07-16 19:57:27 +01:00
c7a935777d
Fix the jitsi qs parsing, as the `?` after `#` here is optional, unlike in EW
2021-07-16 19:37:48 +01:00
26fef6f294
actually run the new test and remove unrelated tweak
2021-07-16 13:45:10 +01:00
827be982b7
Merge branch 'origin/develop' into Weblate.
2021-07-16 12:26:53 +00:00
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
75e4d16462
use js-sdk decodeParams utility
2021-07-16 13:10:58 +01:00
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
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
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
43695fbc58
Merge branch 'develop' into fix/space-shortcut-local/17776
2021-07-15 13:53:06 +01:00
Weblate