Submission Time #81

Open

olds1423 wants to merge 135 commits intoourSaviorWillfrom

Commits on Jul 7, 2016

Commits on Jul 8, 2016

last push before we seperate
olds1423
committed
Created landing page structure with some dummy data.

Sugarblade
authored and
Sugarblade
committed
started event handlers, and constructors
olds1423
committed
Merge pull request #11 from olds1423/landing-page
olds1423
authored
Merge pull request #12 from olds1423/formApp
renburnett
authored
Added form.html and finished it's skeleton

Sugarblade
authored and
Sugarblade
committed

Commits on Jul 9, 2016

Merge pull request #17 from olds1423/form-skeleton
Will Skelton
authored
Added stats page and tweaked a few things in the other two html files.

Sugarblade
authored and
Sugarblade
committed
Added assets folder with some possible background pictures.

Sugarblade
authored and
Sugarblade
committed
Merge pull request #18 from olds1423/stats-skeleton
Will Skelton
authored
added all css selectors

Sugarblade
authored and
Sugarblade
committed
added bg color and tweaked some html files

Sugarblade
authored and
Sugarblade
committed
Merge pull request #19 from olds1423/basic-style
Will Skelton
authored
got some object functionality
renburnett
committed
Merge pull request #20 from olds1423/masterObject
Will Skelton
authored
Added Ren's form and new submit buttons

Sugarblade
authored and
Sugarblade
committed
Merge pull request #21 from olds1423/basic-style
Will Skelton
authored
small changes
renburnett
committed
Merge branch 'master' into masterObject
renburnett
committed
Changed style

Sugarblade
authored and
Sugarblade
committed
Merge pull request #22 from olds1423/basic-style
Will Skelton
authored
reference to .js files, broke off eventhandler, changed form id in event listener
renburnett
committed
Merge branch 'master' into masterObject
renburnett
committed
Merge pull request #23 from olds1423/masterObject
renburnett
authored
Changes to form style

Sugarblade
authored and
Sugarblade
committed
Merge pull request #24 from olds1423/basic-style
Will Skelton
authored
Changed stiling to accomodate current roomates

Sugarblade
authored and
Sugarblade
committed
Merge pull request #25 from olds1423/basic-style
olds1423
authored
need to pull master so I have an area for my results to land
olds1423
committed
Merge branch 'master' of https://github.com/olds1423/finalProject into saturdayLab
olds1423
committed
Positioned lists next to to form

Sugarblade
authored and
Sugarblade
committed
Merge pull request #26 from olds1423/advanced-style
olds1423
authored
Merge branch 'master' of https://github.com/olds1423/finalProject into saturdayLab
olds1423
committed
More style changes

Sugarblade
authored and
Sugarblade
committed
fleshed out the event handler for pushing over a new roommate from the input field
olds1423
committed
Merge pull request #27 from olds1423/advanced-style
olds1423
authored
did everything Jon said
olds1423
committed
fixed merge conflict
olds1423
committed
Styling updates

Sugarblade
authored and
Sugarblade
committed
Merge pull request #30 from olds1423/advanced-style
olds1423
authored
got the newRoommateEvent button finished for the MVP
olds1423
committed
Changed form text color to white

Sugarblade
authored and
Sugarblade
committed
Merge pull request #31 from olds1423/saturdayLAb
Will Skelton
authored
Merge pull request #32 from olds1423/advanced-style
olds1423
authored
need to pull wills work so I can grab the IDs for the infomration gathered from the bill
olds1423
committed
added ids and select

Sugarblade
authored and
Sugarblade
committed
Merge pull request #33 from olds1423/advanced-style
olds1423
authored
Merge branch 'master' of https://github.com/olds1423/finalProject into saturdayLab
olds1423
committed
got the event listener working, just need to pass bills through the constructor now
olds1423
committed
finished the event listener for new bill
olds1423
committed
Style update

Sugarblade
authored and
Sugarblade
committed
Merge pull request #34 from olds1423/saturdayLab
renburnett
authored
added charts
renburnett
committed
Merge pull request #35 from olds1423/advanced-style
renburnett
authored
Merge pull request #36 from olds1423/graphs
olds1423
authored
final fixes on background

