gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,033 Commits 2 Branches 0 Tags 25 MiB
Commit Graph

9033 Commits

Author SHA1 Message Date
Travis Ralston cc8f44ea27
Merge pull request #13374 from vector-im/travis/labs-remove-padlocks 
Remove docs and config for invite only padlocks
 2020-04-24 10:45:06 -06:00
Travis Ralston d43781df49 Remove docs and config for invite only padlocks 
See https://github.com/matrix-org/matrix-react-sdk/pull/4488
 2020-04-24 10:09:17 -06:00
Travis Ralston 17b8dbf99a Remove encrypted message search feature flag 
See https://github.com/matrix-org/matrix-react-sdk/pull/4467
 2020-04-24 10:08:48 -06:00
Travis Ralston 215ad07493 Remove docs and config for invite only padlocks 
See https://github.com/matrix-org/matrix-react-sdk/pull/4487
 2020-04-24 10:03:14 -06:00
Weblate c70cdbc6a9 Merge branch 'origin/develop' into Weblate. 2020-04-23 19:17:05 +00:00
Travis Ralston 5ca474d356
Merge pull request #13351 from vector-im/revert-13199-joriks/font-sclaing-slider 
Revert "Add font scaling labs setting."
 2020-04-23 13:17:00 -06:00
Travis Ralston 2c62d47e6c
Revert "Add font scaling labs setting." 2020-04-23 13:16:49 -06:00
Zoe 3e77418fd7 Turn on source mapping, copy decoder-ring over to bundle 2020-04-23 17:55:21 +01:00
Michael Telatynski 51dc4bbbe4 Move async components to async-components to move them out of the skin bundle 
and s/CompatibilityPage/CompatibilityView/

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 16:45:24 +01:00
Michael Telatynski 08f9018cd4 remove wasmMock.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 16:28:42 +01:00
Michael Telatynski 060b767bc6 fix copypasta 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 16:27:46 +01:00
Michael Telatynski 0d50bd12b8 fix imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 16:06:27 +01:00
Michael Telatynski 15894ed8bd mock out wasm imports in jest 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 16:04:20 +01:00
RiotRobot 58b7bbd3d2 v1.6.0-rc.4 2020-04-23 16:00:41 +01:00
RiotRobot 95bbe84946 Prepare changelog for v1.6.0-rc.4 2020-04-23 16:00:41 +01:00
RiotRobot afb8403dbb v1.6.0-rc.4 2020-04-23 15:58:34 +01:00
RiotRobot e7cb2e4022 Upgrade matrix-react-sdk to 2.5.0-rc.4 2020-04-23 15:58:10 +01:00
RiotRobot 7600571cf5 Upgrade matrix-js-sdk to 5.3.1-rc.4 2020-04-23 15:57:32 +01:00
Michael Telatynski 0032d7b943 fix 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 15:55:13 +01:00
Michael Telatynski dda1f8454a fix supported browser logic 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 15:50:06 +01:00
Michael Telatynski 7e67085503 iterate compatibility page and make styling consistent between firefox and chrome 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 15:38:26 +01:00
Weblate 5fcec629fa Merge branch 'origin/develop' into Weblate. 2020-04-23 14:33:56 +00:00
Tirifto 685ca64691 Translated using Weblate (Esperanto) 
Currently translated at 96.4% (27 of 28 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
 2020-04-23 14:33:56 +00:00
J. Ryan Stinnett fa223b94bc
Merge pull request #13341 from vector-im/jryans/feature-flags-releases 
Expand feature flag docs to cover additional release channels
 2020-04-23 15:33:51 +01:00
J. Ryan Stinnett 527d18ac42 riot-desktop now has a develop branch 2020-04-23 15:20:42 +01:00
Michael Telatynski 30fa3a92f7 Implement new unsupported browser page 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 15:10:40 +01:00
Michael Telatynski b7fa8a1f54 wire up the static fallback error pages 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 13:37:25 +01:00
Weblate 1030c15a61 Merge branch 'origin/develop' into Weblate. 2020-04-23 10:26:25 +00:00
J. Ryan Stinnett 11dc8e3b9f
Merge pull request #13034 from MacLemon/optimize-image-assets 
Optimized image assets by recompressing without affecting quality.
 2020-04-23 11:26:19 +01:00
J. Ryan Stinnett 2774b046b3 Expand feature flag docs to cover additional release channels 
This adds further detail around the various additional release channels we have
for desktop. It also expands on the current state of enabling a feature by
default.
 2020-04-23 11:06:15 +01:00
Weblate 53e7177159 Merge branch 'origin/develop' into Weblate. 2020-04-23 09:30:45 +00:00
Jorik Schellekens 6873b48c42
Merge pull request #13199 from JorikSchellekens/joriks/font-sclaing-slider 
Add font scaling labs setting.
 2020-04-23 10:30:40 +01:00
Weblate a90ed394a0 Merge branch 'origin/develop' into Weblate. 2020-04-23 09:22:19 +00:00
J. Ryan Stinnett 29cc8eb573
Merge pull request #13325 from vector-im/travis/seshat-enable 
Remove encrypted message search feature flag
 2020-04-23 10:22:13 +01:00
Jorik Schellekens 3e21483b82 Try to silence the e2e test 
Merge branch 'develop' of github.com:vector-im/riot-web into joriks/font-sclaing-slider
 2020-04-23 10:19:45 +01:00
Michael Telatynski 30a9094dc7 fix import in tests 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-23 10:19:06 +01:00
Michael Telatynski f0011a0183 Merge branches 'develop' and 't3chguy/app_load4' of github.com:vector-im/riot-web into t3chguy/app_load4 2020-04-23 10:12:06 +01:00
Michael Telatynski 6584ff29af mock out scss imports for jest 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-22 18:58:44 +01:00
Michael Telatynski 918a56d01a don't preload error-view as we expect it to not be shown 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-22 18:49:39 +01:00
Michael Telatynski 5fdf805df2 use scss variables in ErrorView.scss 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-22 18:44:52 +01:00
Michael Telatynski b05e5be2f7 Improve ErrorView to match design 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-22 18:25:49 +01:00
Travis Ralston c23b2415e4 Remove encrypted message search feature flag 
See https://github.com/matrix-org/matrix-react-sdk/pull/4467
 2020-04-22 10:59:47 -06:00
MacLemon 5d39bd69dc Merge branch 'develop' into optimize-image-assets 2020-04-22 18:35:02 +02:00
Nad Chishtie ac78570b58 Add example error pages 2020-04-22 16:07:24 +01:00
Weblate 882e576fdf Merge branch 'origin/develop' into Weblate. 2020-04-22 14:36:22 +00:00
Travis Ralston 6b1965388e
Merge pull request #13312 from vector-im/travis/docs-settings-fix 
Fix `default_federate` settting description
 2020-04-22 08:36:17 -06:00
Weblate e4a964cd0f Merge branch 'origin/develop' into Weblate. 2020-04-22 14:33:56 +00:00
Travis Ralston f8885cb0a6
Merge pull request #13314 from vector-im/travis/jitsi-docs-improvement 
Clarify that the .well-known method for Jitsi isn't available yet
 2020-04-22 08:33:50 -06:00
Michael Telatynski e5a232b0d8 make typescript happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-22 13:41:29 +01:00
Michael Telatynski d486782dd4 convert app.js to app.tsx 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-04-22 13:29:12 +01:00