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

9538 Commits

Author SHA1 Message Date
RiotRobot 1262a1ef08 Upgrade matrix-js-sdk to 7.1.0 2020-07-16 16:12:35 +01:00
Travis Ralston 8e67450477
Merge pull request #14544 from vector-im/travis/fix-sso2 
Fix SSO session ID paramater
 2020-07-16 08:13:58 -06:00
Travis Ralston b2d4432ba9 Fix SSO session ID paramater 2020-07-16 08:11:04 -06:00
J. Ryan Stinnett 503ea3d973 Update all mobile links to match marketing site 2020-07-16 14:42:20 +01:00
J. Ryan Stinnett efa603939b
Merge pull request #14488 from jaller94/j94/pngcrush 
Run pngcrush on vector-icons
 2020-07-16 14:06:25 +01:00
David Baker a1c06c5a0e
Merge pull request #14502 from vector-im/dbkr/hostinglink 
Fix hosting signup link
 2020-07-16 09:30:19 +01:00
Matt Cengia fb79373a6d Bump node build version 
When trying to build the Docker image, I kept receiving an out-of-memory
error from Webpack. This issue is apparently explained at
https://github.com/webpack/webpack/issues/1914.
Several comments in the issue suggested using Node 12 or above. Doing so
resolved this issue for me.

Signed-off-by: Matt Cengia <mattcen@mattcen.com>
 2020-07-16 16:21:00 +10:00
Matt Cengia 846cebe9ff Add build dependencies for 'canvas' to Dockerfile 
When building the Docker image on amd64, canvas can be installed
from a pre-built binary. When building on an another architecture,
however, such as arm (e.g. on a Raspberry Pi), these binaries need to be
built locally, as per https://www.npmjs.com/package/canvas#compiling.
These added dependencies facilitate this. See also, issue #14400.

Signed-off-by: Matt Cengia <mattcen@mattcen.com>
 2020-07-16 16:21:00 +10:00
Travis Ralston 8eac445ddc
Merge pull request #14513 from vector-im/travis/fix-sso 
Use the right protocol for SSO URLs
 2020-07-15 19:48:17 -06:00
Travis Ralston 1b60743910 Use the right protocol for SSO URLs 2020-07-15 17:05:17 -06:00
David Baker 1a49459b81 Apparently we have changed this 2020-07-15 20:04:17 +01:00
David Baker 62d1e4937c Fix hosting signup link 
Fixes https://github.com/vector-im/riot-web/issues/14500
 2020-07-15 19:58:34 +01:00
J. Ryan Stinnett 636529bb36
Merge pull request #14485 from jaller94/j94/fix-mstile-310-150 
Fix mstile-310x150 by renaming it
 2020-07-15 16:54:32 +01:00
Christian Paul 37126b3f76 Run pngcrush on vector-icons 2020-07-15 16:58:17 +02:00
Christian Paul 16726c7e16 Add pixels left and right for mstile-310x150.png to be 310x150 2020-07-15 16:54:01 +02:00
David Baker bfc62e04f0
Merge pull request #14478 from vector-im/hs/blog-and-twitter-links 
Update blog and twitter links to point to Element
 2020-07-15 15:01:53 +01:00
Christian Paul 2bcadfab83 Fix mstile-310x150 by renaming it 2020-07-15 15:52:29 +02:00
Will Hunt d04e0f441d
Update blog and twitter links 2020-07-15 13:23:51 +01:00
RiotRobot 7c17272c83 Reset matrix-react-sdk back to develop branch 2020-07-15 12:14:38 +01:00
RiotRobot 6886dbcbd4 Reset matrix-js-sdk back to develop branch 2020-07-15 12:14:27 +01:00
RiotRobot 15203bb32b v1.7.0 2020-07-15 12:10:02 +01:00
RiotRobot c8b8efd47a Prepare changelog for v1.7.0 2020-07-15 12:10:02 +01:00
RiotRobot e5398f4345 Upgrade matrix-react-sdk to 2.10.0 2020-07-15 12:05:47 +01:00
RiotRobot e077bea046 Upgrade matrix-js-sdk to 7.1.0 2020-07-15 12:05:31 +01:00
Travis Ralston cd18764287 Fix sample config brand 2020-07-15 04:26:26 -06:00
J. Ryan Stinnett b720c8a138 Merge remote-tracking branch 'origin/develop' into element 2020-07-15 10:35:45 +01:00
Michael Telatynski 989c4a3acc
Merge pull request #14472 from vector-im/t3chguy/clean-up 
Remove redundant enum
 2020-07-15 09:58:12 +01:00
