joshua/dash-website
1
0
Fork 0
mirror of https://github.com/seigler/dash-website synced 2025-07-27 07:16:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
756 commits 10 branches 0 tags 352 MiB
Commit graph

756 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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':
  New News post (#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':
  Typo change Lean to Learn on get-dash page
 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
tungfa
de9b0e9226 Removed Protonmail 
Proton is NOT integrated yet
- i removed them from merchants section
- frontage - merchants block

tested local and OK
 2017-02-15 14:19:58 +08:00
tungfa
de10e28347 Merge remote-tracking branch 'dashpay/master' 2017-02-15 12:14:03 +08:00
tungfa
2553d3a47c News Post + pic (#121) 
locally checked - all good
 2017-02-15 11:57:14 +08:00
tungfa
742f9658f5 News Post + pic 
locally checked - all good
 2017-02-15 11:56:45 +08:00
tungfa
56bf4b189d Merge remote-tracking branch 'dashpay/master' 2017-02-13 20:29:02 +08:00
tungfa
f580b21461 added a merchant + image (#120) 
* Russ Post

Russ post 12.1 launch + pic

* News Post

Why Dash Dislodged Ethereum Post + Pic

* Russ News Post

embedded video Russ + Image

* Spelling Fix button

fixed spelling mistake in button

* fix on post

forgot link

* News Post - video

local checked - all good

* News post + pic

checked locally

* fixes

erased dead community
- what is dash
- dashndrink

New Merchant = Pic

locally all checked
 2017-02-13 16:13:16 +08:00
tungfa
da2df22f6f fixes 
erased dead community
- what is dash
- dashndrink

New Merchant = Pic

locally all checked
 2017-02-13 15:52:20 +08:00
tungfa
83a15ca8b9 Merge remote-tracking branch 'dashpay/master' 2017-02-13 15:31:00 +08:00
tungfa
774fb286f2 News post (#119) 
* Russ Post

Russ post 12.1 launch + pic

* News Post

Why Dash Dislodged Ethereum Post + Pic

* Russ News Post

embedded video Russ + Image

* Spelling Fix button

fixed spelling mistake in button

* fix on post

forgot link

* News Post - video

local checked - all good

* News post + pic

checked locally
 2017-02-13 15:28:07 +08:00
tungfa
108f122f87 News post + pic 
checked locally
 2017-02-13 15:27:32 +08:00