aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* web ui updatesKumar Damani2019-04-19
* updated readmes, removed db url linkKumar Damani2019-04-18
* copy editKumar Damani2019-04-09
* added very minimal stylingKumar Damani2019-04-09
* added proper content, no stylingKumar Damani2019-04-09
* Update README.mdKumar Damani2019-03-29
* Merge branch 'master' of https://github.com/csc301-winter-2019/project-team-02Samarth Agarwal2019-03-29
|\
| * d3 docs finalKumar Damani2019-03-29
| * Update README.mdFahim2019-03-29
| * Update README.mdFahim2019-03-29
* | Changed pic url for pending clicks.Samarth Agarwal2019-03-29
* | Added undef line.Samarth Agarwal2019-03-29
|\ \ | |/ |/|
| * Added undef lineSamarth Agarwal2019-03-29
* | Finished mergeSamarth Agarwal2019-03-29
* | Merging.Samarth Agarwal2019-03-29
|\|
| * Merging.feat/33Samarth Agarwal2019-03-29
| * Removed default status value again.Samarth Agarwal2019-03-29
| * Removed default status value.Samarth Agarwal2019-03-29
| * Changed null to undefined.Samarth Agarwal2019-03-29
| * Implemented feature so that whenever a point is clicked a red dot shows up at...Samarth Agarwal2019-03-29
* | Merge pull request #67 from csc301-winter-2019/feat/28-patchIvan Shen2019-03-29
|\ \
| * | add patch for feat28feat/28-patchivanshen2019-03-28
* | | Merge pull request #64 from csc301-winter-2019/feat/34Kumar Damani2019-03-29
|\ \ \
| * | | bug with liveupdates adding duplicate pointsfeat/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 #66 from csc301-winter-2019/feat/35AndrewMihai2019-03-29
|\ \ \ \ \
| * | | | | Moved button icons beside button textfeat/35Andrew2019-03-28
| |/ / / /
* | | | | Merge pull request #65 from csc301-winter-2019/feat/20AndrewMihai2019-03-29
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | 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 #62 from csc301-winter-2019/feat/36feat/31Kumar Damani2019-03-29
|\ \ \ \ | |_|/ / |/| | |
| * | | remove unused codefeat/36Kumar Damani2019-03-29
| * | | added short descriptionKumar Damani2019-03-29
|/ / /
* | | fixed packacge.json conflit, during merge of fix/25 with masterKumar Damani2019-03-28
|\ \ \ | |_|/ |/| |
| * | bring in the data folder inside the web folder as its a hard dependency for t...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
| |/
* | Merge pull request #51 from csc301-winter-2019/feat/30Samarth-Agarwal12019-03-27
|\ \ | |/ |/|