Commit graph

207 commits

Author SHA1 Message Date
moocowmoo
1767a2ccf0 bugfix - ampersand entities 2017-03-19 05:04:26 +00:00
tungfa
525daf7f29 New merchant listing
+ pic - checked
2017-03-19 10:05:16 +08:00
tungfa
6bcf2ff120 Merchants New+ edited
local checked + pics
2017-03-18 10:34:37 +08:00
tungfa
bba4004bc8 1 more exchange + pic 2017-03-15 10:00:19 +08:00
tungfa
39fa101392 Added Exchange = Logo 2017-03-15 09:10:55 +08:00
tungfa
77d461d7c8 New Merchants
couple of new merchants + Pics

local tested all good - go live
2017-03-14 10:44:08 +08:00
UdjinM6
e07596b727 bump Dash Core wallets to 0.12.1.3 2017-03-02 20:26:03 -05:00
Andy Freer
67beff2850 Fix: wallet security types 2017-03-02 00:55:07 +00:00
VitaliyTr
927b606290 Merge branch 'master' of https://github.com/dashpay/dash-website 2017-03-02 05:01:26 +07:00
VitaliyTr
1ec6fc8111 fixed images 2017-03-02 04:54:50 +07:00
Andy Freer
7a75ee7b7d Fix: Wallets - Exodus access type 2017-03-01 21:53:27 +00:00
VitaliyTr
ede673cd38 added dummy images 2017-03-02 04:37:31 +07:00
VitaliyTr
9038a031e4 added dummy data 2017-03-02 04:17:33 +07:00
VitaliyTr
794aaeb514 added exchanges page 2017-03-02 01:13:46 +07:00
VitaliyTr
545de641fe merged 2017-02-28 20:27:52 +07:00
moocowmoo
6dca8fb964 config - 12.1.2 binary hrefs 2017-02-24 14:52:34 +00:00
Madeleine Shang
69b521cf20 init commit for payments page 2017-02-21 19:08:07 +00:00
moocowmoo
e7d3047bbb config - 12.1.1 binary hrefs 2017-02-20 10:18:33 +00:00
tungfa
eb49d7f53a some corrections (#125)
Team page
- vitalik and matt more details + pics
Evolution section - fixed a mistake
News Post + pic

all local tested
2017-02-18 10:40:38 +08:00
tungfa
de9b0e9226 Removed Protonmail
Proton is NOT integrated yet
- i removed them from merchants section
- frontage - merchants block

tested local and OK
2017-02-15 14:19:58 +08:00
tungfa
da2df22f6f fixes
erased dead community
- what is dash
- dashndrink

New Merchant = Pic

locally all checked
2017-02-13 15:52:20 +08:00
Andy Freer
a19a908b34 Update: Hash Engineering access / validation types on Wallets 2017-02-11 20:21:28 +00:00
Madeleine Shang
bd00ea0383 Merge remote-tracking branch 'upstream/master'
merge after build
2017-02-11 05:35:26 +00:00
Madeleine Shang
c8cd222299 fix minor typo 2017-02-11 05:35:16 +00:00
Chuck Williams
0b956bbe43 -- wallets/index.html: Pulls all electrum wallets
-- fixes padding for EXODUS logo
-- fixes extra curly brace on homepage
2017-02-10 21:42:56 -07:00
Chuck Williams
028256a72f Dash.org last fixes #19: changes "control of funds" message for android wallet. 2017-02-09 00:17:29 -07:00
Chuck Williams
e8a1cc9b72 Merge commit 'f2d1d249df'
* commit 'f2d1d249df':
  remove in-active merchants
2017-02-07 21:44:51 -07:00
Chuck Williams
7577bbd8e1 Merge commit '8fb5164d16'
* commit '8fb5164d16':
  fixed email
  1 Russ News Post (#109)
  News Post Cryptocoinnews
  1 Russ News Post
2017-02-07 21:44:29 -07:00
Chuck Williams
5a42bd67cd /wallets/index.html: Fixes missing Jaxx Logo 2017-02-07 21:41:54 -07:00
tungfa
8fb5164d16 fixed email 2017-02-08 08:14:56 +08:00
Madeleine Shang
f2d1d249df remove in-active merchants 2017-02-07 23:54:17 +00: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
tungfa
09218a1e3b team page
small fixes and replacements
2017-02-07 13:21:30 +08: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
f6c6922338 Update: wallets - Coinomi control type 2017-02-06 02:46:38 +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
Madeleine Shang
c014270d0d Merge remote-tracking branch 'upstream/master'
merge for contact us link
2017-02-05 23:48:57 +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
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
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
04eea95433 Update: default to 64bit wallet download (#91) 2017-02-05 23:20:39 +08:00
Andy Freer
afa23c8931 Update team.yml
Add keybase
2017-02-05 12:59:14 +00:00
moocowmoo
d5420bd276 enh - relative 12.1 download hrefs + CI bugfix 2017-02-05 08:51:14 +00:00
Chuck Williams
c037fa4e9c Revert "applies @moocowmoo's patch for wallet binaries path updates."
This reverts commit 47f2e3d6be.
2017-02-05 00:20:21 -07:00
Chuck Williams
47f2e3d6be applies @moocowmoo's patch for wallet binaries path updates. 2017-02-04 22:48:54 -07:00
tungfa
be6bf6255c another fix 2017-02-04 15:01:03 +08:00