Commit graph

134 commits

Author SHA1 Message Date
mr.wong
bcadc4a945 Revert "more fixes and edits" 2017-04-09 12:12:43 +07:00
tungfa
77c2eac359 Fixed Merchants _ email team
- erased dead merchant
- added new merchant
- fixed team email address
2017-04-09 10:18:48 +08:00
Chuck Williams
3a9a65fb53 Merge cleanup 2017-04-05 23:05:50 -06:00
Chuck Williams
734ca4b059 new merchant 2017-04-05 23:04:23 -06:00
tungfa
9851887110 2 new merchants 2017-04-05 23:00:37 -06:00
tungfa
5d2578daa1 new merchant 2017-04-05 22:59:51 -06:00
tungfa
f8670191db edit fixed 2017-04-05 22:59:51 -06:00
tungfa
c16ff1b148 2 new merchants 2017-04-05 22:59:51 -06:00
tungfa
c7a4c73ecc Team edit 2017-04-05 22:59:51 -06:00
Alex Werner
42da7b5691 Updated Team - Changed to official dash email
Have received my dash email address, this modification address this change.
2017-04-05 22:59:51 -06:00
tungfa
7594998aa9 another team edit 2017-04-03 14:00:36 +08:00
tungfa
81d7e24d36 fixed team order 2017-04-03 13:41:36 +08:00
tungfa
ea128f6d40 2 new merchants 2017-04-03 08:59:49 +08:00
tungfa
755aa0e335 edit spelling 2017-03-27 18:27:30 +08:00
tungfa
bab27025e3 fixed error exchanges page 2017-03-27 18:27:30 +08:00
tungfa
545c507e8e Updated Exchange list
added any coin with image
2017-03-27 16:12:26 +08:00
tungfa
36201af103 New Merchant
new merchant listing + logo pic
2017-03-26 11:37:13 +08:00
tungfa
dbd49c1a4e removed as bust 2017-03-26 11:17:29 +08:00
tungfa
bf1f54f1fa new Exchange / Broker
added bitpanda on 2 pages
2017-03-26 11:11:41 +08:00
Chuck Williams
e42606e133 fix for build break on 214527882 2017-03-23 23:26:50 -06:00
tungfa
4ca9a382f5 edit (different section) 2017-03-24 10:38:45 +08:00
tungfa
3eedf6ea7d new merchant
under hosting
2017-03-24 08:28:02 +08:00
moocowmoo
e2e09a409f config - 12.1.4 hrefs 2017-03-23 00:37:22 -06:00
tungfa
f19543360f email addette 2017-03-22 21:56:33 +08:00
tungfa
5ac88ac777 renaming team member
+ updating pic
2017-03-22 21:56:33 +08:00
tungfa
701172bb20 New Merchant
Precious Metal
2017-03-22 11:38:57 +08:00
Andy Freer
219e466ef3 Update team.yml 2017-03-19 18:09:47 +00:00
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