Commit graph

491 commits

Author SHA1 Message Date
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
hunterlester
2f0bca4d72 adds contacts page and hero, begins work on forms 2016-11-29 22:51:48 -08:00
tungfa
eb7177d3a9 alexy image
for team page
2016-11-29 20:56:03 +08:00
tungfa
34cc328dac more changes 2016-11-28 09:34:33 +08:00
Andy Freer
6380578f26 Update team.yml 2016-11-26 10:21:28 +00:00
tungfa
2b067876fe more fixes
- 2nd round
more coming (nearly there)
2016-11-26 14:53:58 +08:00
tungfa
0826b5b117 Small fixes
- PGP 1st round
- emails
- details
- ….. more coming
2016-11-25 12:16:43 +08:00
tungfa
4f4b038cfa new image as requested on DF 2016-11-24 09:58:09 +08:00
tungfa
0133a05e15 pt fixes 2016-11-24 09:01:29 +08:00
tungfa
c2c4de2984 small fixes 1st round
more coming soon
2016-11-24 08:48:44 +08:00
Andy Freer
846557c392 Update en.yml 2016-11-23 16:25:39 +00:00
Andy Freer
4256b4265e Update en.yml 2016-11-23 10:36:02 +00:00
tungfa
a8f1514af5 small corrections 2016-11-23 08:38:04 +08:00
Perry Woodin
a8331f5156 Merge branch 'fix/buglist' 2016-11-22 08:06:16 -05:00
Perry Woodin
aa787b75a3 Funding link in footer launch in new window. 2016-11-22 08:02:54 -05:00
Perry Woodin
5c0b6565e4 Removed merchants
Removed additional inactive merchants.
2016-11-22 07:59:57 -05:00
Perry Woodin
f9e16e7533 Governance Tools linking
Fixed dash central and dashvotetracker links.
2016-11-22 07:57:11 -05:00
Perry Woodin
22d4a8d3ec Community
- Updated Google+ link
- Reorganized the social links.
2016-11-22 07:55:22 -05:00
Perry Woodin
ae7854d08e Merchants
- Removed BitcoinSeedStore. The site has been offline for weeks.
- Above All House Plans (was Plants)
2016-11-22 07:39:31 -05:00
0xfff
217a7dc0d7 [Fix] CTABox: fix visual bugs (gray gradients / 1px offset) 2016-11-21 19:22:40 +01:00
tungfa
0d328ba4e3 chi spelling fixes 2016-11-21 09:56:16 +08:00
tungfa
5a16f83d44 spelling mistakes fixed 2016-11-20 14:10:08 +08:00
tungfa
e7341bb7d7 misspelling fixed 2016-11-20 14:04:32 +08:00
tungfa
bff0bf378c Pt corrections 2016-11-20 13:53:42 +08:00
Perry Woodin
cc6e027c75 Merge branch 'feature/blog-post-image' 2016-11-18 10:09:32 -05:00
Perry Woodin
71d43e17a5 Show the blog image with the content as well as in the hero
- @tungfa Requested the blog post default image be shown along with the
content. Not just as the hero image.
- Updated the post layout file. We can’t pass along a translated title,
so we need to output the <title> as set in each individual blog post.
2016-11-18 10:08:07 -05:00