Sugarblade
authored and
Sugarblade
committed
Merge pull request #38 from olds1423/advanced-style
Will Skelton
authored
got rid of extraneous rent variables
renburnett
committed
added randColor and modified Form

Sugarblade
authored and
Sugarblade
committed
Merge pull request #39 from olds1423/graphs
renburnett
authored
Merge pull request #40 from olds1423/advanced-style
renburnett
authored
Merge pull request #41 from olds1423/master
renburnett
authored
added link to github repo

Sugarblade
authored and
Sugarblade
committed
Merge pull request #42 from olds1423/advanced-style
renburnett
authored

Commits on Jul 10, 2016

Fixed Color scheme

Sugarblade
authored and
Sugarblade
committed
Merge pull request #43 from olds1423/advanced-style
Will Skelton
authored
Moved sme buttons around

Sugarblade
authored and
Sugarblade
committed
Merge pull request #45 from olds1423/advanced-style
Will Skelton
authored

Commits on Jul 12, 2016

added style-sheet.html

Sugarblade
authored and
Sugarblade
committed
to start monday lab
olds1423
committed
Merge pull request #47 from olds1423/saturdayLab
olds1423
authored
Merge pull request #46 from olds1423/style-sheet
olds1423
authored
fixed old button
olds1423
committed
cleaned some items up that were messed up from previous merges
olds1423
committed
Added Month Constructor

Sugarblade
authored and
Sugarblade
committed
Merge pull request #51 from olds1423/graph-time
renburnett
authored
fucked up man
olds1423
committed
Merge branch 'master' of https://github.com/olds1423/finalProject
olds1423
committed
Worked on displaying graphs

Sugarblade
authored and
Sugarblade
committed
Merge pull request #52 from olds1423/graph-time
Will Skelton
authored

Commits on Jul 13, 2016

added selector for graph

Sugarblade
authored and
Sugarblade
committed
Merge pull request #56 from olds1423/graph-time
Will Skelton
authored
added all the months

Sugarblade
authored and
Sugarblade
committed
Merge pull request #57 from olds1423/create-months
olds1423
authored
minor fixes

Sugarblade
authored and
Sugarblade
committed
Merge pull request #58 from olds1423/create-months
Will Skelton
authored
month fixes

Sugarblade
authored and
Sugarblade
committed
Merge pull request #59 from olds1423/create-months
Will Skelton
authored
working on getting the bills to go into months correctly
olds1423
committed
fixed bills going into correct months
olds1423
committed

Commits on Jul 15, 2016

Merge pull request #64 from olds1423/graphTimeB
Will Skelton
authored
Added refresh Graphs button

Sugarblade
authored and
Sugarblade
committed
Merge pull request #65 from olds1423/remove-button
Will Skelton
authored
fixed landing page

Sugarblade
authored and
Sugarblade
committed
Merge pull request #66 from olds1423/landing-page
Will Skelton
authored
Sucessfully added roomates to selector

Sugarblade
authored and
Sugarblade
committed
Implemented remove roomate function

Sugarblade
authored and
Sugarblade
committed
Merge pull request #67 from olds1423/remove-button
Will Skelton
authored
switched position of graphs

Sugarblade
authored and
Sugarblade
committed
Merge pull request #68 from olds1423/remove-button
Will Skelton
authored
added remove functionality for bill list

Sugarblade
authored and
Sugarblade
committed
Merge pull request #69 from olds1423/remove-button
Will Skelton
authored

Commits on Jul 16, 2016

Commits on Jul 18, 2016

bug fixes

Sugarblade
authored and
Sugarblade
committed
fixing problems with form.html

Sugarblade
authored and
Sugarblade
committed

Commits on Jul 19, 2016

bug fixes

Sugarblade
authored and
Sugarblade
committed

Commits on Jul 20, 2016

Added njew js files and almost finished restructure.

Sugarblade
authored and
Sugarblade
committed

Commits on Jul 21, 2016

Fixed Graphs. Moving to fix minor style issues

Sugarblade
authored and
Sugarblade
committed
checking to see if there is a bill option already add and if not pushes another option there so we can display a bill across multiple months on the all statistics page
olds1423
committed
All graphs are done.

Sugarblade
authored and
Sugarblade
committed
Merge pull request #79 from olds1423/checkingItOut
olds1423
authored