OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
10,229 Commits
209 Branches
550 Tags
414 MiB
Commit Graph

10229 Commits (e18bf6be86f2f0a39d449fef825a7632dc0ddefe)

Author SHA1 Message Date
RiotRobot e18bf6be86 Reset matrix-react-sdk back to develop branch 2021-02-16 11:21:21 +00:00
RiotRobot 7562fd3703 Reset matrix-js-sdk back to develop branch 2021-02-16 11:21:08 +00:00
RiotRobot 57f0d5191d Merge branch 'master' into develop 2021-02-16 11:20:55 +00:00
RiotRobot dd0e2e52f8 v1.7.21 2021-02-16 11:18:00 +00:00
RiotRobot 2e00314dc0 Prepare changelog for v1.7.21 2021-02-16 11:18:00 +00:00
RiotRobot afb469ce42 Upgrade matrix-react-sdk to 3.14.0 2021-02-16 11:14:40 +00:00
RiotRobot 31ec953a92 Upgrade matrix-js-sdk to 9.7.0 2021-02-16 11:11:43 +00:00
Travis Ralston 94a5cd3f83
Merge pull request #16456 from vector-im/travis/sensible-jitsi-names 
Jitsi widget: Read room name from query parameters
 2021-02-15 10:30:12 -07:00
Travis Ralston c67951f254 Jitsi widget: Read room name from query parameters 
This is an aesthetic change to the Jitsi widget and has no bearing on the widget's functionality.

Paired with https://github.com/matrix-org/matrix-react-sdk/pull/5649
 2021-02-15 08:54:56 -07:00
Michael Telatynski 19a07bc4a2
Merge pull request #16415 from bekliev/fix/sso-redirect 
fix / sso: make sure to delete only loginToken after redirect
 2021-02-11 16:57:28 +00:00
Michael Telatynski 438eef0acd
Update src/vector/app.tsx 2021-02-11 16:27:55 +00:00
Michael Telatynski e15d1c1501
Update src/vector/platform/WebPlatform.ts 2021-02-11 16:27:30 +00:00
Ibragim/Parviz Bekliev 92a5787528 Migrating from Node's deprecated `url` API to browser's `URL` 
Related to https://github.com/vector-im/element-web/pull/16292

Signed-off-by: Bekliev Parviz <nightkon95@gmail.com>
 2021-02-11 18:59:59 +03:00
J. Ryan Stinnett af2da9d371
Merge pull request #16433 from vector-im/jryans/disable-countly 
Disable Countly
 2021-02-11 15:26:50 +00:00
J. Ryan Stinnett 68c36ebb49 Disable Countly 
The Countly experiment has ended, so this removes the configuration to enable
it.
 2021-02-11 15:16:24 +00:00
RiotRobot c4c1b728cc v1.7.21-rc.1 2021-02-10 17:03:39 +00:00
RiotRobot 402f97b430 Prepare changelog for v1.7.21-rc.1 2021-02-10 17:03:39 +00:00
RiotRobot f998f85c3c Upgrade matrix-react-sdk to 3.14.0-rc.1 2021-02-10 16:56:55 +00:00
RiotRobot 78d6ad8f29 Upgrade matrix-js-sdk to 9.7.0-rc.1 2021-02-10 16:55:28 +00:00
J. Ryan Stinnett 72e60efadc
Merge pull request #16427 from RiotTranslateBot/weblate-element-web-element-web 
Translations update from Weblate
 2021-02-10 15:38:28 +00:00
jelv e91e513224 Translated using Weblate (Dutch) 
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/nl/
 2021-02-10 15:34:57 +00:00
Andrejs a500240d04 Translated using Weblate (Latvian) 
Currently translated at 87.8% (29 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/lv/
 2021-02-09 20:33:31 +00:00
Ibragim/Parviz Bekliev 3e57378631 fix / sso: after complete login via token make sure to delete only loginToken query-param from the window.location api. 
Related to https://github.com/vector-im/element-web/pull/16292

Signed-off-by: Bekliev Parviz <nightkon95@gmail.com>
 2021-02-09 16:40:52 +03:00
Weblate 42e2ea877a Merge branch 'origin/develop' into Weblate. 2021-02-08 17:40:44 +00:00
J. Ryan Stinnett 2332cecb59
Merge pull request #16408 from vector-im/jryans/regexp-dotall 
Add RegExp dotAll feature test
 2021-02-08 17:40:38 +00:00
J. Ryan Stinnett 27a92a5c89 Add RegExp dotAll feature test 
As mentioned in
https://github.com/vector-im/element-web/issues/16020#issuecomment-774384598,
we're depending on the `dotAll` / `s` regex feature. This adds a test so
browsers without this see an error screen.
 2021-02-08 16:44:59 +00:00
Weblate 4ce13765f7 Merge branch 'origin/develop' into Weblate. 2021-02-08 15:25:26 +00:00
J. Ryan Stinnett e562c54ddc
Merge pull request #16405 from vector-im/jryans/electron-type-merge 
Fix Electron type merging
 2021-02-08 15:25:19 +00:00
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
Weblate 11cc33c8d2 Merge branch 'origin/develop' into Weblate. 2021-02-08 15:10:17 +00:00
J. Ryan Stinnett 9f4d75f2ed
Merge pull request #16381 from vector-im/richvdh-readme-patch-1 
README: remove Jenkins reference
 2021-02-08 15:10:10 +00:00
Andrejs 52f469d7c9 Translated using Weblate (Latvian) 
Currently translated at 84.8% (28 of 33 strings)

Translation: Element Web/element-web
Translate-URL: https://translate.element.io/projects/element-web/element-web/lv/
 2021-02-07 23:33:30 +00:00
iaiz 29639bb0e6 Translated using Weblate (Spanish) 
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/es/
 2021-02-07 23:33:30 +00:00
Richard van der Hoff 0d4958319b
README: remove Jenkins reference 2021-02-05 16:16:48 +00:00
Weblate dfd17fedfe Merge branch 'origin/develop' into Weblate. 2021-02-04 15:28:09 +00:00
Yamamoto Kenji cfadc616b2 Translated using Weblate (Japanese) 
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/ja/
 2021-02-04 15:28:09 +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
Weblate cefe8cf379 Merge branch 'origin/develop' into Weblate. 2021-02-04 12:45:06 +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
Weblate 105d1c8c41 Merge branch 'origin/develop' into Weblate. 2021-02-04 12:39:46 +00:00
Rintan 4f852f3d69 Translated using Weblate (Japanese) 
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/ja/
 2021-02-04 12:39:45 +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
Weblate b617cb78e7 Merge branch 'origin/develop' into Weblate. 2021-02-03 12:30:05 +00:00
RiotRobot c6e94c61db Reset matrix-react-sdk back to develop branch 2021-02-03 12:29:53 +00:00