v1, demo day ready#32

Open

wishinghand wants to merge 117 commits intomasterfrom

Commits on Oct 4, 2016

completed refactoring of CSS
comrww
committed
merge conflict fix
wishinghand
committed
Merge pull request #13 from Incentify/css-refactor
Jason Land
authored

Commits on Oct 5, 2016

trying to fix font sizes
wishinghand
committed
fixed merge conflicts

Reggie Sibley
authored and
Reggie Sibley
committed
fixed merge conflicts

Reggie Sibley
authored and
Reggie Sibley
committed
fixed top branding padding
wishinghand
committed
code cleanup
wishinghand
committed
navbar has colors that stay on clicking different tabs
wishinghand
committed
refactoring Dashboard style
wishinghand
committed
commented in a note about the webroot for cordova vs server
wishinghand
committed
removed this component
wishinghand
committed
resized inputs
wishinghand
committed
reordered components, removed Settings
wishinghand
committed
just commiting to get rid of it, deprecated component
wishinghand
committed
capitalizing navbar component
wishinghand
committed
unfinished commit, commented out styles
wishinghand
committed
un-capitalizing navbar
wishinghand
committed
indented styles
wishinghand
committed
viewport meta tag
wishinghand
committed
restorededit and save functionality on input field

Reggie Sibley
authored and
Reggie Sibley
committed
fixed all issues with goal component

Reggie Sibley
authored and
Reggie Sibley
committed
fixed merge conflicts

Reggie Sibley
authored and
Reggie Sibley
committed
Merge pull request #16 from Incentify/animations
ReggieSibley
authored

Commits on Oct 6, 2016

fixed merge conflict

Reggie Sibley
authored and
Reggie Sibley
committed
fixed merge conflicts

Reggie Sibley
authored and
Reggie Sibley
committed
matching brackets in HTML
wishinghand
committed
deleting dead CSS code
wishinghand
committed
actually matched all of the HTML brackets this time
wishinghand
committed
removed big animation
wishinghand
committed
mass commit, fixes and tests mostly
wishinghand
committed
Merge pull request #17 from Incentify/register-component
Jason Land
authored
started css styling on the add-goal component
wishinghand
committed
implemented sticky header and added spacing so they don't cover up content
wishinghand
committed

Commits on Oct 7, 2016

finished goal styling
wishinghand
committed
Merge pull request #18 from Incentify/newgoal
Jason Land
authored
button highlight class switch
wishinghand
committed

Commits on Oct 10, 2016

fixed minor things on the application

Reggie Sibley
authored and
Reggie Sibley
committed
Merge pull request #19 from Incentify/minorFixes
Jason Land
authored

Commits on Oct 11, 2016

adding vue-resource
wishinghand
committed

Commits on Oct 12, 2016

added right name for email icon
wishinghand
committed
added vue-resource
wishinghand
committed
register working, needs callbacks
wishinghand
committed
basic changes for reggie
wishinghand
committed
added bulma notifications to login

Reggie Sibley
authored and
Reggie Sibley
committed
register component working
wishinghand
committed

Commits on Oct 13, 2016

added username field
wishinghand
committed
Merge pull request #20 from Incentify/goalUsername
Jason Land
authored
adding proper icon support after build
wishinghand
committed
weird commit issues
wishinghand
committed

Commits on Oct 18, 2016

non working commit, commiting so reggie can get code
wishinghand
committed
just logging some stuff
wishinghand
committed
squared off edges on header bard
wishinghand
committed
Merge branch 'dev' of https://github.com/Incentify/client into profilePUT
wishinghand
committed
got data for goal component and data bound, still fixing bugs

Reggie Sibley
authored and
Reggie Sibley
committed
get user data now works
wishinghand
committed
GET method now triggers at the right time
wishinghand
committed
shorter redirect wait
wishinghand
committed
Merge pull request #21 from Incentify/profilePUT
Jason Land
authored
fixed issue with opening and cloasing the integrations.

Reggie Sibley
authored and
Reggie Sibley
committed
Merge branch 'dev' of https://github.com/Incentify/client into goalGET

Reggie Sibley
authored and
Reggie Sibley
committed
fixed card spacing issue
wishinghand
committed

