Commit graph

715 commits

Author SHA1 Message Date
VitaliyTr
941c114562 fixed payment page 2017-02-28 21:46:52 +07:00
VitaliyTr
46ee7c61d3 Merge branch 'master' of https://github.com/dashpay/dash-website 2017-02-28 20:28:02 +07:00
VitaliyTr
545de641fe merged 2017-02-28 20:27:52 +07:00
Chuck Williams
513e3f8518 Comments invalid links for build success. 2017-02-27 15:55:42 -07:00
moocowmoo
d8ef9a737e config - added SIP - subresource integrity protection tags/hashes 2017-02-27 09:22:00 +00:00
tungfa
9396853437 Fixed link
changed link
2017-02-27 09:09:35 +00:00
moocowmoo
6368229712 bugfix - partial revert of 782268e7 - pem file 2017-02-27 06:06:41 +00:00
Chuck Williams
c1eb3af6c9 Activates build languages ["en", "cn", "ru", "it", "fr"] and updates language files for "cn", "fr", & "ru". Language selection inactive. 2017-02-26 21:06:46 -07:00
Chuck Williams
f797b69f5c Merge commit '289f2c4a55'
* commit '289f2c4a55':
  aded 404
  fixed mining page
2017-02-26 18:55:09 -07:00
tungfa
06b91e90c8 news posts and some fix (#143)
* 2 News Posts

checked and ready

* News Post

checked

* News Post

checked
2017-02-26 22:37:50 +08:00
fernandogutie
c5a3c9def7 Update index.html
Deleted links to dashndrink.com and whatisdash.org, which were deleted from the community page.
2017-02-26 13:36:47 +01:00
VitaliyTr
289f2c4a55 aded 404 2017-02-25 22:01:06 +07:00
tungfa
ed4f595424 2 News Posts (#140)
checked and ready
2017-02-25 22:05:56 +08:00
VitaliyTr
cb0d50c3c0 fixed mining page 2017-02-25 20:24:23 +07:00
Chuck Williams
168f1c71e2 wallets/index.html - fixes missing text on modal popups from wallet cards 2017-02-24 15:52:00 -07:00
Chuck Williams
8c06ea11fe Merge commit 'e522629d03'
* commit 'e522629d03':
  added content for masternodes
2017-02-24 15:04:13 -07:00
Chuck Williams
9229e744a9 Merge commit '36903c1e65'
* commit '36903c1e65':
  deleted
  added mining page
  fixed governance and masternodes content
  fixed typograph
  cleaned up contact page
  cleaned up governance page; budget page=> governance page
  fixed masternodes mage

Conflicts:
	_includes/hero/governance.html
	masternodes/index.html
2017-02-24 11:22:04 -07:00
VitaliyTr
e522629d03 added content for masternodes 2017-02-25 01:20:19 +07:00
VitaliyTr
36903c1e65 deleted 2017-02-25 00:59:29 +07:00
VitaliyTr
1edbc809f6 merged 2017-02-25 00:44:57 +07:00
VitaliyTr
782268e751 added mining page 2017-02-25 00:28:34 +07:00
Chuck Williams
8747f374d8 Merge commit '91816034db'
* commit '91816034db':
  2 news posts (#139)
2017-02-24 10:23:34 -07:00
Chuck Williams
ff3a375bf5 Merge commit 'ea5fcf9281'
* commit 'ea5fcf9281':
  config - removing dos newlines
  config - 12.1.2 binary hrefs
2017-02-24 10:23:17 -07:00
tungfa
91816034db 2 news posts (#139)
* News Post + Video

local checked

* News Post

News Post + Pic
local checked

* 2 News Posts

checked and ready
2017-02-25 01:22:11 +08:00
moocowmoo
ea5fcf9281 config - removing dos newlines 2017-02-24 16:14:09 +00:00
moocowmoo
6dca8fb964 config - 12.1.2 binary hrefs 2017-02-24 14:52:34 +00:00
VitaliyTr
cf0f715b23 fixed governance and masternodes content 2017-02-24 20:33:22 +07:00
tungfa
4330eebfd9 Merge remote-tracking branch 'dashpay/master' 2017-02-24 16:42:43 +08:00
tungfa
283fb7c125 News post (#138)
* News Post + Video

local checked

* News Post

News Post + Pic
local checked
2017-02-24 16:40:15 +08:00
tungfa
c261a997c3 News Post
News Post + Pic
local checked
2017-02-24 16:39:04 +08:00
tungfa
da0c8bbd43 Merge remote-tracking branch 'dashpay/master' 2017-02-24 16:30:47 +08:00
mr.V
9e8afd0090 cleaned up two pages: governance and masternode; added some minor fixes in contact page (#136)
* fixed masternodes mage

* cleaned up governance page; budget page=> governance page

* cleaned up contact page

* fixed typograph
2017-02-24 00:19:20 +01:00
VitaliyTr
2b920a41f0 fixed typograph 2017-02-23 23:35:06 +07:00
VitaliyTr
32ef0f9a2c cleaned up contact page 2017-02-23 23:17:30 +07:00
VitaliyTr
19fc93eff0 cleaned up governance page; budget page=> governance page 2017-02-23 22:28:40 +07:00
VitaliyTr
4629c4a475 fixed masternodes mage 2017-02-23 18:25:47 +07:00
tungfa
3e947f4638 News Post + Video (#135)
local checked
2017-02-23 15:23:35 +08:00
tungfa
0ea544fd16 News Post + Video
local checked
2017-02-23 15:20:53 +08:00
tungfa
2369b04730 Merge remote-tracking branch 'dashpay/master' 2017-02-23 10:54:24 +08:00
0xfff
a9a47fad0f Merge pull request #132 from Prtfw/master
make new page for /payments
2017-02-23 02:07:07 +01:00
0xfff
1540555996 Merge pull request #134 from VitaliyTr/master
added nav and budget page
2017-02-23 02:01:21 +01:00
VitaliyTr
cc5399c0bd added bg for contact 2017-02-23 01:14:52 +07:00
VitaliyTr
6e9dbae77f added images 2017-02-23 01:00:11 +07:00
VitaliyTr
26052b5636 added files; fixed text 2017-02-23 00:15:29 +07:00
VitaliyTr
ffefbba5b0 added content masternode 2017-02-22 22:44:59 +07:00
VitaliyTr
5c4acbfd4b fixed styles 2017-02-22 18:52:51 +07:00
VitaliyTr
0f020ce4e3 fixed buy-sell page; fixed budget page 2017-02-22 17:44:59 +07:00
VitaliyTr
14639ad667 added buy-sell page 2017-02-22 17:35:56 +07:00
VitaliyTr
9b34c967ca added navs 2017-02-22 14:59:42 +07:00
tungfa
233f64d799 Merge remote-tracking branch 'dashpay/master' 2017-02-22 14:45:22 +08:00