gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,970 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

7970 Commits

Author SHA1 Message Date
Michael Telatynski 5ffdc79bc7 Fix skinning replaces being broken since being rewritten as React FC's 2019-10-28 18:17:52 +00:00
J. Ryan Stinnett 6ada5e4397
Merge pull request #11249 from vector-im/jryans/identity-update-config 
Update config docs about identity servers
 2019-10-28 19:56:47 +02:00
J. Ryan Stinnett 19e183c801
Add missing word 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-10-28 19:56:38 +02:00
J. Ryan Stinnett 5117c04883 Update config docs about identity servers 
This updates the discussion of identity servers in the config docs to match what
was shipped in the privacy sprint.

Fixes https://github.com/vector-im/riot-web/issues/10982
 2019-10-28 16:57:22 +00:00
J. Ryan Stinnett 575751323c
Merge pull request #11248 from vector-im/jryans/identity-server-warnings 
Remove unneeded help about identity servers
 2019-10-28 18:19:47 +02:00
J. Ryan Stinnett 716c5c828b Remove unneeded help about identity servers 
The custom server path no longer shows an identity server field (for modern
homeservers), so it's confusing to have the help dialog reference it.

Fixes https://github.com/vector-im/riot-web/issues/11236
 2019-10-28 15:44:41 +00:00
David Baker 7bfda36ae5
Merge pull request #11243 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-10-28 09:55:39 +00:00
Weblate 636f6db51c Merge branch 'origin/develop' into Weblate. 2019-10-24 15:03:41 +00:00
Travis Ralston dcbe51c855
Merge pull request #11207 from vector-im/travis/matrix.org-sample 
Update sample config for new matrix.org CS API URL
 2019-10-24 09:03:35 -06:00
MamasLT 7e6d07ea88 Translated using Weblate (Lithuanian) 
Currently translated at 62.5% (15 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lt/
 2019-10-24 03:24:39 +00:00
Travis Ralston 4c92e0aa2c Update sample config for new matrix.org CS API URL 
This was missed in https://github.com/vector-im/riot-web/pull/11112
 2019-10-23 13:16:00 -06:00
Walter 8440abcee5 Translated using Weblate (Russian) 
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2019-10-23 08:14:11 +00:00
Bruno Windels 5b1c615498
Merge pull request #11115 from vector-im/bwindels/merge-e2e-tests 
clarify where the e2e tests are located
 2019-10-21 12:20:53 +00:00
Bruno Windels a3a8da1746 provide deep link to e2e instructions in react sdk 2019-10-21 14:13:57 +02:00
David Baker 7373e9cdd7
Merge pull request #11171 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-10-21 10:08:12 +01:00
Weblate 24e4162e76 Merge branch 'origin/develop' into Weblate. 2019-10-20 10:45:09 +00:00
Matthew Hodgson c219be1dc2
Merge pull request #6155 from rugk/patch-3 
Prevent referrers from being sent
 2019-10-20 11:45:04 +01:00
Matthew Hodgson 4e619b1693
Merge branch 'develop' into patch-3 2019-10-20 11:44:38 +01:00
Weblate f7f2e6c936 Merge branch 'origin/develop' into Weblate. 2019-10-18 15:14:37 +00:00
J. Ryan Stinnett 14f59801d7 Change back to develop branch for deps 2019-10-18 16:14:28 +01:00
Weblate 279a661176 Merge branch 'origin/develop' into Weblate. 2019-10-18 14:02:15 +00:00
RiotRobot 36c07a1c3a Merge branch 'master' into develop 2019-10-18 15:01:21 +01:00
RiotRobot 46b75e8c3c v1.5.0 2019-10-18 14:57:44 +01:00
RiotRobot fd5bb40560 Prepare changelog for v1.5.0 2019-10-18 14:57:44 +01:00
RiotRobot 6d32d0b322 v1.5.0 2019-10-18 14:55:00 +01:00
RiotRobot e275441701 Upgrade to JS SDK v2.4.2 and React SDK v1.7.0 2019-10-18 14:54:02 +01:00
J. Ryan Stinnett 748513aa9a
Merge pull request #11158 from vector-im/jryans/v1.5.0/windows-signing 
Port Windows signing to release
 2019-10-18 14:26:57 +01:00
J. Ryan Stinnett 77731b5674 Merge 'dbkr/windows_signing' into v1.5.0 2019-10-18 14:24:57 +01:00
Weblate 9963c690f2 Merge branch 'origin/develop' into Weblate. 2019-10-18 11:02:10 +00:00
David Baker 8e81685a9f
Merge pull request #11126 from vector-im/dbkr/windows_signing 
Sign main Windows executable
 2019-10-18 12:02:04 +01:00
David Baker 94e721acf2 Update cert name & do bash globbing correctly 2019-10-18 10:31:45 +01:00
David Baker 3545b2751d
typo 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-10-18 10:08:43 +01:00
J. A. Durieux 83eae467f0 Translated using Weblate (Dutch) 
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
 2019-10-16 17:53:22 +00:00
Weblate 605c4ac038 Merge branch 'origin/develop' into Weblate. 2019-10-14 17:27:33 +00:00
Michael Telatynski 5e783124e8
Merge pull request #11140 from vverst/dark-title-bar 
Add darkModeSupport to allow dark themed title bar.
 2019-10-14 18:27:27 +01:00
Nils J. Haugen 36243fb4d3 Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 100.0% (24 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nn/
 2019-10-12 21:52:11 +00:00
David Baker d6884d5b0f Make window signing work 
Almost certainly won't work for cert names with spaces in them
 2019-10-11 16:08:04 +01:00
Weblate 27e6401c97 Merge branch 'origin/develop' into Weblate. 2019-10-11 14:48:09 +00:00
David Baker 21ea6c6283
Merge pull request #11119 from vector-im/dbkr/notarise 
Notarise the macOS app
 2019-10-11 15:48:04 +01:00
Weblate cb60089d44 Merge branch 'origin/develop' into Weblate. 2019-10-11 13:15:29 +00:00
Marek Ľach fe99264553 Translated using Weblate (Slovak) 
Currently translated at 95.8% (23 of 24 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sk/
 2019-10-11 13:15:29 +00:00
J. Ryan Stinnett 38fe2c2a33
Merge pull request #11124 from canova/turkish-label 
Fix the label of Turkish language
 2019-10-11 14:15:25 +01:00
Nazım Can Altınova dd9898e687 Fix the label of Turkish language 
Türk means Turkish as nationality and Türkçe means Turkish as language.
 2019-10-11 14:01:16 +02:00
David Baker 1ff06c4be4 Missing space 
also don't print the signing command line as it has the token password
 2019-10-11 12:21:28 +01:00
David Baker 5a7efcd738 Sign the main executable on windows 
and automate the signing of the installers
 2019-10-11 12:01:50 +01:00
David Baker 071223120b Warn that this might be a while 2019-10-11 10:45:42 +01:00
David Baker 0259eb6419 Go back to upstream electron-notarize 
It doesn't work as a github dependency because the typescript
doesn't get built.
 2019-10-10 18:34:26 +01:00
Bruno Windels 9d91e6366d Merge branch 'develop' into bwindels/merge-e2e-tests 2019-10-10 18:28:56 +02:00
Bruno Windels d1a5376dae clarify where the e2e tests are located 2019-10-10 16:54:52 +02:00
Weblate f283e68073 Merge branch 'origin/develop' into Weblate. 2019-10-10 14:54:15 +00:00