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
646 commits 10 branches 0 tags 352 MiB
Commit graph

646 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
tungfa
dc4e4ac5fa Video News Post 2017-02-10 17:40:37 +08:00
Andy Freer
ee17067ebc Merge pull request #114 from VitaliyTr/master 
changed link for video
 2017-02-09 10:25:28 +00:00
VitaliyTr
f543da4499 changed link for video 2017-02-09 17:03:53 +07:00
Chuck Williams
1e2b15a23e Fixes Dash.org last fixes #68: /wallets/index.html typos & grammar 2017-02-09 01:19:09 -07:00
Chuck Williams
028256a72f Dash.org last fixes #19: changes "control of funds" message for android wallet. 2017-02-09 00:17:29 -07:00
Chuck Williams
7fcbe7e645 Merge commit '8bcc43e966' 
* commit '8bcc43e966':
  Run imageoptim on all images in assets directory
 2017-02-08 21:37:30 -07:00
Chuck Williams
e8a1cc9b72 Merge commit 'f2d1d249df' 
* commit 'f2d1d249df':
  remove in-active merchants
 2017-02-07 21:44:51 -07:00
Chuck Williams
7577bbd8e1 Merge commit '8fb5164d16' 
* commit '8fb5164d16':
  fixed email
  1 Russ News Post (#109)
  News Post Cryptocoinnews
  1 Russ News Post
 2017-02-07 21:44:29 -07:00
Chuck Williams
5a42bd67cd /wallets/index.html: Fixes missing Jaxx Logo 2017-02-07 21:41:54 -07:00
Brett Clanton
8bcc43e966 Run imageoptim on all images in assets directory 2017-02-07 19:57:18 -05:00
tungfa
8fb5164d16 fixed email 2017-02-08 08:14:56 +08:00
tungfa
757c85a997 Merge remote-tracking branch 'dashpay/master' 2017-02-08 08:13:18 +08:00
Madeleine Shang
f2d1d249df remove in-active merchants 2017-02-07 23:54:17 +00:00
tungfa
ce60635062 1 Russ News Post (#109) 
- embedded video post + image
 2017-02-07 16:09:08 +08:00
tungfa
11dba58993 News Post Cryptocoinnews 
News post + image
full text
 2017-02-07 16:08:39 +08:00
tungfa
e3c2e5a788 1 Russ News Post (#108) 
- embedded video post + image
 2017-02-07 15:43:46 +08:00
tungfa
609f3526fa 1 Russ News Post 
- embedded video post + image
 2017-02-07 15:41:46 +08:00
Chuck Williams
1892029fe3 Merge commit '081263c911' 
* commit '081263c911':
  12.1 Instructions News Post
  12.1 News post + image
  Evo Page edits
  team page
 2017-02-06 23:39:57 -07:00
tungfa
d9fb0463aa News posts (#107) 
* team page

small fixes and replacements

* Evo Page edits

had a pro editor looking at it - fixed things

* 12.1 News post + image

* 12.1 Instructions News Post

post + image
 2017-02-07 14:26:47 +08:00
tungfa
081263c911 12.1 Instructions News Post 
post + image
 2017-02-07 14:25:48 +08:00
tungfa
358de4661c 12.1 News post + image 2017-02-07 14:23:01 +08:00
tungfa
549591ff2b Merge remote-tracking branch 'dashpay/master' 2017-02-07 13:50:06 +08:00
tungfa
ab93dd7ebf team page fixes - evo page fixes (#106) 
* team page

small fixes and replacements

* Evo Page edits

had a pro editor looking at it - fixed things
 2017-02-07 13:46:51 +08:00
Chuck Williams
1e19c76404 Cleanup bad url and javascript to pass build. 2017-02-06 22:46:29 -07:00
tungfa
37e83c4624 Merge remote-tracking branch 'dashpay/master' 2017-02-07 13:45:22 +08:00
tungfa
57b9097eaa Evo Page edits 
had a pro editor looking at it - fixed things
 2017-02-07 13:44:54 +08:00
Chuck Williams
1c1ad79fe0 adds target="_blank" to Merchants -> "Get Listed" Button 2017-02-06 22:33:57 -07:00
tungfa
09218a1e3b team page 
small fixes and replacements
 2017-02-07 13:21:30 +08:00
tungfa
98800b0fae Merge remote-tracking branch 'dashpay/master' 2017-02-07 13:15:24 +08:00
Chuck Williams
228aceed59 Merge commit '02be974b19' 
* commit '02be974b19':
  4 new News/Blog images
  change image
  team page + active link
  3 News Dev's Addeted
  back to original image
  Fixed old post
  fixed image color
 2017-02-06 14:56:06 -07:00