Commits

Commit history

1. Commits on Apr 27, 2021

   • Merge pull request #18 from amgjurich/feature

     Show description for 6da1976
     allanmaclean

     authored
     6da1976View commit details

     Copy full SHA for 6da1976

     Browse repository at this point

   • final commit for now with all updated comments. we rocked it

     amgjurich

     committed
     abbef49View commit details

     Copy full SHA for abbef49

     Browse repository at this point
2. Commits on Apr 26, 2021

   • Merge pull request #17 from allanmaclean/styling

     Show description for ce5e1ea
     ozi-oztrk

     authored
     ce5e1eaView commit details

     Copy full SHA for ce5e1ea

     Browse repository at this point

   • styling up to presentation time

     

     allanmaclean

     committed
     13cf257View commit details

     Copy full SHA for 13cf257

     Browse repository at this point

   • fixed merge conflicts

     

     allanmaclean

     committed
     ee2dc79View commit details

     Copy full SHA for ee2dc79

     Browse repository at this point

   • started styling

     

     allanmaclean

     committed
     fbd69baView commit details

     Copy full SHA for fbd69ba

     Browse repository at this point

   • just pulled in amy changes and everything merged well. it updated the profile page by grabbing info

     amgjurich

     committed
     9492f4dView commit details

     Copy full SHA for 9492f4d

     Browse repository at this point

   • Merge pull request #16 from designal46/profileLogic

     Show description for 06b2593
     amgjurich

     authored
     06b2593View commit details

     Copy full SHA for 06b2593

     Browse repository at this point

   • Merge branch 'main' into feature

     amgjurich

     committed
     3a928baView commit details

     Copy full SHA for 3a928ba

     Browse repository at this point

   • committing so i can pull down amy code

     amgjurich

     committed
     e593d01View commit details

     Copy full SHA for e593d01

     Browse repository at this point

   • resolving merge conflict

     designal46

     committed
     22fba73View commit details

     Copy full SHA for 22fba73

     Browse repository at this point

   • completed profile page logicand query calls

     designal46

     committed
     eadadefView commit details

     Copy full SHA for eadadef

     Browse repository at this point

   • Merge pull request #15 from amgjurich/feature

     Show description for c0bb00a
     allanmaclean

     authored
     c0bb00aView commit details

     Copy full SHA for c0bb00a

     Browse repository at this point

   • all elements working on latest merge. updated one line of alan logic for the airport autocomplete. added in code so that users will not be entered multiple times in the users database.

     amgjurich

     committed
     156eff0View commit details

     Copy full SHA for 156eff0

     Browse repository at this point

   • Merge branch 'main' into feature

     amgjurich

     committed
     4cbaf14View commit details

     Copy full SHA for 4cbaf14

     Browse repository at this point

   • just updated profile login so that multiple of the same user are not added to users db

     amgjurich

     committed
     4fe24ebView commit details

     Copy full SHA for 4fe24eb

     Browse repository at this point

   • Merge pull request #14 from allanmaclean/autocomplete

     Show description for 64b9571
     allanmaclean

     authored
     64b9571View commit details

     Copy full SHA for 64b9571

     Browse repository at this point

   • fixed autocomplete merge issues'

     

     allanmaclean

     committed
     beb1b4aView commit details

     Copy full SHA for beb1b4a

     Browse repository at this point

   • removed mammoth console log of airport data

     

     allanmaclean

     committed
     f16747dView commit details

     Copy full SHA for f16747d

     Browse repository at this point

   • tweaked autocomplete with full airport name and country. Had to tweak onSubmit in MainContainer.jsx as a result

     

     allanmaclean

     committed
     1891e0dView commit details

     Copy full SHA for 1891e0d

     Browse repository at this point

   • Merge pull request #13 from amgjurich/feature

     Show description for d6ac778
     designal46

     authored
     d6ac778View commit details

     Copy full SHA for d6ac778

     Browse repository at this point

   • completed loop to update the flight info in the database and merged latest main successfully

     amgjurich

     committed
     d6f651bView commit details

     Copy full SHA for d6f651b

     Browse repository at this point

   • just updated code so that flights are being sent to the database

     amgjurich

     committed
     340b9adView commit details

     Copy full SHA for 340b9ad

     Browse repository at this point

   • Merge pull request #12 from allanmaclean/autocomplete

     Show description for 95b66a2
     ozi-oztrk

     authored
     95b66a2View commit details

     Copy full SHA for 95b66a2

     Browse repository at this point

   • resolved merge conflicts

     

     allanmaclean

     committed
     5dd13a5View commit details

     Copy full SHA for 5dd13a5

     Browse repository at this point

   • autocomplete complete

     

     allanmaclean

     committed
     1ba4004View commit details

     Copy full SHA for 1ba4004

     Browse repository at this point

   • Merge pull request #11 from amgjurich/feature

     Show description for 6fbb12f
     designal46

     authored
     6fbb12fView commit details

     Copy full SHA for 6fbb12f

     Browse repository at this point

   • just updated code to add user profile info to users table in database

     amgjurich

     committed
     1cdf266View commit details

     Copy full SHA for 1cdf266

     Browse repository at this point

   • fixed merged conflicts

     

     allanmaclean

     committed
     6c87a77View commit details

     Copy full SHA for 6c87a77

     Browse repository at this point

   • autocomplete wip

     

     allanmaclean

     committed
     8570428View commit details

     Copy full SHA for 8570428

     Browse repository at this point

   • Merge pull request #10 from amgjurich/feature

     Show description for 18234fb
     amgjurich

     authored
     18234fbView commit details

     Copy full SHA for 18234fb

     Browse repository at this point

   • committing to create a pull request so everyone has the lastest info for making a difference

     amgjurich

     committed
     184ad5eView commit details

     Copy full SHA for 184ad5e

     Browse repository at this point

   • added profile page components. working on backend db queries

     amgjurich

     committed
     d60324dView commit details

     Copy full SHA for d60324d

     Browse repository at this point
3. Commits on Apr 25, 2021

   • updated comments for the mathematical logic for the carbon offsets

     amgjurich

     committed
     1d92a3aView commit details

     Copy full SHA for 1d92a3a

     Browse repository at this point

   • added the code for the offset actions

     amgjurich

     committed
     db405f8View commit details

     Copy full SHA for db405f8

     Browse repository at this point