aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* 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
| * | Merge pull request #43 from csc301-winter-2019/masterKumar Damani2019-03-25
| |\|
| * | Merge pull request #41 from csc301-winter-2019/feat/32Kumar Damani2019-03-20
| |\ \
| * \ \ Merge pull request #39 from csc301-winter-2019/feat/32Kumar Damani2019-03-19
| |\ \ \
| * \ \ \ Merge pull request #40 from csc301-winter-2019/masterKumar Damani2019-03-15
| |\ \ \ \
| * \ \ \ \ Merge pull request #38 from csc301-winter-2019/masterKumar Damani2019-03-14
| |\ \ \ \ \
| * \ \ \ \ \ Merge pull request #37 from csc301-winter-2019/setup-prodKumar Damani2019-03-14
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #35 from csc301-winter-2019/masterKumar Damani2019-03-10
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #33 from csc301-winter-2019/fix-location-bug-d2Kumar Damani2019-03-10
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #32 from csc301-winter-2019/masterKumar Damani2019-03-10
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | Merge pull request #42 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
| | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | fixed web typeKumar Damani2019-03-15
| | * | | | | | | added back the back buttonKumar Damani2019-03-15
| | * | | | | | | code cleanupKumar Damani2019-03-15
| | * | | | | | | added FE web updates for displaying new form report. minor ui enchancementsKumar Damani2019-03-15
| | * | | | | | | updated mobile form, updated web schemas, and /mobilerequest handler. No fron...Kumar Damani2019-03-15
| | | |_|_|_|/ / | | |/| | | | |
* | / | | | | | Saving changes before merge.Samarth Agarwal2019-03-21
|/ / / / / / /
* | | | | | / added d3 planKumar Damani2019-03-15
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #36 from csc301-winter-2019/setup-prodKumar Damani2019-03-14
|\| | | | | | |_|_|_|/ |/| | | |
| * | | | added evn urls for prod, and mobileKumar Damani2019-03-14
| * | | | updated proddb configKumar Damani2019-03-13
|/ / / /
* | | | typos fixed in iter2-review docKumar Damani2019-03-10
* | | | Merge branch 'master' of github.com:csc301-winter-2019/project-team-02Kumar Damani2019-03-10
|\ \ \ \
| * \ \ \ Merge pull request #34 from csc301-winter-2019/fix-location-bug-d2Kumar Damani2019-03-10
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | added proper app settingsfix-location-bug-d2Kumar Damani2019-03-10
| | * | fixed having to press current location button arbitrarily many times before p...Kumar Damani2019-03-10
| |/ /
* / / updated the readme for d2 after getting app working on appetizeKumar Damani2019-03-10
|/ /
* | updated reivew doc once moreKumar Damani2019-03-09
* | added readme for deliverableKumar Damani2019-03-09
* | iterer2 docs except readme doneKumar Damani2019-03-08
* | Merge pull request #31 from csc301-winter-2019/qaKumar Damani2019-03-08
|\|
| * Merge pull request #30 from csc301-winter-2019/qa-temp-merging-feat22Samarth-Agarwal12019-03-08
| |\
| | * Merged feat/22.Samarth Agarwal2019-03-08
| | |\
| | | * Changed code so that the popup doesn't show up when the marker is clicked.feat/22Samarth Agarwal2019-03-08
| | | * Modified Details sidebar so that the close button always stays at the bottom ...Samarth Agarwal2019-03-08
| | | * Added comments and made DOM easier to work with.Samarth Agarwal2019-03-07
| | | * Added functionality so that whenever a point is clicked it opens up a Details...Samarth Agarwal2019-03-07
| * | | Merge pull request #29 from csc301-winter-2019/feat/5AndrewMihai2019-03-08
| |\ \ \ | | |/ / | |/| |