Commit graph

626 commits

Author SHA1 Message Date
VitaliyTr
a3bab59b51 fixed woocommerce page according snogcel notes 2017-02-17 00:33:20 +07: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
tungfa
11c9a7b5ce Merge remote-tracking branch 'dashpay/master' 2017-02-13 08:51:40 +08:00
tungfa
0dbbd2e11b couple off news posts and some fixed (#118)
* 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
2017-02-13 08:51:06 +08:00
tungfa
23619f2fb2 News Post - video
local checked - all good
2017-02-13 08:50:31 +08:00
Craig Williams
4a44877396 Typo change Lean to Learn on get-dash page 2017-02-12 14:02:55 -06:00
tungfa
dd617b2f54 fix on post
forgot link
2017-02-12 15:13:18 +08:00
tungfa
a454b153ee Spelling Fix button
fixed spelling mistake in button
2017-02-12 15:03:00 +08:00
tungfa
779c315c61 Russ News Post
embedded video Russ + Image
2017-02-12 15:00:37 +08:00
tungfa
8a42711c63 News Post
Why Dash Dislodged Ethereum Post + Pic
2017-02-12 14:55:04 +08:00
tungfa
124e3d58eb Russ Post
Russ post 12.1 launch + pic
2017-02-12 14:49:17 +08:00
tungfa
74e4bc4d61 Merge remote-tracking branch 'dashpay/master' 2017-02-12 14:33:23 +08:00
Andy Freer
a19a908b34 Update: Hash Engineering access / validation types on Wallets 2017-02-11 20:21:28 +00:00
tungfa
3f68678e2a Merge remote-tracking branch 'dashpay/master' 2017-02-11 17:57:35 +08:00
Chuck Williams
973203a134 Merge commit 'c912dffc74'
* commit 'c912dffc74':
  updated ruby version
2017-02-10 23:05:37 -07:00
Chuck Williams
05ebc41d83 Merge commit 'bd00ea0383'
* commit 'bd00ea0383':
  fix minor typo
2017-02-10 23:05:29 -07:00
Chuck Williams
f93f21e491 cleanup on news posts to invoke and include in build 2017-02-10 23:04:41 -07:00
Madeleine Shang
bd00ea0383 Merge remote-tracking branch 'upstream/master'
merge after build
2017-02-11 05:35:26 +00:00
Madeleine Shang
c8cd222299 fix minor typo 2017-02-11 05:35:16 +00:00
tungfa
c912dffc74 updated ruby version 2017-02-11 13:30:38 +08:00
tungfa
2fbce34681 Merge remote-tracking branch 'dashpay/master' 2017-02-11 13:19:06 +08:00
Chuck Williams
073acc5a76 Adds address to contact page. 2017-02-10 21:52:19 -07:00
Chuck Williams
0b956bbe43 -- wallets/index.html: Pulls all electrum wallets
-- fixes padding for EXODUS logo
-- fixes extra curly brace on homepage
2017-02-10 21:42:56 -07:00
tungfa
28388fa316 Merge remote-tracking branch 'dashpay/master' 2017-02-11 10:33:55 +08:00
tungfa
cfc41829b4 News post +video (#116)
ICE Kot
2017-02-11 10:22:26 +08:00
tungfa
6c2da0d24c News post +video
ICE Kot
2017-02-11 10:20:59 +08:00
tungfa
311aecb040 Merge remote-tracking branch 'dashpay/master' 2017-02-11 09:11:03 +08:00
Chuck Williams
85ea529515 package.json: htmlproof script ignores "/binaries" path 2017-02-10 08:35:51 -07:00
tungfa
c729a1e2b9 Merge remote-tracking branch 'dashpay/master' 2017-02-10 20:27:11 +08:00
tungfa
096417a440 news posts (#115)
* Video News Post

* News Post 100 Hrs

+ image
2017-02-10 20:10:26 +08:00
tungfa
1b5896865a News Post 100 Hrs
+ image
2017-02-10 20:09:33 +08:00
tungfa
bec0ab5abb Merge remote-tracking branch 'dashpay/master' 2017-02-10 17:47:30 +08:00