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

6843 Commits

Author SHA1 Message Date
J. Ryan Stinnett 31260be907
Merge pull request #8365 from jryans/home-target 
Fix home page link target
 2019-02-01 14:58:19 -06:00
J. Ryan Stinnett 4a0dc06038 Fix home page link target 
Fixes https://github.com/vector-im/riot-web/issues/8331.
 2019-02-01 14:49:35 -06:00
J. Ryan Stinnett 10f178e429 Fix background URL 2019-02-01 14:25:18 -06:00
J. Ryan Stinnett 6b359df6c6
Merge pull request #8364 from jryans/auth-bg 
Add auth background image and update Riot logo
 2019-02-01 14:13:36 -06:00
Bruno Windels d532fe3482
Merge pull request #8363 from vector-im/nadonomy/home 
New homepage
 2019-02-01 19:21:36 +00:00
Bruno Windels 87c193df1a remove commented out code and close root element 2019-02-01 20:11:33 +01:00
Bruno Windels acfe095710 center vertically 2019-02-01 20:08:18 +01:00
J. Ryan Stinnett 8bac9efd4c Update Riot logo 2019-02-01 13:04:48 -06:00
Bruno Windels f22c02ecc6 update i18n 2019-02-01 20:00:13 +01:00
Bruno Windels 2411d5286b finish layout and add links to buttons 2019-02-01 19:58:30 +01:00
J. Ryan Stinnett bf0b2ea101 Add glass effect 2019-02-01 12:10:55 -06:00
Nad Chishtie e1e364f7c7 WIP home updates 2019-02-01 18:07:51 +00:00
J. Ryan Stinnett 42a3668efa Add background image to auth pages 2019-02-01 10:31:40 -06:00
J. Ryan Stinnett c899469168
Merge pull request #8358 from jryans/spell-homeserver 
Spell homeserver correctly
 2019-02-01 08:26:35 -06:00
J. Ryan Stinnett 3eb550a15c Spell homeserver correctly 2019-01-31 18:52:49 -06:00
J. Ryan Stinnett 3fad360f5f Revert "empirically if we want sourcemaps which work for dev we need eval-source-map" 
This change causes Node to crash during builds in some configurations.  It also
grows the production bundle size to ~4x what it was before.

This reverts commit 9f4ce2dcf2.
 2019-01-31 17:03:16 -06:00
Matthew Hodgson 9f4ce2dcf2 empirically if we want sourcemaps which work for dev we need eval-source-map 2019-01-31 23:30:22 +01:00
Bruno Windels 90140f6361
Merge pull request #8321 from vector-im/experimental 
Merge redesign into develop
 2019-01-30 12:49:37 +00:00
David Baker 1391706573
Merge pull request #8318 from vector-im/travis/fix-build 
Disable room directory test because it doesn't work
 2019-01-30 08:18:44 +00:00
Travis Ralston cec8a77d52 Disable room directory test because it doesn't work 
See enclosed comments.
 2019-01-30 00:11:01 -07:00
J. Ryan Stinnett 0fa6aab5f5
Merge pull request #8307 from jryans/auth-overflow 
Tweak auth overflow on Windows and Linux
 2019-01-29 10:40:42 -06:00
J. Ryan Stinnett b96fa43376 Tweak auth overflow on Windows and Linux 2019-01-29 10:20:11 -06:00
J. Ryan Stinnett 9da9310f4b
Merge pull request #8296 from jryans/auth-server-type-selector 
Clean up Custom Server Help dialog
 2019-01-28 21:51:25 -06:00
J. Ryan Stinnett b0e4a9b08b Clean up Custom Server Help dialog 2019-01-28 21:04:38 -06:00
David Baker 99150b9b49
Merge pull request #8283 from vector-im/dbkr/bustin_makes_me_feel_good 
Cache-bust olm.wasm
 2019-01-28 14:32:19 +00:00
David Baker 03de7f9901 Cache-bust olm.wasm 
In the same way as we now do images/fonts
 2019-01-28 14:09:28 +00:00