Michael Telatynski 18aab5f655 Remove redundant enum 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-07-15 09:46:39 +01:00
J. Ryan Stinnett 4ec679aaed Merge branch 'jryans/restore-device-name' into 'element' 
Restore device name

See merge request new-vector/element/element-web/element-web!11
 2020-07-15 08:41:47 +00:00
J. Ryan Stinnett 715a4f8dac Restore device name 2020-07-15 09:38:55 +01:00
Travis Ralston 970859629b Merge branch 'develop' into element 2020-07-14 15:04:48 -06:00
Jorik Schellekens 219a190e96
Merge pull request #14355 from vector-im/joriks/delabs-font-scaling 
Remove font scaling from labs
 2020-07-14 22:01:22 +01:00
J. Ryan Stinnett 1d90820b10 Merge branch 'jryans/device-name' into 'element' 
Use a safe but sane device name

See merge request new-vector/element/element-web/element-web!10
 2020-07-14 20:56:11 +00:00
J. Ryan Stinnett 0fa2941188 Use a safe but sane device name 2020-07-14 21:54:44 +01:00
Jorik Schellekens f5209c0d7e Merge branch 'develop' of github.com:vector-im/riot-web into joriks/delabs-font-scaling 2020-07-14 21:51:41 +01:00
Matthew Hodgson 225d2ad931 new wallpaper 2020-07-14 21:44:26 +01:00
J. Ryan Stinnett f70f3c7796 Merge branch 'bwindels/polish' into 'element' 
update accent color

See merge request new-vector/element/element-web/element-web!9
 2020-07-14 19:35:46 +00:00
J. Ryan Stinnett f23e017463 Merge branch 'nadonomy/reskin-static' into 'element' 
Reskin static pages to look less riotous

See merge request new-vector/element/element-web/element-web!8
 2020-07-14 18:54:33 +00:00
Nad Chishtie 80d389dfb4 Reskin static pages to look less riotous 2020-07-14 19:52:39 +01:00
Bruno Windels f1d144a159 update accent color 2020-07-14 20:37:05 +02:00
Bruno Windels 00273d01b1 Merge branch 'bwindels/restyle-blurry-login-box' into 'element' 
style blurry login box

See merge request new-vector/element/element-web/element-web!7
 2020-07-14 18:22:41 +00:00
Bruno Windels cb0184398a style blurry login box 2020-07-14 20:18:23 +02:00
J. Ryan Stinnett 74e15ab892 Merge branch 'nadonomy/favicon' into 'element' 
Update favicon to have rounded corners, better spacing

See merge request new-vector/element/element-web/element-web!6
 2020-07-14 18:10:10 +00:00
Nad Chishtie 2e4e8f4d1c Update favicon to have rounded corners, better spacing 2020-07-14 19:07:40 +01:00
Bruno Windels a1f9f6c77a Merge branch 'element-update-icons' into 'element' 
update welcome icons

See merge request new-vector/element/element-web/element-web!5
 2020-07-14 17:54:13 +00:00
Bruno Windels a3998eb804 update welcome icons 2020-07-14 19:47:58 +02:00
J. Ryan Stinnett 0f5621b010 Update manifest names 2020-07-14 17:58:33 +01:00
Bruno Windels 5bce586b04 Merge branch 'element-rename-theme' into 'element' 
Rename element theme

See merge request new-vector/element/element-web/element-web!4
 2020-07-14 16:46:49 +00:00
Bruno Windels 29a1862912 rename element theme to light/dark to apply old prefs 2020-07-14 18:40:57 +02:00
J. Ryan Stinnett 8d0f57d62d Merge branch 'jryans/remove-brand' into 'element' 
Move config files, update brand

See merge request new-vector/element/element-web/element-web!3
 2020-07-13 20:44:18 +00:00