Commits on Oct 19, 2016

Merge pull request #22 from Incentify/goalGET
ReggieSibley
authored
reduced tap/touch lag on phone deployment
wishinghand
committed
fixing weird merge conflict issue
wishinghand
committed
Merge pull request #23 from Incentify/touchLag
Jason Land
authored
changing some placeholders
wishinghand
committed
removed the navagation from the registration page

Reggie Sibley
authored and
Reggie Sibley
committed
Merge pull request #24 from Incentify/register-styling
Jason Land
authored
got rid of social login vestigials
wishinghand
committed
fixed merge conflict
wishinghand
committed
stripped down register page and fixed merge conflict
wishinghand
committed
deleted register route and hid nav/header component

Reggie Sibley
authored and
Reggie Sibley
committed
styled the registration page component

Reggie Sibley
authored and
Reggie Sibley
committed
Merge pull request #25 from Incentify/register-component
Jason Land
authored

Commits on Oct 20, 2016

registration background animation, merge fixes, made the mistake of trying to get animation done on another branch which had its own merge conflicts
wishinghand
committed
Merge pull request #26 from Incentify/goalPost
Jason Land
authored
commit for reggie
wishinghand
committed

Commits on Oct 21, 2016

completed the registration page completely, may need minor tweaks

Reggie Sibley
authored and
Reggie Sibley
committed
fixed merge conflicts

Reggie Sibley
authored and
Reggie Sibley
committed
added login functionality

Reggie Sibley
authored and
Reggie Sibley
committed
changed webpack information in order to run a build

Reggie Sibley
authored and
Reggie Sibley
committed

Commits on Oct 22, 2016

created a splash screen with proper delay

Reggie Sibley
authored and
Reggie Sibley
committed
adjusted the background image and v-showed the forms for register and login

Reggie Sibley
authored and
Reggie Sibley
committed

Commits on Oct 24, 2016

moutain background is moving again. fixed.

Reggie Sibley
authored and
Reggie Sibley
committed
finished test implementation for stripe integration

Reggie Sibley
authored and
Reggie Sibley
committed
almost working goal input
wishinghand
committed
merge conflict fix
wishinghand
committed
Merge pull request #27 from Incentify/goalPost
Jason Land
authored
updating for merge testing

Reggie Sibley
authored and
Reggie Sibley
committed
Merge pull request #28 from Incentify/stripeIntegration
Jason Land
authored

Commits on Oct 25, 2016

non working commit to show props issue
wishinghand
committed
switched object name to send register details instead of login
wishinghand
committed
formatting- indentations
wishinghand
committed
added passing of props
wishinghand
committed
receving props
wishinghand
committed
adding environment variables
wishinghand
committed
adding DEBUG keys to environment files
wishinghand
committed
added enviroment variables

Reggie Sibley
authored and
Reggie Sibley
committed
commitment on add-goal screen now works

Reggie Sibley
authored and
Reggie Sibley
committed
Merge pull request #29 from Incentify/goalPost
Jason Land
authored
removed redundancy in web copy
wishinghand
committed

Commits on Oct 26, 2016

some progress on integrating Stripe
wishinghand
committed
pushing changes made in order to put commit data, still buggy

Reggie Sibley
authored and
Reggie Sibley
committed
more stripe attempts
wishinghand
committed
Merge pull request #30 from Incentify/stripeIntegration
Jason Land
authored
getting rid of keep alive
wishinghand
committed
added styling to the app, and sweetalert

Reggie Sibley
authored and
Reggie Sibley
committed
fixed merge conflicts

Reggie Sibley
authored and
Reggie Sibley
committed
Merge pull request #31 from Incentify/appStyling
ReggieSibley
authored

Commits on Oct 27, 2016

unknown what is different
wishinghand
committed
Merge branch 'dev' of https://github.com/Incentify/client into dev
wishinghand
committed
working commit saving

Reggie Sibley
authored and
Reggie Sibley
committed
merge conflict fix
wishinghand
committed
fixed the date to display 1 week from today

Reggie Sibley
authored and
Reggie Sibley
committed

Commits on Nov 3, 2016

temp commit to pull
wishinghand
committed
updated README, added comments
wishinghand
committed