Commit graph

410 commits

Author SHA1 Message Date
Chuck Williams
249c1cf709 fixing typo causing "missing image" error during build 2017-01-27 02:01:48 -07:00
VitaliyTr
19a7f343bd fixed graphics page 2017-01-27 02:15:29 +07:00
VitaliyTr
272e956bdd added dontaion row 2017-01-27 00:53:13 +07:00
VitaliyTr
f4dbb9ca79 added row 2017-01-27 00:05:05 +07:00
VitaliyTr
81ae7ca37d added row 2017-01-26 23:31:57 +07:00
VitaliyTr
45f3544beb Merge https://github.com/dashpay/dash-website 2017-01-26 22:54:17 +07:00
tungfa
f373d9672e Text Edits
I did a bunch of text edits (had a pro working on it for me)
2017-01-26 16:09:28 +08:00
VitaliyTr
fb5c083d8f added new fives 2017-01-25 18:28:34 +07:00
VitaliyTr
60e3ec20a8 added variable for sorting out all types of promo content 2017-01-25 17:49:58 +07:00
VitaliyTr
a1e8deecc0 added first data for graphic page 2017-01-25 16:54:01 +07:00
Chuck Williams
dd6790b207 adding "htmlproof" npm script command. 2017-01-24 22:22:35 -07:00
VitaliyTr
50a0e8071e added graphic page 2017-01-25 02:07:16 +07:00
VitaliyTr
4a0ad82980 fied styles in popup modal 2017-01-24 23:48:31 +07:00
Chuck Williams
d4ced65378 fixes tabs bottom border not disappearing issue. 2017-01-24 04:46:08 -07:00
Chuck Williams
71f6e537f0 Changes "PGP" to "Keybase Identity" for "team" section 2017-01-23 17:13:54 -07:00
Chuck Williams
7f8279905f Revert "Relabels "PGP" to "Keybase Identity" in wallets site area"
This reverts commit 1c88320a34.
2017-01-23 17:11:53 -07:00
Chuck Williams
1c88320a34 Relabels "PGP" to "Keybase Identity" in wallets site area 2017-01-23 17:05:14 -07:00
VitaliyTr
a85eacc8b5 split team on Core Team and Developers\support 2017-01-24 00:57:41 +07:00
Chuck Williams
4cb73a60b2 -- fixes bad link for language versions on evolution.html with {{basenav}} prefix 2017-01-23 08:29:06 -07:00
Chuck Williams
5023a694b7 Merge branch 'mrV/master'
* mrV/master:
  fixed merge
  added images
  merge from origin
  finished evolution page
  added new section
  new section
  added evo page
  evo page created
2017-01-23 08:20:38 -07:00
tungfa
ddd1ffc2f8 Team Pic fix
fixed alexy pic, was wrong crop, should work now
2017-01-23 20:52:13 +08:00
VitaliyTr
59a65cbeb2 fixed merge 2017-01-23 18:07:07 +07:00
VitaliyTr
1c4e8c1ac3 added images 2017-01-23 18:01:53 +07:00
VitaliyTr
172ba1aa74 merged from remote 2017-01-23 16:36:42 +07:00
VitaliyTr
0d64099e09 merge from origin 2017-01-23 16:19:05 +07:00
tungfa
a8a75415bb Team page fix
small detail
2017-01-23 09:27:36 +08:00
VitaliyTr
9a8677414e finished evolution page 2017-01-23 03:32:40 +07:00
Chuck Williams
5d9e1a6277 Implements wallets area update suggestions from tungfa 2017-01-22 13:12:51 -07:00
VitaliyTr
f6d9dbdf73 added new section 2017-01-23 01:17:26 +07:00
VitaliyTr
8bd6cf4bf3 new section 2017-01-23 01:04:31 +07:00
VitaliyTr
c0034dbbac added evo page 2017-01-23 00:47:07 +07:00
VitaliyTr
2d2f4508c6 evo page created 2017-01-22 23:51:59 +07:00
Chuck Williams
df1da61101 more link cleanup -- successfully builds & passes html-proofer locally 2017-01-22 09:36:52 -07:00
Chuck Williams
53bddb9fca Merge commit '1cfc0dae75'
* commit '1cfc0dae75':
  added link to update page to navbar and footer
2017-01-22 09:27:26 -07:00
Chuck Williams
f9cb1059a5 fixes link on /hero/update.html breaking build. 2017-01-22 09:27:06 -07:00
VitaliyTr
1cfc0dae75 added link to update page to navbar and footer 2017-01-22 23:04:47 +07:00
Chuck Williams
62beb72e2a Merge branch 'mrV/master'
* mrV/master:
  update page added content and fixes
  added update page
  popups and merges
2017-01-22 09:02:57 -07:00
Chuck Williams
7268825bba Moved image causing build fail. 2017-01-22 09:02:33 -07:00
Chuck Williams
38ac7a72f6 Merge branch 'master' of https://github.com/dashpay/dash-website
# By tungfa
# Via tungfa
* 'master' of https://github.com/dashpay/dash-website:
  Team Section
2017-01-22 08:34:12 -07:00
VitaliyTr
880aaa1e45 update page added content and fixes 2017-01-22 19:25:41 +07:00
tungfa
c60df9054f Team Section
Had to ad 1 more member / raico
2017-01-22 17:36:39 +08:00
VitaliyTr
4810054629 added update page 2017-01-22 01:00:18 +07:00
VitaliyTr
4f49965c40 popups and merges 2017-01-20 17:38:15 +07:00
Chuck Williams
c1e985f67c Community and Merchant Image Collection Drop
- via info@etherdesign.io
2017-01-20 00:02:34 -07:00
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