Commit graph

735 commits

Author SHA1 Message Date
Chuck Williams
0de0cba8de Merged branch master into master 2017-03-01 15:17:57 -07:00
Chuck Williams
25ea8875b8 Merged branch master into chuckFork/master 2017-03-01 15:13:17 -07: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
Chuck Williams
3f3071729c ignore ".lock" files 2017-03-01 14:45:02 -07:00
VitaliyTr
ede673cd38 added dummy images 2017-03-02 04:37:31 +07:00
Chuck Williams
6dafba412e resolve russian image file name 2017-03-01 14:22:30 -07:00
Chuck Williams
9158310956 Merged branch master into master 2017-03-01 14:20:35 -07:00
Chuck Williams
faf68aa7a8 Merge branch 'chuckFork/master'
Conflicts:
	.gitignore
	_drafts/Обновлённый-android-кошелёк-dash-с-новым-дизайном-теперь-после-тестирования-доступен-для-скачивания-в-googleplay-.html
	_drafts/Обновлённый-android-кошелёк-dash-с-новым-дизайном-теперь-после-тестирования-доступен-для-скачивания-в-googleplay-.html
2017-03-01 14:20:17 -07:00
Chuck Williams
9d00df7d30 resolving russian file names 2017-03-01 14:18:13 -07:00
Chuck Williams
8a576c29f9 resolving russian file names 2017-03-01 14:18:05 -07:00
VitaliyTr
9038a031e4 added dummy data 2017-03-02 04:17:33 +07:00
Chuck Williams
8fd3d5b636 adds and activates portuguese language file with cleanup 2017-03-01 14:12:39 -07:00
Chuck Williams
0cb33538ef resolving russing file names 2017-03-01 13:27:17 -07:00
Chuck Williams
9bba6fb0ec Resolving russian file names 2017-03-01 13:27:05 -07:00
VitaliyTr
794aaeb514 added exchanges page 2017-03-02 01:13:46 +07:00
VitaliyTr
cf6b6bcf78 Merge branch 'master' of https://github.com/dashpay/dash-website 2017-03-01 00:42:08 +07:00
VitaliyTr
1b8c3530d8 added dummy data for buy page 2017-03-01 00:40:07 +07:00
mr.V
b4f0d93afd fixed payments page; (#144)
* fixed payment page
2017-02-28 15:27:25 +00:00
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