Commit graph

562 commits

Author SHA1 Message Date
Brett Clanton
8bcc43e966 Run imageoptim on all images in assets directory 2017-02-07 19:57:18 -05:00
tungfa
ce60635062 1 Russ News Post (#109)
- embedded video post + image
2017-02-07 16:09:08 +08:00
tungfa
e3c2e5a788 1 Russ News Post (#108)
- embedded video post + image
2017-02-07 15:43:46 +08:00
Chuck Williams
1892029fe3 Merge commit '081263c911'
* commit '081263c911':
  12.1 Instructions News Post
  12.1 News post + image
  Evo Page edits
  team page
2017-02-06 23:39:57 -07:00
tungfa
d9fb0463aa News posts (#107)
* team page

small fixes and replacements

* Evo Page edits

had a pro editor looking at it - fixed things

* 12.1 News post + image

* 12.1 Instructions News Post

post + image
2017-02-07 14:26:47 +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
549591ff2b Merge remote-tracking branch 'dashpay/master' 2017-02-07 13:50:06 +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
tungfa
37e83c4624 Merge remote-tracking branch 'dashpay/master' 2017-02-07 13:45:22 +08:00
tungfa
57b9097eaa Evo Page edits
had a pro editor looking at it - fixed things
2017-02-07 13:44:54 +08:00
Chuck Williams
1c1ad79fe0 adds target="_blank" to Merchants -> "Get Listed" Button 2017-02-06 22:33:57 -07:00
tungfa
09218a1e3b team page
small fixes and replacements
2017-02-07 13:21:30 +08:00
tungfa
98800b0fae Merge remote-tracking branch 'dashpay/master' 2017-02-07 13:15:24 +08:00
Chuck Williams
228aceed59 Merge commit '02be974b19'
* commit '02be974b19':
  4 new News/Blog images
  change image
  team page + active link
  3 News Dev's Addeted
  back to original image
  Fixed old post
  fixed image color
2017-02-06 14:56:06 -07:00
VitaliyTr
f6926b5984 added font in graphic page 2017-02-07 00:23:25 +07:00
tungfa
7da309a2f1 Merge remote-tracking branch 'dashpay/master' 2017-02-06 21:30:44 +08:00
TheLazieR Yip
075518af85 Fix team page
<!-- --> cannot comment liquid code.
2017-02-06 06:50:20 -05:00
moocowmoo
c69c6560ff config - escape naked quotes to fix page render 2017-02-06 11:23:35 +00:00
Andy Freer
93f99e5830 Update: Exodus logo on Wallets page 2017-02-06 03:49:06 +00:00
Andy Freer
efc15278aa Add: Keepass link in Wallets security advisory 2017-02-06 03:33:26 +00:00
Andy Freer
51abe0a3bb Update: Wallets page security advisory 2017-02-06 03:30:43 +00:00
tungfa
02be974b19 Merge remote-tracking branch 'dashpay/master' 2017-02-06 11:05:07 +08:00
Andy Freer
6be8eed26c Update: Blog - link images 2017-02-06 02:48:58 +00:00
Andy Freer
f6c6922338 Update: wallets - Coinomi control type 2017-02-06 02:46:38 +00:00
Andy Freer
6423415db7 Update Evo page: swap consumers and merchant sectons 2017-02-06 02:34:44 +00:00
Andy Freer
daadcd09ea Merge pull request #101 from andyfreer/master
Update WooCommerce and Evo pages
2017-02-06 02:29:37 +00:00
andyfreer
258d852239 Update: WooCommerce page content 2017-02-06 02:28:45 +00:00
andyfreer
aaaf8305a4 Update: Evo page image 2017-02-06 02:28:29 +00:00
tungfa
51b6c928cb Merge remote-tracking branch 'dashpay/master' 2017-02-06 09:50:47 +08:00
Andy Freer
f5aa35d17e Merge pull request #100 from Prtfw/master
PR
2017-02-06 01:47:58 +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
d7573dab95 Rename: dash binary d/l links to dashcore 2017-02-06 01:35:21 +00:00
Andy Freer
9794f0e2f7 Update: Route footer contact link to mailto
..until contact page is wired up
2017-02-06 01:27:12 +00:00
Andy Freer
0be669f99b Update merchants.html
Add woocommerce btn
2017-02-06 01:06:21 +00:00
Andy Freer
c53408e9be Update en.yml
Add woocommerce btn text
2017-02-06 01:05:28 +00:00
Andy Freer
366bba56cf Update _config.yml
Fix API link
2017-02-06 00:46:09 +00:00
Andy Freer
2294e56360 Merge pull request #99 from andyfreer/master
Update: Evolution page
2017-02-06 00:42:10 +00:00
andyfreer
ed2d55c6d9 Update: Evolution page 2017-02-06 00:40:31 +00:00
moocowmoo
a55de9d93b updated wiki href - new page 2017-02-06 00:39:39 +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
tungfa
6a030988a0 Merge remote-tracking branch 'dashpay/master' 2017-02-06 07:25:49 +08:00
Andy Freer
0e5f914530 Merge pull request #98 from andyfreer/master
Update: Wallets page info and modal content
2017-02-05 23:21:27 +00:00
andyfreer
a91446af47 Update: Wallets page info and modal content 2017-02-05 23:17:33 +00:00
Madeleine Shang
5d44f0e35f add success message + effect 2017-02-05 23:17:22 +00:00
Madeleine Shang
15aeb408c6 Merge remote-tracking branch 'upstream/master'
interim merge for commit (hooking up contact form)
2017-02-05 22:46:26 +00:00
Madeleine Shang
67c8d7923e hooking up the contact form, need to fininsh ajax request 2017-02-05 22:46:13 +00:00
tungfa
acf82e9f97 Merge remote-tracking branch 'dashpay/master' 2017-02-06 06:34:06 +08:00