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

9282 Commits

Author SHA1 Message Date
RiotRobot 4548831ac5 Reset matrix-js-sdk back to develop branch 2020-03-04 13:07:45 +00:00
RiotRobot d88f9ed2c0 Merge branch 'master' into develop 2020-03-04 13:06:43 +00:00
RiotRobot 6e68c106f7 v1.5.12 2020-03-04 12:58:03 +00:00
RiotRobot 2507073c20 Prepare changelog for v1.5.12 2020-03-04 12:58:03 +00:00
RiotRobot 096831c9df v1.5.12 2020-03-04 12:01:38 +00:00
RiotRobot c26396d693 Upgrade matrix-react-sdk to 2.2.1 2020-03-04 12:01:31 +00:00
RiotRobot b52b0f525f Log packages when checking version 2020-03-04 12:00:37 +00:00
Weblate 39ee5d77bd Merge branch 'origin/develop' into Weblate. 2020-03-03 22:27:52 +00:00
Michael Telatynski 48c8f16a4c
Merge pull request #12590 from vector-im/t3chguy/sso 
riot-desktop open SSO in browser so user doesn't have to auth twice
 2020-03-03 22:27:46 +00:00
J. Ryan Stinnett adc329c67f Revert "Upgrade to Electron 8.0.2" 
This reverts commit 9b9d585af0.
 2020-03-03 13:21:49 -07:00
J. Ryan Stinnett 2a5438d636 Revert "Remove will-navigate comment after Electron fix" 
This reverts commit 749d7e8e4c.
 2020-03-03 13:20:12 -07:00
Michael Telatynski 706834939f Revert "Remove will-navigate as we expect it to be broken like pre-8.0.2" 
This reverts commit fb656ce8bd.
 2020-03-03 13:20:03 -07:00
tctovsli 4525ead1df Translated using Weblate (Norwegian Nynorsk) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nn/
 2020-03-02 20:25:33 +00:00
tctovsli 1f42f33102 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nb_NO/
 2020-03-02 20:25:33 +00:00
forteller 0e3e1f3a9d Translated using Weblate (Norwegian Bokmål) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nb_NO/
 2020-03-02 20:25:33 +00:00
Szimszon 4399af4189 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2020-03-02 20:25:33 +00:00
Tentarial 2514f11471 Translated using Weblate (German) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2020-03-02 20:25:33 +00:00
Michal Stanke 0546c74b3b Translated using Weblate (Czech) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2020-03-02 20:25:33 +00:00
ctr 340b6bf0d2 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
 2020-03-02 20:25:33 +00:00
Michael Telatynski bb6afd7c30 backport riot-desktop implementation into riot-web 2020-03-02 20:16:41 +00:00
Michael Telatynski 09ed0e781a Update copy for SSO modal 2020-03-02 20:04:31 +00:00
RiotRobot 94ceb5a46b Reset SDKs back to develop branch 2020-03-02 17:57:08 +00:00
RiotRobot d077165858 Merge branch 'master' into develop 2020-03-02 17:55:04 +00:00
RiotRobot 43b70bf720 v1.5.11 2020-03-02 17:51:01 +00:00
RiotRobot 0c4048484e Prepare changelog for v1.5.11 2020-03-02 17:51:00 +00:00
RiotRobot 8710f7d196 v1.5.11 2020-03-02 17:47:58 +00:00
RiotRobot 620414187f Upgrade matrix-react-sdk to 2.2.0 2020-03-02 17:47:53 +00:00
RiotRobot e71dcacd2d Upgrade matrix-js-sdk to 5.1.0 2020-03-02 17:47:32 +00:00
Michael Telatynski 178c61dbf7 fix typo 2020-03-02 15:01:06 +00:00
Michael Telatynski c197661be0 riot-desktop open SSO in browser so user doesn't have to auth twice 2020-03-02 14:59:55 +00:00
Michael Telatynski fb656ce8bd Remove will-navigate as we expect it to be broken like pre-8.0.2 2020-03-02 13:08:04 +00:00
J. Ryan Stinnett 749d7e8e4c Remove will-navigate comment after Electron fix 
Electron 8.0.2 and later (which we're now using) resolves this issue with
`will-navigate`.
 2020-03-02 13:07:49 +00:00
Michael Telatynski e238fead7c
Merge pull request #12585 from vector-im/t3chguy/sso 
Fix SSO flows for electron 8.0.2 by re-breaking will-navigate
 2020-03-02 12:56:41 +00:00
Michael Telatynski 0d9be8c255 Remove will-navigate as we expect it to be broken like pre-8.0.2 2020-03-02 11:09:06 +00:00
Travis Ralston 0e37aa9f69
Merge pull request #12563 from krkk/noscript 
index.html: Place noscript on top of the page
 2020-02-28 13:43:17 -07:00
Travis Ralston 22bc98c8bc Merge branch 'develop' into noscript 2020-02-28 13:34:39 -07:00
J. Ryan Stinnett 769c8b1f27
Merge pull request #12561 from vector-im/jryans/elec-will-nav 
Remove will-navigate comment after Electron fix
 2020-02-28 18:02:55 +00:00
J. Ryan Stinnett 1043b0eb11 Remove will-navigate comment after Electron fix 
Electron 8.0.2 and later (which we're now using) resolves this issue with
`will-navigate`.
 2020-02-28 11:42:08 +00:00
J. Ryan Stinnett 6bc79ad54a
Merge pull request #12552 from vector-im/jryans/safari-e2e-idb 
Update loading test for JS SDK IDB change
 2020-02-27 16:48:16 +00:00
J. Ryan Stinnett c70bfe1f91 Update loading test for JS SDK IDB change 
Part of https://github.com/vector-im/riot-web/issues/12207
 2020-02-27 14:57:52 +00:00
J. Ryan Stinnett a4512ffa6d
Merge pull request #12528 from vector-im/jryans/upgrade-deps-2020-02-26 
Upgrade deps
 2020-02-27 11:24:45 +00:00
J. Ryan Stinnett bb5aa94707 Upgrade deps 2020-02-26 15:04:38 +00:00
RiotRobot 03f63397ff v1.5.11-rc.1 2020-02-26 14:37:19 +00:00
RiotRobot b29a3721d2 Prepare changelog for v1.5.11-rc.1 2020-02-26 14:37:19 +00:00
RiotRobot 00244d5428 v1.5.11-rc.1 2020-02-26 14:35:20 +00:00
RiotRobot a4d01a5f04 Upgrade matrix-react-sdk to 2.2.0-rc.1 2020-02-26 14:34:56 +00:00
RiotRobot 4fced076b7 Upgrade matrix-js-sdk to 5.1.0-rc.1 2020-02-26 14:33:57 +00:00
J. Ryan Stinnett 9b9d585af0 Upgrade to Electron 8.0.2 2020-02-26 13:44:07 +00:00
J. Ryan Stinnett 76430a9c77
Merge pull request #12523 from vector-im/jryans/relax-windows-signing 
Change Windows signing to warning when missing token
 2020-02-26 13:31:48 +00:00
Michael Telatynski dacbc4dc6d
Merge pull request #12524 from vector-im/t3chguy/eval 
Modernizr remove t3st/es6/contains
 2020-02-26 12:23:34 +00:00