David Baker 68fd1f0fad Update to prerelease olm for key verification 2019-01-28 10:21:55 +00:00
Travis Ralston 1460bfd1fc
Merge pull request #8280 from aaronraimist/disable-other-themes 
Completely disable other themes for now (#8277)
 2019-01-27 21:01:41 -07:00
Aaron Raimist d0c503d6c8
Completely disable other themes for now (#8277) 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-01-27 21:28:30 -06:00
J. Ryan Stinnett 8ab82b7ed7
Merge pull request #8271 from vector-im/jryans/rm-team-server 
Remove support for team servers
 2019-01-25 16:48:32 -06:00
J. Ryan Stinnett 2d360eab74 Remove support for team servers 2019-01-25 16:14:04 -06:00
David Baker 3c0e8757c9
Merge pull request #8248 from vector-im/dbkr/target_blank 
Add target="_blank" to footer links
 2019-01-24 17:20:53 +00:00
David Baker c773fcb946 Add target="_blank" to footer links 
See https://github.com/matrix-org/matrix-react-sdk/pull/2496
 2019-01-24 17:14:42 +00:00
David Baker 2aaed5d4c3 Doc broken will-navigate listener 2019-01-24 11:36:36 +00:00
David Baker 0022834af4
Merge pull request #8241 from vector-im/dbkr/fix_platform_name 
Fix device names on desktop
 2019-01-23 17:15:56 +00:00
David Baker 9aad7042a2 Fix device names on desktop 
Apparently I really had a bad day with includes / indexOf
 2019-01-23 16:53:50 +00:00
David Baker 9aa8b32df8
Merge pull request #8238 from vector-im/dbkr/lt_gt_desktop_notifs 
Fix literal &lt/&gt in notifications
 2019-01-23 16:14:39 +00:00
David Baker 4f32be9766
Merge pull request #8239 from vector-im/dbkr/desktop_app_email_link 
Fix registration nextLink on desktop
 2019-01-23 16:14:20 +00:00
David Baker 25ef0913bb Fix registration nextLink on desktop 
Another instance of detecting the file: protocol

Fixes https://github.com/vector-im/riot-web/issues/8235
 2019-01-23 15:25:04 +00:00
David Baker a5ed5be3cf Fix literal &lt/&gt in notifications 
Apparently I couldn't decide whether I was writing indexOf(...) > -1
or .includes()

Fixes https://github.com/vector-im/riot-web/issues/8230
 2019-01-23 14:47:31 +00:00
David Baker 697c7f9fe9
Merge pull request #8233 from vector-im/dbkr/fetch_develop_deps_return 
Add returns to fetch-develop-deps
 2019-01-23 14:29:53 +00:00
David Baker f7c2603d7c
Merge pull request #8231 from vector-im/dbkr/electron_builder_20_38_5 
Update electron builder
 2019-01-23 11:41:21 +00:00
David Baker a28691f14d Add returns to fetch-develop-deps 
These look necessary for https://github.com/vector-im/riot-web/pull/8225
to work - the build is failing on jenkins
 2019-01-23 11:40:21 +00:00
David Baker ca9823b35e Merge remote-tracking branch 'origin/experimental' into dbkr/electron_builder_20_38_5 2019-01-23 11:12:25 +00:00
David Baker 91c037e578
Merge pull request #8225 from jryans/fetch-more-branches 
Try fetching more branches for PRs
 2019-01-23 11:12:01 +00:00
David Baker 5fe0af2500 Update electron builder 
This resolves an issue where the auto-updater on Mac with a standard
(ie. non-admin) user account would leave the app in a broken,
unlaunchable state (although it's not obvious what change in
electron-builder fixes this).

Fixes https://github.com/vector-im/riot-web/issues/8215
 2019-01-23 10:53:32 +00:00
J. Ryan Stinnett 6d7492d92a Add Riot logo via more targeted replacement 2019-01-22 22:41:16 -06:00
J. Ryan Stinnett cf150fc575 Try fetching more branches for PRs 
Attempt both the PR author's branch and the PR's target branch. This resolves
issues on experimental where we need matrix-react-sdk to also be experimental.
 2019-01-22 21:28:09 -06:00
J. Ryan Stinnett a2c84e7702 Remove dots between footer links 2019-01-22 19:51:24 -06:00
David Baker f01f56626a Merge branch 'master' into develop 2019-01-22 11:51:13 +00:00