Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
ozasadnyy authored Nov 26, 2018
2 parents 81292f4 + c5e6c45 commit 79da066
Show file tree
Hide file tree
Showing 16 changed files with 155 additions and 15 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@ functions/lib/
/appengine/dist/
serviceAccount.json
npm-debug.log
firebase-debug.log
.DS_Store
.firebase/
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<a href="#getting-started">:rocket: Get Started</a>
</p>

[![Build Status](https://travis-ci.org/gdg-x/hoverboard.svg?branch=master)](https://travis-ci.org/gdg-x/hoverboard) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fgdg-x%2Fhoverboard.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fgdg-x%2Fhoverboard?ref=badge_shield)
[![Build Status](https://travis-ci.org/gdg-x/hoverboard.svg?branch=master)](https://travis-ci.org/gdg-x/hoverboard) [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fgdg-x%2Fhoverboard.svg?type=shield)](https://app.fossa.io/projects/git%2Bgithub.com%2Fgdg-x%2Fhoverboard?ref=badge_shield)[![Codacy Badge](https://api.codacy.com/project/badge/Grade/7973ac656dc94e42858ce640bb02de58)](https://www.codacy.com/app/pamuditha/hoverboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=pamuditha/hoverboard&amp;utm_campaign=Badge_Grade)

## Overview
Project Hoverboard is the conference website template that helps you to set up mobile first conference website with blog, speakers and schedule management in a few minutes.
Expand Down Expand Up @@ -46,6 +46,7 @@ Our goal is to allow event organizers to set up professional conference website
1. Run locally
* `npm run serve` or `yarn serve`
1. Build and deploy
* `npm run build` or `yarn build`
* `npm run deploy` or `yarn deploy`

*NOTE:* By default command using configurations from `/configs/development.json`.
Expand Down
5 changes: 5 additions & 0 deletions data/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
},
"hashtag": "DevFest17",
"disabledSchedule": false,
"showSessionShortAbstract": true,
"navigation": [
{
"route": "home",
Expand Down Expand Up @@ -146,6 +147,10 @@
},
"socialNetwork": {
"follow": [
{
"name": "meetup",
"url": "https://www.meetup.com/GDG-Lviv/events/244342635/"
},
{
"name": "facebook",
"url": "https://www.facebook.com/devfest.ukraine/"
Expand Down
Loading

0 comments on commit 79da066

Please sign in to comment.