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 bc16f7900c0cec223e9f
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
2017-02-20 10:30:08 -07:00
Chuck Williams
0cec223e9f
Merge commit ' e7d3047bbb'
...
* commit 'e7d3047bbb
2017-02-20 10:29:39 -07:00
Chuck Williams
1ef714b483
Merge commit ' 5b1f708d11'
...
* commit '5b1f708d11
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
tungfa
6e846f1d28
Merge remote-tracking branch 'dashpay/master'
2017-02-20 23:59:22 +08:00
tungfa
8cb5040397
still not merged ? ( #128 )
...
* 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
2017-02-20 23:56:39 +08:00
tungfa
88f360979c
Merge remote-tracking branch 'dashpay/master'
2017-02-20 23:52:18 +08:00
moocowmoo
e7d3047bbb
config - 12.1.1 binary hrefs
2017-02-20 10:18:33 +00:00
tungfa
3c728b4977
news posts + corrections + images ( #127 )
...
* 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
2017-02-20 12:43:03 +08:00
tungfa
b36d5dbfc4
correction to news post
...
tested and all good now
(images inside post)
maddie rules
2017-02-20 12:39:10 +08:00
tungfa
63db94bcf4
News post + pic
...
local checked
2017-02-20 10:36:36 +08:00
tungfa
9592d8e437
Merge remote-tracking branch 'dashpay/master'
2017-02-19 17:14:56 +08:00
tungfa
486e31cae0
news Post + pic ( #126 )
...
* 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
2017-02-19 17:13:54 +08:00
tungfa
9e0693a163
News Post
...
News Post + Pic
local checked
2017-02-19 17:13:10 +08:00
tungfa
53f0bf4b37
Merge remote-tracking branch 'dashpay/master'
2017-02-19 16:51:31 +08:00
tungfa
eb49d7f53a
some corrections ( #125 )
...
Team page
- vitalik and matt more details + pics
Evolution section - fixed a mistake
News Post + pic
all local tested
2017-02-18 10:40:38 +08:00
tungfa
04cabca650
News post
...
News post + pic
local checked
2017-02-18 10:38:53 +08:00
tungfa
b20c53ec60
some corrections
...
Team page
- vitalik and matt more details + pics
Evolution section - fixed a mistake
News Post + pic
all local tested
2017-02-17 08:58:58 +08:00
VitaliyTr
a3bab59b51
fixed woocommerce page according snogcel notes
2017-02-17 00:33:20 +07:00
tungfa
dce1d48c00
Merge remote-tracking branch 'dashpay/master'
2017-02-16 13:24:43 +08:00
Chuck Williams
1c52e79606
Merge commit ' 640fcb1f1f'
...
* commit '640fcb1f1f#123 )
New News post
2017-02-15 22:17:25 -07:00
Chuck Williams
e5fc8873c1
kills all languages and language path files from build
2017-02-15 22:15:40 -07:00
tungfa
640fcb1f1f
Merge remote-tracking branch 'dashpay/master'
2017-02-16 13:01:06 +08:00
tungfa
5876c5b961
New News post ( #123 )
...
Video + Pic and text
all working - local check
2017-02-16 11:59:29 +08:00
tungfa
53995a7cdd
New News post
...
Video + Pic and text
all working - local check
2017-02-16 11:58:47 +08:00
tungfa
b00ab5d054
Merge remote-tracking branch 'dashpay/master'
2017-02-16 11:28:56 +08:00
Chuck Williams
4cb64525b4
Merge commit ' 4a44877396'
...
* commit '4a44877396
2017-02-15 11:12:18 -07:00
tungfa
9ad4c639f7
Merge remote-tracking branch 'dashpay/master'
2017-02-15 16:57:00 +08:00
tungfa
587c10127a
News Post + pic ( #122 )
...
locally checked - all good
2017-02-15 14:21:11 +08:00
