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

9364 Commits

Author SHA1 Message Date
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 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
J. Ryan Stinnett 847d40f83b Merge branch 'jryans/rename-strings' into 'element' 
Update many brand name strings and URLs

See merge request new-vector/element/element-web/element-web!2
 2020-07-13 20:43:45 +00:00
J. Ryan Stinnett fff29d5663 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 18:48:34 +01:00
J. Ryan Stinnett e3e2bd1e7b Update brand to new name 2020-07-13 18:43:02 +01:00
J. Ryan Stinnett e737fccd5a Move app config files to new name 2020-07-13 18:34:46 +01:00
J. Ryan Stinnett ffab08bd60 Update various brand instances in code 2020-07-13 17:32:17 +01:00
J. Ryan Stinnett 0667ede7b7 Replace more brands in translations 2020-07-13 17:24:53 +01:00
J. Ryan Stinnett 2af008d5f0 Remove VectorCustomServerOptions and strings 2020-07-13 17:18:26 +01:00
J. Ryan Stinnett c8a258b4bb Replace riot.im in translated strings 2020-07-13 17:03:03 +01:00
J. Ryan Stinnett acb22f4fe5 Replace references to riot.im 2020-07-13 17:02:20 +01:00
J. Ryan Stinnett 62d22f50ab Update welcome brand name in translations 2020-07-13 14:49:36 +01:00
J. Ryan Stinnett a0494eeecb Update welcome brand name 2020-07-13 14:24:32 +01:00
J. Ryan Stinnett 73d999cc95 Prune unused translations 2020-07-13 14:22:47 +01:00
J. Ryan Stinnett 5a34425360 Replace brand name in existing translations 2020-07-13 14:21:07 +01:00
J. Ryan Stinnett 5b31589b3a Use brand name from config in all strings 2020-07-13 14:12:44 +01:00
Travis Ralston c94f55ecaf
Merge pull request #14375 from vector-im/travis/room-list/enable 
Update documentation and remove labs flag for new room list
 2020-07-13 06:56:28 -06:00
J. Ryan Stinnett c135c819b7 Merge remote-tracking branch 'origin/develop' into element 2020-07-13 13:37:40 +01:00
J. Ryan Stinnett c5f2965c52
Merge pull request #14434 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2020-07-13 13:35:50 +01:00
David Baker 5c74cbd694 Merge branch 'dbkr/logos' into 'element' 
Change Logos

See merge request new-vector/element/element-web/element-web!1
 2020-07-13 10:44:51 +00:00
David Baker 6bfa9bc1da Actual open graph image 
and not just a green rectangle
 2020-07-13 11:33:18 +01:00
Travis Ralston e6706b0e7b Merge branch 'develop' into travis/room-list/enable 2020-07-10 21:34:42 -06:00
David Baker 55e7aa6a22 Replace Riot logo with element logo 
and hopefully clean up some of dead wood icons while we're at it
 2020-07-10 20:02:11 +01:00
David Baker d0f81b26ad Change logos excluding vector-icons 2020-07-10 19:09:52 +01:00
David Baker b7ed883d96 Start by renaming the dir 2020-07-10 18:35:17 +01:00
Bruno Windels b5d0047f39 Merge branch 'develop' into element 2020-07-09 17:59:47 +02:00