Commit graph

147 commits

Author SHA1 Message Date
Chuck Williams
b88da87ca7 Implements Contact Email Form with merge from master
Merge branch 'master' into feature/send-contact-email

* master:
  cleanup on news posts to invoke and include in build
  fix minor typo
  updated ruby version
  Adds address to contact page.
  -- wallets/index.html: Pulls all electrum wallets -- fixes padding for EXODUS logo -- fixes extra curly brace on homepage
  News post +video (#116)
  News post +video

Conflicts:
	_includes/hero/contact.html
2017-02-11 01:30:19 -07:00
Chuck Williams
f93f21e491 cleanup on news posts to invoke and include in build 2017-02-10 23:04:41 -07:00
tungfa
6c2da0d24c News post +video
ICE Kot
2017-02-11 10:20:59 +08:00
tungfa
1b5896865a News Post 100 Hrs
+ image
2017-02-10 20:09:33 +08:00
tungfa
bec0ab5abb Merge remote-tracking branch 'dashpay/master' 2017-02-10 17:47:30 +08:00
tungfa
dc4e4ac5fa Video News Post 2017-02-10 17:40:37 +08:00
Chuck Williams
1e2b15a23e Fixes Dash.org last fixes #68: /wallets/index.html typos & grammar 2017-02-09 01:19:09 -07:00
tungfa
11dba58993 News Post Cryptocoinnews
News post + image
full text
2017-02-07 16:08:39 +08:00
tungfa
609f3526fa 1 Russ News Post
- embedded video post + image
2017-02-07 15:41:46 +08:00
tungfa
081263c911 12.1 Instructions News Post
post + image
2017-02-07 14:25:48 +08:00
tungfa
358de4661c 12.1 News post + image 2017-02-07 14:23:01 +08:00
tungfa
ab93dd7ebf team page fixes - evo page fixes (#106)
* team page

small fixes and replacements

* Evo Page edits

had a pro editor looking at it - fixed things
2017-02-07 13:46:51 +08:00
Chuck Williams
1e19c76404 Cleanup bad url and javascript to pass build. 2017-02-06 22:46:29 -07:00
Andy Freer
51abe0a3bb Update: Wallets page security advisory 2017-02-06 03:30:43 +00:00
andyfreer
258d852239 Update: WooCommerce page content 2017-02-06 02:28:45 +00:00
Madeleine Shang
ace9a7702d Merge remote-tracking branch 'upstream/master'
final merge before PR
2017-02-06 01:42:30 +00:00
Andy Freer
c53408e9be Update en.yml
Add woocommerce btn text
2017-02-06 01:05:28 +00:00
andyfreer
ed2d55c6d9 Update: Evolution page 2017-02-06 00:40:31 +00:00
Madeleine Shang
c014270d0d Merge remote-tracking branch 'upstream/master'
merge for contact us link
2017-02-05 23:48:57 +00:00
Madeleine Shang
9365bdaf70 temp hide contact form and replace with contact us link 2017-02-05 23:48:43 +00:00
andyfreer
a91446af47 Update: Wallets page info and modal content 2017-02-05 23:17:33 +00:00
Madeleine Shang
9df146815b Merge remote-tracking branch 'upstream/master'
merge with remove other lang from mobile and desktop nav bar for now
2017-02-05 20:55:38 +00:00
Madeleine Shang
225d114af9 remove other language options from mobile and desktop nav -for now 2017-02-05 20:55:24 +00:00
tungfa
8c2f8ae260 couple of things (#95)
* fixed image color

fixed image color

* Fixed old post

needed an image

* back to original image

* 3 News Dev's Addeted

- fixed emails
- added 3 more dev

* team page + active link

- added details for the 3 newcomers
+ 1 pic
- download page / tried to make active link http://keepass.info
2017-02-06 04:54:12 +08:00
Madeleine Shang
af37699b4c 2nd 1/2 of broken link 2017-02-05 19:59:47 +00:00
Madeleine Shang
7d3b828311 interim commit for link fix 2017-02-05 18:51:39 +00:00
Madeleine Shang
fae6e4de13 half done fixing broken links 2017-02-05 18:40:20 +00:00
Andy Freer
2c9857f5b6 Update en.yml
Apply suggestion from Issue #47
2017-02-05 17:38:52 +00:00
VitaliyTr
5a164bb629 fixed links and styles on wallets 2017-02-05 23:10:55 +07:00
VitaliyTr
712b81fa31 added woocomerce 2017-02-05 21:16:04 +07:00
Chuck Williams
443e06f609 Adds "Evolution" link to top nav (mobile|desktop) 2017-02-05 01:10:16 -07:00
Chuck Williams
1378ba5dc0 Merge commit 'dd9694af57'
* commit 'dd9694af57':
  fixed update page
2017-02-05 00:18:26 -07:00
VitaliyTr
dd9694af57 fixed update page 2017-02-05 14:15:38 +07:00
tungfa
8d25235e7a same last 2 news posts -fixed some problems (active links and such) (#86)
* post fix

fixed some empty byline

* Fixed dead links (hopefully)
2017-02-05 15:08:05 +08:00
tungfa
c585c9e525 News Post
News Post 12.1 related
2017-02-05 13:00:17 +08:00
tungfa
be91cb1a5a News Post ATM
New news Post ATM - incl Pic
2017-02-05 12:53:41 +08:00
Chuck Williams
0f2ce74277 Merge branch 'master' of https://github.com/tungfa/dash-website
# By tungfa
# Via tungfa
* 'master' of https://github.com/tungfa/dash-website:
  updated image
  Team Page fixes
  some edits
  new Sentinel image
  what is evo image
2017-02-03 22:32:28 -07:00
Chuck Williams
9c976b9928 Updates Evolution "Learn More" Link url 2017-02-03 22:32:18 -07:00
tungfa
3a694b48a4 some edits
small edits of text (better now)
2017-02-04 11:22:15 +08:00
VitaliyTr
dfbeb339fc hard reset; deleted modification then added back 2017-02-04 02:38:26 +07:00
Chuck Williams
2252470ba9 Lots of cleanup:
-- resolves image paths for blog posts - all language specific posts will use common /assets/img/blog path. language specific images can be specified in the front-matter if necessary.
-- adds language for "platform not detected" message
-- removes redundant "What is Dash" from header navigation
2017-02-02 22:49:14 -07:00
tungfa
3f48e02240 small changes 12.1 box
changes image color
test color
spelling mistake
2017-02-02 19:01:18 +08:00
Chuck Williams
ead15adb8a Documents existing image path functionality for blog posts.
-- updates wallet hero links
2017-02-02 02:01:35 -07:00
tungfa
2135e564b1 Updated 12.1 page
- changed  sections
“Woocommerce”
to
“12.1 Update”
(3 links to buttons will be done by vitalik)
and
“Strategic…” to “What is Evo”
2017-02-02 15:56:37 +08:00
VitaliyTr
c7c08cb41e fixed some tasks from google sheets 2017-02-02 03:57:58 +07:00
Chuck Williams
34737b992f removes image from localized blog post so that build will pass.
-- also javascript cleanup in platform detection and down button init.
2017-02-01 01:42:33 -07:00
Chuck Williams
9bb2ff7536 cleanup for build. Issues remain with internal image /pt/assets/img/blog/CoPayWalletcopy.jpg 2017-02-01 00:56:01 -07:00
tungfa
6c5aa0bfdf CoPay Pt New Post 2017-02-01 10:08:07 +08:00
tungfa
eec223f513 CoPay News Posting 2017-02-01 07:57:07 +08:00
tungfa
9615315bc4 link fixed 2017-01-31 21:54:22 +08:00