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

9168 Commits

Author SHA1 Message Date
Travis Ralston c16ff9dc11
Merge pull request #13260 from MichaelKohler/issue13089-config-doc 
Document more config options in config.md (fixes #13089)
 2020-04-21 00:32:07 -06:00
Michael Telatynski b3a87b56fa tsc resolveJsonModule 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-20 20:14:33 +01:00
Weblate 5f8a46868e Merge branch 'origin/develop' into Weblate. 2020-04-20 19:13:14 +00:00
Michael Telatynski 3218deff3a
Merge pull request #13295 from vector-im/t3chguy/fix_tests 
Fix tests post-js-sdk-filters change
 2020-04-20 20:13:09 +01:00
Michael Telatynski 1314a8d3f9 undo unrelated change. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-20 20:06:34 +01:00
Michael Telatynski afabf9d4b1 Fix tests post-js-sdk-filters change 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-20 19:47:16 +01:00
Weblate cd62967cae Merge branch 'origin/develop' into Weblate. 2020-04-20 17:16:17 +00:00
Travis Ralston 22b1231e9a
Merge pull request #13227 from vector-im/travis/inline-jitsi-script 
Make Jitsi download script a JS script
 2020-04-20 11:16:12 -06:00
Travis Ralston 4c4f67653e Merge branch 'develop' into travis/inline-jitsi-script 2020-04-20 10:11:55 -06:00
Travis Ralston 3eadf35819 Manually undo emojibase changes in lockfile 2020-04-20 09:49:09 -06:00
Travis Ralston 3f14b31e47 Add more words to explain windows being awful 2020-04-20 09:46:52 -06:00
Weblate 0d456fc0ff Merge branch 'origin/develop' into Weblate. 2020-04-20 15:00:33 +00:00
Michael Telatynski fd343b069e
Merge pull request #13271 from vector-im/t3chguy/cmd_rageshake 
Use matrix-react-sdk type extensions as a base
 2020-04-20 16:00:27 +01:00
Michael Telatynski 982074c12e Use matrix-react-sdk type extensions as a base 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-19 12:10:17 +01:00
Michael Kohler 752b6b63ec Document more config options in config.md (fixes #13089) 
Signed-off-by: Michael Kohler <me@michaelkohler.info>
 2020-04-19 11:44:58 +02:00
Karol Kosek e68770b4a7 Translated using Weblate (Polish) 
Currently translated at 89.3% (25 of 28 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/pl/
 2020-04-18 22:27:54 +00:00
Weblate 75ac6b07cc Merge branch 'origin/develop' into Weblate. 2020-04-17 20:41:36 +00:00
aWeinzierl 68f9019570 Translated using Weblate (German) 
Currently translated at 100.0% (28 of 28 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2020-04-17 20:41:36 +00:00
alexsal86 f1302f0261 Translated using Weblate (German) 
Currently translated at 100.0% (28 of 28 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2020-04-17 20:41:36 +00:00
Travis Ralston 19130dc705
Merge pull request #13235 from TheStranjer/allow-random-welcome-bgs 
Allow Riot Web to randomly pick welcome backgrounds
 2020-04-17 14:41:31 -06:00
RiotRobot 4e07c64790 v1.6.0-rc.3 2020-04-17 18:00:55 +01:00
RiotRobot f4290cd433 Prepare changelog for v1.6.0-rc.3 2020-04-17 18:00:55 +01:00
RiotRobot 15922f6656 v1.6.0-rc.3 2020-04-17 17:58:57 +01:00
RiotRobot 393d701ee9 Upgrade matrix-js-sdk to 5.3.1-rc.3 2020-04-17 17:58:52 +01:00
RiotRobot ef5d1f421d Upgrade matrix-react-sdk to 2.5.0-rc.3 2020-04-17 17:57:33 +01:00
The Stranjer b3f3126583 Better conformity to JS linter 2020-04-17 06:52:43 -04:00
The Stranjer 3a551f2da5 Allow admins to create an array of backgrounds to be randomly chosen from 2020-04-17 06:31:49 -04:00
Weblate a5617c50bb Merge branch 'origin/develop' into Weblate. 2020-04-16 21:56:45 +00:00
Szimszon fdcd214e32 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (28 of 28 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2020-04-16 21:56:45 +00:00
Øjvind Fritjof Arnfred bcc356f266 Translated using Weblate (Danish) 
Currently translated at 100.0% (28 of 28 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/da/
 2020-04-16 21:56:45 +00:00
Travis Ralston 8122c62f24
Merge pull request #13224 from vector-im/travis/xsign-labs-docs 
Update cross-signing feature docs and document fallback procedures
 2020-04-16 15:56:39 -06:00
RiotRobot c71338852e v1.6.0-rc.2 2020-04-16 20:09:16 +01:00
RiotRobot 033a462015 Prepare changelog for v1.6.0-rc.2 2020-04-16 20:09:15 +01:00
RiotRobot 3fd726af5e v1.6.0-rc.2 2020-04-16 20:06:06 +01:00
RiotRobot 6ca2f4c87d Upgrade matrix-react-sdk to 2.5.0-rc.2 2020-04-16 20:06:01 +01:00
RiotRobot 0c12630b89 Upgrade matrix-js-sdk to 5.3.1-rc.2 2020-04-16 20:04:19 +01:00
Travis Ralston 005269e2ad Make Jitsi download script a JS script 
It's awful but means that we create the directory on all platforms in-process.

Fixes https://github.com/vector-im/riot-web/issues/13215
 2020-04-16 12:37:41 -06:00
Travis Ralston bea0dab623 Update cross-signing feature docs and document fallback procedures 
For https://github.com/matrix-org/matrix-react-sdk/pull/4416
 2020-04-16 11:35:28 -06:00
Jorik Schellekens 4eb5de90a1 Add font scaling labs setting. 2020-04-16 11:23:17 +01:00
RiotRobot d3bc7fb400 v1.6.0-rc.1 2020-04-15 19:27:55 +01:00
RiotRobot 5333c9ec29 Prepare changelog for v1.6.0-rc.1 2020-04-15 19:27:55 +01:00
RiotRobot 09b171c1de v1.6.0-rc.1 2020-04-15 19:24:25 +01:00
RiotRobot 2cd585cd6c Upgrade matrix-react-sdk to 2.5.0-rc.1 2020-04-15 19:24:18 +01:00
RiotRobot 0b32f7c87f Upgrade matrix-js-sdk to 5.3.1-rc.1 2020-04-15 19:22:38 +01:00
RiotRobot 08ef4ff3b1 Merge branch 'release-v1.5.16' into release-v1.6.0 2020-04-15 19:08:28 +01:00
Weblate 93e147f2d2 Merge branch 'origin/develop' into Weblate. 2020-04-15 17:54:07 +00:00
J. Ryan Stinnett b5e8e5cf75
Merge pull request #13179 from vector-im/jryans/enable-cross-signing 
Enable cross-signing / E2EE by default for DM on release
 2020-04-15 18:54:02 +01:00
J. Ryan Stinnett cd19af4003 Enable cross-signing / E2EE by default for DM on release 
Fixes https://github.com/vector-im/riot-web/issues/13178
 2020-04-15 18:36:22 +01:00
Weblate 0f20f1555b Merge branch 'origin/develop' into Weblate. 2020-04-15 15:47:59 +00:00
Travis Ralston 1a4fe2ac3b
Merge pull request #13128 from dannycolin/inotify-watch-limit 
Add instruction to resolve the inotify watch limit issue
 2020-04-15 09:47:54 -06:00