| Commit message (Collapse) | Author | Age | |
|---|---|---|---|
| * | Merge pull request #57 from csc301-winter-2019/feat/20 | AndrewMihai | 2019-03-28 |
| |\ | | | | | Feat/20 | ||
| | * | Added a back button to the map pagefeat/20 | Andrew | 2019-03-28 |
| | | | |||
| | * | Drop pin feature completed | Andrew | 2019-03-28 |
| | | | |||
| | * | 6ix map commit 2.0 | Andrew | 2019-03-26 |
| | | | |||
| | * | Map of 6ix appears when you press drop pin | Andrew | 2019-03-26 |
| | | | |||
| * | | Merge pull request #56 from csc301-winter-2019/feat/34 | Kumar Damani | 2019-03-28 |
| |\ \ | | | | | | | Feat/34 | ||
| | * \ | Merge branch 'feat/34' of github.com:csc301-winter-2019/project-team-02 into ↵ | Kumar Damani | 2019-03-28 |
| | |\ \ | | | | | | | | | | | | | feat/34 | ||
| | | * | | fixed spacing | Kumar Damani | 2019-03-28 |
| | | | | | |||
| | | * | | saving status of point in db. loading only new or pending points in home page | Kumar Damani | 2019-03-28 |
| | | | | | |||
| | | * | | Merge branch 'feat/34' of github.com:csc301-winter-2019/project-team-02 into ↵ | Kumar Damani | 2019-03-27 |
| | | |\ \ | | | | | | | | | | | | | | | | feat/34 | ||
| | | | * | | Modified schema to include 'status' in mockpoints.js and points.js. | Samarth Agarwal | 2019-03-27 |
| | | | |/ | |||
| | | * | | Modified schema to include 'status' in mockpoints.js and points.js. | Samarth Agarwal | 2019-03-27 |
| | | | | | |||
| | * | | | fixed spacing | Kumar Damani | 2019-03-28 |
| | | | | | |||
| | * | | | saving status of point in db. loading only new or pending points in home page | Kumar Damani | 2019-03-28 |
| | | | | | |||
| | * | | | Modified schema to include 'status' in mockpoints.js and points.js. | Samarth Agarwal | 2019-03-28 |
| | | | | | |||
| * | | | | Merge pull request #55 from csc301-winter-2019/master | Kumar Damani | 2019-03-28 |
| |\| | | | | | | | | | | | fixed packacge.json conflit, during merge of fix/25 with master | ||
| | * | | | fixed packacge.json conflit, during merge of fix/25 with master | Kumar Damani | 2019-03-28 |
| | |\ \ \ | | |/ / | |/| | | |||
| * | | | | Merge pull request #52 from csc301-winter-2019/master | Kumar Damani | 2019-03-27 |
| |\| | | | | | | | | | | | Merge pull request #51 from csc301-winter-2019/feat/30 | ||
| | * | | | Merge pull request #51 from csc301-winter-2019/feat/30 | Samarth-Agarwal1 | 2019-03-27 |
| | |\ \ \ | | |_|/ | |/| | | Feat/30 | ||
| * | | | | Merge pull request #50 from csc301-winter-2019/revert-49-revert-45-feat/30 | Samarth-Agarwal1 | 2019-03-27 |
| |\ \ \ \ | | | | | | | | | | | Revert "Revert "Feat/30"" | ||
| | * | | | | Revert "Revert "Feat/30""revert-49-revert-45-feat/30 | Samarth-Agarwal1 | 2019-03-27 |
| |/ / / / | |||
| * | | | | Merge pull request #49 from csc301-winter-2019/revert-45-feat/30 | Samarth-Agarwal1 | 2019-03-27 |
| |\ \ \ \ | | | | | | | | | | | Revert "Feat/30" | ||
| | * | | | | Revert "Feat/30"revert-45-feat/30 | Samarth-Agarwal1 | 2019-03-27 |
| |/ / / / | |||
| * | | | | Merge pull request #46 from csc301-winter-2019/fix/25 | Kumar Damani | 2019-03-26 |
| |\ \ \ \ | | |_|/ | |/| | | bring in the data folder inside the web folder as its a hard dependen… | ||
| | * | | | bring in the data folder inside the web folder as its a hard dependency for ↵fix/25 | Kumar Damani | 2019-03-26 |
| | | | | | | | | | | | | | | | | | the index.js, so heroku needs it | ||
| * | | | | Merge pull request #45 from csc301-winter-2019/feat/30 | Samarth-Agarwal1 | 2019-03-26 |
| |\ \ \ \ | | | | | | | | | | | Feat/30 | ||
| | * \ \ \ | Merge branch 'qa' into feat/30 | Samarth-Agarwal1 | 2019-03-26 |
| | |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||
| * | | | | Merge pull request #44 from csc301-winter-2019/fix/25 | Kumar Damani | 2019-03-26 |
| |\ \ \ \ | | |/ / | |/| | | added data validation before inserting into db | ||
| | * | | | for both validations | Kumar Damani | 2019-03-26 |
| | | | | | |||
| | * | | | changing error code to 422 for one of the validation conditions | Kumar Damani | 2019-03-26 |
| | | | | | |||
| | * | | | fixed typo | Kumar Damani | 2019-03-25 |
| | | | | | |||
| | * | | | added data validation before inserting into db | Kumar Damani | 2019-03-25 |
| | | |/ | |/| | |||
| * | | | Merge pull request #43 from csc301-winter-2019/master | Kumar Damani | 2019-03-25 |
| |\| | | | | | | | | Merge pull request #42 from csc301-winter-2019/feat/32 | ||
| * | | | Merge pull request #41 from csc301-winter-2019/feat/32 | Kumar Damani | 2019-03-20 |
| |\ \ \ | | | | | | | | | fixing ui bugs. 1. side bar max height reduced to 500px. 2. fix for words too long | ||
| * \ \ \ | Merge pull request #39 from csc301-winter-2019/feat/32 | Kumar Damani | 2019-03-19 |
| |\ \ \ \ | | | | | | | | | | | Feat/32 | ||
| * \ \ \ \ | Merge pull request #40 from csc301-winter-2019/master | Kumar Damani | 2019-03-15 |
| |\ \ \ \ \ | | | | | | | | | | | | | added d3 plan | ||
| * \ \ \ \ \ | Merge pull request #38 from csc301-winter-2019/master | Kumar Damani | 2019-03-14 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Merge pull request #36 from csc301-winter-2019/setup-prod | ||
| * \ \ \ \ \ \ | Merge pull request #37 from csc301-winter-2019/setup-prod | Kumar Damani | 2019-03-14 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Setup prod | ||
| * \ \ \ \ \ \ \ | Merge pull request #35 from csc301-winter-2019/master | Kumar Damani | 2019-03-10 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | sync qa with master | ||
| * \ \ \ \ \ \ \ \ | Merge pull request #33 from csc301-winter-2019/fix-location-bug-d2 | Kumar Damani | 2019-03-10 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | fixed having to press current location button arbitrarily many times … | ||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #32 from csc301-winter-2019/master | Kumar Damani | 2019-03-10 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | syncing master and qa | ||
| | | | | | | | | | | * | Modified some CSS properties of buttons in point details sidebar.feat/30 | Samarth Agarwal | 2019-03-26 |
| | | | | | | | | | | | | |||
| | | | | | | | | | | * | Added semicolons to be consistent. | Samarth Agarwal | 2019-03-26 |
| | | | | | | | | | | | | |||
| | | | | | | | | | | * | Commented out correct line in app.js to connect to database. | Samarth Agarwal | 2019-03-26 |
| | | | | | | | | | | | | |||
| | | | | | | | | | | * | Update map.js | Samarth-Agarwal1 | 2019-03-26 |
| | | | | | | | | | | | | |||
| | | | | | | | | | | * | Finished front-end side of this feature. | Samarth Agarwal | 2019-03-22 |
| | | | | | | | | | | | | |||
| | | | | | | | | | | * | Finished merge. | Samarth Agarwal | 2019-03-21 |
| | | | | | | | | | | |\ | | | | | | | | | | |/ | | | | | | | | | |/| | |||
| | | | | | | | | | * | | Merge pull request #42 from csc301-winter-2019/feat/32 | Kumar Damani | 2019-03-20 |
| | | | | | | | |_|/| | | | | | | | |/| |/ / | | | | | | | | | | | Feat/32 | ||
| | | | | | | | | * / | fixing ui bugs. 1. side bar max height reduced to 500px. 2. fix for words ↵feat/32 | Kumar Damani | 2019-03-20 |
| | | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | too long | ||
| | | | | | | | * | | fixed web type | Kumar Damani | 2019-03-15 |
| | | | | | | | | | | |||
