aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge pull request #58 from csc301-winter-2019/feat/2828Ivan Shen2019-03-28
|\
| * Merge branch 'qa' into feat/28Ivan Shen2019-03-28
| |\ | |/ |/|
* | Merge pull request #57 from csc301-winter-2019/feat/20AndrewMihai2019-03-28
|\ \
| * | Added a back button to the map pagefeat/20Andrew2019-03-28
| * | Drop pin feature completedAndrew2019-03-28
| * | 6ix map commit 2.0Andrew2019-03-26
| * | Map of 6ix appears when you press drop pinAndrew2019-03-26
* | | Merge pull request #56 from csc301-winter-2019/feat/34Kumar Damani2019-03-28
|\ \ \
| * \ \ Merge branch 'feat/34' of github.com:csc301-winter-2019/project-team-02 into ...Kumar Damani2019-03-28
| |\ \ \
| | * | | fixed spacingKumar Damani2019-03-28
| | * | | saving status of point in db. loading only new or pending points in home pageKumar Damani2019-03-28
| | * | | Merge branch 'feat/34' of github.com:csc301-winter-2019/project-team-02 into ...Kumar Damani2019-03-27
| | |\ \ \
| | | * | | Modified schema to include 'status' in mockpoints.js and points.js.Samarth Agarwal2019-03-27
| | | |/ /
| | * | | Modified schema to include 'status' in mockpoints.js and points.js.Samarth Agarwal2019-03-27
| * | | | fixed spacingKumar Damani2019-03-28
| * | | | saving status of point in db. loading only new or pending points in home pageKumar Damani2019-03-28
| * | | | Modified schema to include 'status' in mockpoints.js and points.js.Samarth Agarwal2019-03-28
* | | | | Merge pull request #55 from csc301-winter-2019/masterKumar Damani2019-03-28
|\| | | |
| * | | | fixed packacge.json conflit, during merge of fix/25 with masterKumar Damani2019-03-28
| |\ \ \ \ | | |/ / / | |/| | |
* | | | | Merge pull request #52 from csc301-winter-2019/masterKumar Damani2019-03-27
|\| | | |
| * | | | Merge pull request #51 from csc301-winter-2019/feat/30Samarth-Agarwal12019-03-27
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | Merge pull request #50 from csc301-winter-2019/revert-49-revert-45-feat/30Samarth-Agarwal12019-03-27
|\ \ \ \ \
| * | | | | Revert "Revert "Feat/30""revert-49-revert-45-feat/30Samarth-Agarwal12019-03-27
|/ / / / /
* | | | | Merge pull request #49 from csc301-winter-2019/revert-45-feat/30Samarth-Agarwal12019-03-27
|\ \ \ \ \
| * | | | | Revert "Feat/30"revert-45-feat/30Samarth-Agarwal12019-03-27
|/ / / / /
* | | | | Merge pull request #46 from csc301-winter-2019/fix/25Kumar Damani2019-03-26
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | bring in the data folder inside the web folder as its a hard dependency for t...fix/25Kumar Damani2019-03-26
* | | | | Merge pull request #45 from csc301-winter-2019/feat/30Samarth-Agarwal12019-03-26
|\ \ \ \ \
| * \ \ \ \ Merge branch 'qa' into feat/30Samarth-Agarwal12019-03-26
| |\ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
* | | | | Merge pull request #44 from csc301-winter-2019/fix/25Kumar Damani2019-03-26
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | for both validationsKumar Damani2019-03-26
| * | | | changing error code to 422 for one of the validation conditionsKumar Damani2019-03-26
| * | | | fixed typoKumar Damani2019-03-25
| * | | | added data validation before inserting into dbKumar Damani2019-03-25
| | |/ / | |/| |
| | * | Modified some CSS properties of buttons in point details sidebar.feat/30Samarth Agarwal2019-03-26
| | * | Added semicolons to be consistent.Samarth Agarwal2019-03-26
| | * | Commented out correct line in app.js to connect to database.Samarth Agarwal2019-03-26
| | * | Update map.jsSamarth-Agarwal12019-03-26
| | * | Finished front-end side of this feature.Samarth Agarwal2019-03-22
| | * | Finished merge.Samarth Agarwal2019-03-21
| | |\ \ | | |/ / | |/| |
| | * | Saving changes before merge.Samarth Agarwal2019-03-21
| | | * feat 28: get location when user selects use current locationivanshen2019-03-28
| |_|/ |/| |
* | | Merge pull request #43 from csc301-winter-2019/masterKumar Damani2019-03-25
|\| |
| * | Merge pull request #42 from csc301-winter-2019/feat/32Kumar Damani2019-03-20
| |\ \ | | |/ | |/|
* | | Merge pull request #41 from csc301-winter-2019/feat/32Kumar Damani2019-03-20
|\ \ \ | | |/ | |/|
| * | fixing ui bugs. 1. side bar max height reduced to 500px. 2. fix for words too...feat/32Kumar Damani2019-03-20
* | | Merge pull request #39 from csc301-winter-2019/feat/32Kumar Damani2019-03-19
|\| |
| * | fixed web typeKumar Damani2019-03-15
| * | added back the back buttonKumar Damani2019-03-15
| * | code cleanupKumar Damani2019-03-15