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

316 commits

This branch
This branch
All branches
Author SHA1 Message Date
Chuck Williams
5b342ab593 Build Fix 
Hoping to fix build issue
 2017-01-19 22:43:11 -07:00
Chuck Williams
0d166bb2db feature/wallets 
Fixing bad urls breaking build.
 2017-01-19 21:31:27 -07:00
Chuck Williams
9ddf729e5b Merge branch 'feature/wallets' 2017-01-19 10:47:32 -07:00
Chuck Williams
ab8a2d1aff Merge branch 'master' of https://github.com/dashpay/dash-website into feature/wallets 
# By Chuck C Williams (1) and kiralybalazs (1)
# Via 0xfff
* 'master' of https://github.com/dashpay/dash-website:
  Feature/wallets (#65)
  Update: profile pic of balu (#63)

Conflicts:
	_data/wallets-collection.yml
	_includes/wallet-tile.html
	src/js/wallets.js
	src/scss/_junk-drawer.scss
	wallets/index.html
 2017-01-17 01:18:51 -07:00
Chuck Williams
5d3388abf2 WIP - wallet page updates; adds wallet product modals, improves wallet-collection data; 2017-01-17 01:13:38 -07:00
Chuck C Williams
95a0271475 Feature/wallets (#65) 
* Speeding up Jekyll build by limiting rebuilds on images for language assets using 'keep_files' config option on language folders.

* WIP - wallets page draft: wallet tile templates styled and functioning with yml data
 2017-01-16 03:26:02 +01:00
kiralybalazs
06206aeec6 Update: profile pic of balu (#63) 2017-01-15 15:56:01 +01:00
Chuck Williams
ca201703b5 WIP - wallets page draft: wallet tile templates styled and functioning with yml data 2017-01-14 01:09:58 -07:00
Chuck Williams
a9ea60c7e1 Merge branch 'master' of https://github.com/dashpay/dash-website into feature/wallets 
# By Chuck C Williams
# Via 0xfff
* 'master' of https://github.com/dashpay/dash-website:
  Speeding up Jekyll build by limiting rebuilds on images for language assets using 'keep_files' config option on language folders. (#64)
 2017-01-14 01:00:20 -07:00
Chuck C Williams
c66ecbc7e2 Speeding up Jekyll build by limiting rebuilds on images for language assets using 'keep_files' config option on language folders. (#64) 2017-01-12 02:44:14 +01:00
Chuck Williams
66d93e87fc Speeding up Jekyll build by limiting rebuilds on images for language assets using 'keep_files' config option on language folders. 2017-01-11 05:06:51 -07:00
tungfa
a7e810f7ec Esp fixes 2017-01-04 11:44:02 +08:00
Hunter Lester
b0e385bcdb [Fix] HTMLproofer 
* adds new dash community logos

* adds os logos, removes mistakenly uploaded dash logos

* adds correct images from design PSD

* adds wallets page and hero

* initial OS logos

* adds bootstrap min js and scss files for modals, navs, and tooltips

* implements pills and tab panes

* adds html module for win-core modal

* formats prototype modal

* addresses issue #61, htmlproofer is green

* moves tooltip jquery to default.html layout, no more reference error

* removes inline js
 2016-12-21 10:50:13 +01:00
Andy Freer
fdb2660ac7 Update: Footer - fix link to create proposal 2016-12-20 16:47:02 +00:00
0xfff
4df22d2c89 [Refactor] Tooltip: Move inline javascript to separate js 2016-12-16 15:22:03 +01:00
Perry Woodin
b365639f22 [Fix] Blog Post: Image path for front matter 
@tungfa The images referenced in the top of a post need to go into
/assets/img/blog/. That way you don’t need to define the path in the
front matter.
 2016-12-16 09:10:18 -05:00
Perry Woodin
8a923fd280 [Fix] YAML: Team 
Missing space for `description` key on Alexy and Raico record.
 2016-12-16 08:36:36 -05:00
0xfff
3aae4e1010 [Fix] YAML: Merchants 2016-12-16 12:29:37 +01:00
Hunter Lester
3278f692df Wallet downloads page (#60) 
* adds new dash community logos

* adds os logos, removes mistakenly uploaded dash logos

* adds correct images from design PSD

* adds wallets page and hero

* initial OS logos

* adds bootstrap min js and scss files for modals, navs, and tooltips

* implements pills and tab panes

* adds html module for win-core modal

* formats prototype modal
 2016-12-16 10:05:15 +01:00
tungfa
1b09be4130 New Merchant 2016-12-16 09:43:57 +08:00
tungfa
96624062cf Test News Post 
this is with a video link - am trying it out if i need the embedded
link or ‘normal’ link
 2016-12-14 08:52:35 +08:00
tungfa
ab3b75bba1 Fixed Team page issues 2016-12-14 08:41:23 +08:00
tungfa
e9e2dfa404 Arabic Language Section 2016-12-14 08:37:07 +08:00
Andy Freer
b8e127b6d6 Update footer.html 2016-12-06 12:07:34 +00:00
Perry Woodin
7c61d4d3e5 Travis - explicitly add known host IP 2016-12-05 11:28:37 -05:00
Perry Woodin
52850c941e Travis - explicitly add known host IP 2016-12-05 11:21:52 -05:00
Perry Woodin
33c57928e8 Removing notifications while testing Travis 2016-12-05 11:07:22 -05:00
Perry Woodin
25e81a5f7e Travis 2016-12-05 10:57:07 -05:00
Perry Woodin
5f7d46c19b Updated key encryption settings for Travis. 2016-12-05 10:31:52 -05:00
Perry Woodin
23effd8e99 Update .travis.yml 2016-12-04 08:42:27 -05:00
Perry Woodin
b46c4f0dff Fixes #57 
* Added travis slack notification

* Escape quotes in ru.yml
 2016-12-04 08:25:18 -05:00
Perry Woodin
5bc9019b0d Explicitly setting travis email notifications. 
Will email @perrywoodin @tungfa @andyfreer
 2016-12-03 08:57:25 -05:00
tungfa
d8880a0392 Ru - fixes 2016-12-03 10:08:27 +08:00
Perry Woodin
3db9eae989 Merge branch 'hunterlester-master' 2016-12-02 20:23:24 -05:00
Perry Woodin
4e08ea6ce7 Fixed Kots pgp link. 
Was missing the https://
 2016-12-02 20:21:14 -05:00
Perry Woodin
5f05eb6d70 Merge branch 'master' of https://github.com/hunterlester/dash-website into hunterlester-master 2016-12-02 20:15:51 -05:00
hunterlester
54124530a9 closes issue #54 2016-12-02 14:43:48 -08:00
hunterlester
0b2bea3270 rename replacement images to old image name 2016-12-02 14:36:50 -08:00
hunterlester
c2d715d8a8 sync with upstream 2016-12-02 14:16:25 -08:00
hunterlester
e5975a3fec merge upstream 2016-12-02 14:13:36 -08:00
Hunter Lester
08ba582317 Contacts page pull request (#53) 
* adds contacts page and hero, begins work on forms

* social icons

* replace some logos, clean up form and spacing
 2016-12-02 16:36:53 -05:00
Perry Woodin
c64481feac Merge branch 'master' of https://github.com/hunterlester/dash-website into hunterlester-master 2016-12-02 16:34:11 -05:00
Perry Woodin
01b3a74cc9 Move Alexy photo into team/ 
@tungfa The team photos need to go into /assets/img/team/
 2016-12-02 16:32:54 -05:00
Joshua Seigler
e65cc06566 fix: blend live masternode chart with gray background (#52) 2016-12-02 16:30:26 -05:00
Perry Woodin
c50760a476 Escaped inline double quotes on team.yml 
@tungfa Whenever there are double quotes in the text you need to escape
them with a back slash \
 2016-12-02 16:21:05 -05:00
tungfa
b844f09a77 spelling 2016-12-02 18:31:29 +08:00
tungfa
e67d05ea20 French version incoming 2016-12-02 11:08:16 +08:00
hunterlester
ac75f27980 replace some logos, clean up form and spacing 2016-12-01 11:22:36 -08:00
tungfa
e6655e2699 balu description 2016-12-01 14:41:28 +08:00
hunterlester
bf66f7923f social icons 2016-11-30 16:17:22 -08:00