Commit graph

1184 commits

Author SHA1 Message Date
tungfa
e4025170b5 small edit + News Post 2017-03-18 10:34:37 +08:00
mr.V
e2452e1187 small fixes and cleans (#176)
* clean up; get-dash page fixed; changed  on minig page content; added some links and footer and on pages
2017-03-17 11:54:18 -04:00
tungfa
d34daab710 News post + pic 2017-03-17 16:59:18 +08:00
tungfa
6bbb8181ba 2 news posts + pics
local checked = ok
2017-03-17 11:36:56 +08:00
moocowmoo
0922183888 config - encrypted pem with --org flag 2017-03-16 17:19:30 +00:00
tungfa
2c6ca9e87c small edit 2017-03-16 22:01:23 +08:00
tungfa
f956121274 Mining - small edits 2017-03-16 12:04:46 +08:00
tungfa
520b696723 fixed 1 button
too many - good now
2017-03-16 11:45:15 +08:00
Chuck Williams
388a67fdff Revert "Fast forward to @tungfa’s tip: mostly file cleanup"
This reverts commit 3fe332a39f.
2017-03-15 21:14:11 -06:00
VitaliyTr
e0ee8751dc clean up; get-dash page fixed; changed conteain on minig page; added some links and footer and on pages 2017-03-15 20:58:16 -06:00
Chuck Williams
3fe332a39f Fast forward to @tungfa’s tip: mostly file cleanup 2017-03-15 20:56:46 -06:00
tungfa
dd83712bd7 News Posts + 1 edit
al local checked
2017-03-16 10:32:09 +08:00
tungfa
bebf354661 Merge remote-tracking branch 'dashpay/master' 2017-03-16 09:58:19 +08:00
moocowmoo
bbf329da5f config - updating travis-encrypted pem 2017-03-15 06:19:11 +00:00
tungfa
24ede68ba6 Merge remote-tracking branch 'dashpay/master' 2017-03-15 11:26:59 +08:00
tungfa
ae8777613e link fixed 2017-03-15 11:25:24 +08:00
tungfa
de5b0104d4 1 more exchange + pic 2017-03-15 11:25:24 +08:00
tungfa
d067657555 Merge remote-tracking branch 'dashpay/master' 2017-03-15 10:53:08 +08:00
tungfa
afcce081f2 link fixed 2017-03-15 10:53:05 +08:00
tungfa
a8eb4b62ea Added Exchange = Logo 2017-03-15 10:01:38 +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
b45cfe9917 Merge remote-tracking branch 'dashpay/master' 2017-03-15 08:49:17 +08:00
moocowmoo
c06fe88812 config - updating travis-encrypted pem 2017-03-14 13:10:20 +00:00
tungfa
9be7918df1 Merge remote-tracking branch 'dashpay/master' 2017-03-14 16:16:46 +08:00
Chuck Williams
dd8faf10a7 Merge commit '07cd336101' into chuckwilliams37/master
* commit '07cd336101':
  2 more News Posts
  New Merchants
  Fix
  News posts
  not my file tbh (i think this comes from andy's side)
  News Bloomberg
  edit
2017-03-14 01:41:48 -06:00
Chuck Williams
c499a31142 Merge branch 'MrV/master' into chuckwilliams37/master
* MrV/master:
  fixed exchanges
  fixed get-dash page
  re-worked get-dash page
  fixed mining page
  merged
2017-03-14 01:41:23 -06:00
tungfa
5c59e847bd Merge remote-tracking branch 'dashpay/master' 2017-03-14 11:14:03 +08:00
tungfa
26a1fed79d New Merchants
couple of new merchants + Pics

local tested all good - go live
2017-03-14 11:12:17 +08:00
tungfa
07cd336101 2 more News Posts
+ pics - tested
2017-03-14 11:11:36 +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
tungfa
139e19484d Merge remote-tracking branch 'dashpay/master' 2017-03-14 09:44:04 +08:00
VitaliyTr
a6fce3e269 fixed exchanges 2017-03-14 00:06:52 +07:00
VitaliyTr
09e38e71d9 fixed get-dash page 2017-03-13 23:35:49 +07:00
VitaliyTr
7d0078a11d Merge branch 'master' of https://github.com/dashpay/dash-website 2017-03-13 21:42:26 +07:00
tungfa
f28a9496ae Fix 2017-03-13 09:56:27 +08:00
tungfa
f2799c1072 News posts
All News - local checked
+ 1 old fix
2017-03-13 09:56:27 +08:00
tungfa
96776333aa not my file tbh (i think this comes from andy's side) 2017-03-13 09:56:27 +08:00
tungfa
71eb6a8937 News Bloomberg
2 pic
2017-03-13 09:56:27 +08:00
tungfa
3f505d756a Fix 2017-03-13 09:54:18 +08:00
tungfa
99a983da22 News posts
All News - local checked
+ 1 old fix
2017-03-13 09:51:36 +08:00
tungfa
b9a0a3e660 not my file tbh (i think this comes from andy's side) 2017-03-13 09:09:48 +08:00
tungfa
f8174c44cf Merge remote-tracking branch 'dashpay/master' 2017-03-13 09:05:21 +08:00
VitaliyTr
a2e7c279af re-worked get-dash page 2017-03-13 00:08:27 +07:00
VitaliyTr
117f942e22 fixed mining page 2017-03-11 22:25:52 +07:00
VitaliyTr
c4c145eab8 Merge branch 'master' of https://github.com/dashpay/dash-website 2017-03-10 11:58:35 +07:00
VitaliyTr
5bf007538d merged 2017-03-10 10:58:26 +07:00
Andy Freer
c8412c4058 Merge pull request #159 from andyfreer/master
Add: DDoS Blog Report
2017-03-09 01:43:54 +00:00
andyfreer
733cd0fa7e Add: DDoS Blog Report 2017-03-09 01:02:27 +00:00
tungfa
fefd119cc0 News Bloomberg
2 pic
2017-03-08 21:26:22 +08:00