Commit graph

914 commits

Author SHA1 Message Date
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
tungfa
c60bb9a43a Merge remote-tracking branch 'dashpay/master' 2017-03-08 20:52:54 +08:00
tungfa
dbcac6e3cb edit
Graphics - cleaned up
2017-03-08 15:51:53 +08:00
tungfa
106d475141 edit
Graphics - cleaned up
2017-03-08 15:48:48 +08:00
tungfa
b5958bd2ad Merge remote-tracking branch 'dashpay/master' 2017-03-08 15:32:23 +08:00
Chuck Williams
2622b4c15b Merge commit '3195f3c3b8' into chuckFork/master
* commit '3195f3c3b8':
  fixed test exchanges
  fixed mining page; fixed exchange listening
  fixed get-dash page
  fixed wallet page
  added latest version for desktop
2017-03-07 22:28:46 -07:00
tungfa
17e908a6a4 MN edits
edits
2017-03-08 12:31:04 +08:00
tungfa
9e537c0406 Exchanges Added 2 2017-03-08 11:48:28 +08:00
tungfa
8fa85f7197 2 edits
removed DashTimes from both pages
2017-03-08 10:49:53 +08:00
tungfa
8dfb40502d news post 8.March
pic + links
local checked
2017-03-08 10:08:01 +08:00
tungfa
6d15eaa6ab News Post
2 pics
2017-03-07 10:06:39 +08:00
tungfa
fb0f465e39 News Post
Video + Pic
2017-03-07 10:03:07 +08:00
tungfa
824508ac05 News Post
easterdaily
+ pic
2017-03-07 10:00:02 +08:00
tungfa
39f369bbaf News Post Bitfinex
2 images
2017-03-07 09:54:37 +08:00
tungfa
96b2a159fa 12.1.3 News post
News post + pic
2017-03-07 09:48:34 +08:00
tungfa
eea5e414b7 News Post
Marketwatch + Image
2017-03-07 09:46:07 +08:00
tungfa
cb2f31f385 Mining Edits
Text Edits
2017-03-07 09:36:50 +08:00
tungfa
b4d92032b7 Edits on Governance Page
Text edits
2017-03-07 09:33:14 +08:00
tungfa
02628c4d0a update desktop version to 12.1.3 2017-03-06 17:12:08 +08:00
tungfa
2d92db9ae3 2nd attempt - removing russian file 2017-03-06 17:12:08 +08:00
moocowmoo
ed0962e5b3 bugfix - removing more ru files not checking out properly 2017-03-06 17:12:08 +08:00