691 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
VitaliyTr	cb0d50c3c0	fixed mining page	2017-02-25 20:24:23 +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
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
VitaliyTr	cf0f715b23	fixed governance and masternodes content	2017-02-24 20:33:22 +07: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
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	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
tungfa	6c4993178b	couple of posts and fixes (#133) ... * News Post - 2 images local checked * News Post - Android tested * News Post Confirm video + Pic tested * Image change in proposal section (old image was cut up - pinged snogcel already to fix on his ordinal page) + less background buttons now - so cleared to see what to do	2017-02-22 11:31:57 +08:00
tungfa	d1677e18ec	Image change in proposal section ... (old image was cut up - pinged snogcel already to fix on his ordinal page) + less background buttons now - so cleared to see what to do	2017-02-22 11:29:51 +08:00
Madeleine Shang	18f595fbff	update button route for merchant pg and no new winow	2017-02-22 01:12:31 +00:00
tungfa	cc5053fe6f	News Post ... Confirm video + Pic tested	2017-02-22 09:08:07 +08:00
tungfa	682e25f69b	Merge remote-tracking branch 'dashpay/master'	2017-02-22 09:01:07 +08:00
Madeleine Shang	32c6c2bf63	pr ready for new payments page, minor changes on merchant page	2017-02-22 00:03:01 +00:00
Madeleine Shang	69b521cf20	init commit for payments page	2017-02-21 19:08:07 +00:00
VitaliyTr	10e518fdc1	Merge branch 'master' of https://github.com/dashpay/dash-website	2017-02-22 00:22:58 +07:00
VitaliyTr	01f790b196	marget	2017-02-22 00:22:46 +07:00
VitaliyTr	40f0cfbe29	added budget page	2017-02-22 00:20:18 +07:00
VitaliyTr	9df3bcb66a	added budget page	2017-02-21 22:56:14 +07:00
tungfa	04e2ad0121	android news post (#131) ... * News Post - 2 images local checked * News Post - Android tested	2017-02-21 15:25:21 +08:00
tungfa	0adfc13d21	News Post - Android ... tested	2017-02-21 15:23:30 +08:00
tungfa	ae6dd1cd7c	Merge remote-tracking branch 'dashpay/master'	2017-02-21 15:07:00 +08:00
Chuck Williams	3cb5b37a2b	Revert "Merge commit 'a3bab59b51'" ... This reverts commit bc16f7900c, reversing changes made to 0cec223e9f.	2017-02-20 21:18:46 -07:00
tungfa	5e26f26437	News Post - 2 images (#130) ... local checked	2017-02-21 09:54:38 +08:00
tungfa	adfa3efbe9	News Post - 2 images ... local checked	2017-02-21 09:52:52 +08:00
tungfa	2b2eaf3226	Merge remote-tracking branch 'dashpay/master'	2017-02-21 09:05:02 +08:00
Chuck Williams	bc16f7900c	Merge commit 'a3bab59b51' ... * commit 'a3bab59b51': fixed woocommerce page according snogcel notes	2017-02-20 10:30:08 -07:00
Chuck Williams	0cec223e9f	Merge commit 'e7d3047bbb' ... * commit 'e7d3047bbb': config - 12.1.1 binary hrefs	2017-02-20 10:29:39 -07:00
Chuck Williams	1ef714b483	Merge commit '5b1f708d11' ... * commit '5b1f708d11': 12.1.1 News correction to news post News post + pic News Post News post some corrections	2017-02-20 10:29:11 -07:00
tungfa	1eccbaa287	Merge remote-tracking branch 'dashpay/master'	2017-02-21 00:20:10 +08:00
tungfa	fffb369dee	1 more news post on top (#129) ... * some corrections Team page - vitalik and matt more details + pics Evolution section - fixed a mistake News Post + pic all local tested * News post News post + pic local checked * News Post News Post + Pic local checked * News post + pic local checked * correction to news post tested and all good now (images inside post) maddie rules * 12.1.1 News blog post + pic locally checked	2017-02-21 00:18:27 +08:00
tungfa	5b1f708d11	12.1.1 News ... blog post + pic locally checked	2017-02-21 00:17:38 +08:00