Commit graph

856 commits

Author SHA1 Message Date
RobertoAzar
2c308564d6 Live chat code added in default.html
This html code is to implement the Dash Chat proposal submitted to the network by Roberto Azar (+1 squashed commit)
Squashed commits:
[492360e] adding livechat control to default layout
2017-03-22 03:15:41 -06:00
tungfa
701172bb20 New Merchant
Precious Metal
2017-03-22 11:38:57 +08:00
tungfa
9d2975cebb News Post + pic 2017-03-22 11:38:57 +08:00
tungfa
d81198d97d News - Electrum
+ pic
2017-03-21 18:32:40 +08:00
tungfa
2bc53c66d6 2 news post + 2 pics 2017-03-21 09:22:56 +08:00
VitaliyTr
9de5b1f0c9 added download btn for graphic page 2017-03-20 21:08:39 +07:00
tungfa
ef1b9e7a08 News Post Ver
Video + Pic - checked
2017-03-20 10:24:28 +08:00
tungfa
7ac09fec12 News post 20th
+ pic - local checked and fine
2017-03-20 09:34:38 +08:00
Andy Freer
219e466ef3 Update team.yml 2017-03-19 18:09:47 +00:00
tungfa
cc4e9ccab7 Replacement
Replaced Coinapult with alphacasier
incl pic

local checked
2017-03-19 20:20:27 +08:00
moocowmoo
8a505de64f config - encrypting pem with known password to support fork builds 2017-03-19 08:59:19 +00:00
mr.V
1dbb39ebfc added html five doctype (#183) 2017-03-19 04:26:24 -04:00
moocowmoo
1767a2ccf0 bugfix - ampersand entities 2017-03-19 05:04:26 +00:00
Chuck Williams
a737c1f823 Adds RSS feed generator plugin & cleanup of ampersands in posts to enable successful build of rss. Lands in /rss/dash_blog_rss.xml 2017-03-18 22:59:54 -06:00
tungfa
62f7a3814c Merge remote-tracking branch 'dashpay/master' 2017-03-19 10:12:46 +08:00
tungfa
5b64e4b2c0 New merchant listing
+ pic - checked
2017-03-19 10:07:15 +08:00
tungfa
525daf7f29 New merchant listing
+ pic - checked
2017-03-19 10:05:16 +08:00
VitaliyTr
6c0a7f871a fixed links on mining text 2017-03-18 23:27:11 +08:00
VitaliyTr
51cafa2bca merged 2017-03-18 23:27:11 +08:00
VitaliyTr
dce9a54dc3 Fixed footer link and contact space between buttons 2017-03-18 23:27:11 +08:00
tungfa
095ce8781f new header image 2017-03-18 11:44:40 +08:00
tungfa
6bcf2ff120 Merchants New+ edited
local checked + pics
2017-03-18 10:34:37 +08:00
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