aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* add patch for feat28feat/28-patchivanshen2019-03-28
|
* Merge pull request #42 from csc301-winter-2019/feat/32Kumar Damani2019-03-20
|\ | | | | Feat/32
| * fixing ui bugs. 1. side bar max height reduced to 500px. 2. fix for words ↵feat/32Kumar Damani2019-03-20
| | | | | | | | too long
| * 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 ↵Kumar Damani2019-03-15
| | | | | | | | front end web changes yet
* | added d3 planKumar Damani2019-03-15
| |
* | Merge pull request #36 from csc301-winter-2019/setup-prodKumar Damani2019-03-14
|\| | | | | Setup prod
| * 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
| |\ | | | | | | Fix location bug d2
| | * added proper app settingsfix-location-bug-d2Kumar Damani2019-03-10
| | |
| | * fixed having to press current location button arbitrarily many times before ↵Kumar Damani2019-03-10
| |/ | | | | | | proceeding to next screen
* / 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
|\ | | | | Qa
| * Merge pull request #30 from csc301-winter-2019/qa-temp-merging-feat22Samarth-Agarwal12019-03-08
| |\ | | | | | | Qa temp merging feat22
| | * 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
| | | | | | | | | | | | | | | | of the box and doesn't overlap any text.
| | | * 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 ↵Samarth Agarwal2019-03-07
| | | | | | | | | | | | | | | | Details sidebar which shows information about that point.
| * | | Merge pull request #29 from csc301-winter-2019/feat/5AndrewMihai2019-03-08
| |\ \ \ | | |/ / | |/| | Feat/5
| | * | Got rid of drop pin button. Necessary for deliverable 2.feat/5Andrew2019-03-08
| | | |
| | * | added ui package, edited text on greeting page, using new ui package in form ↵Kumar Damani2019-03-06
| | | | | | | | | | | | | | | | page
| | * | Added A "Go Back" button to the form page. Fixed bug that would causeAndrew2019-03-05
| | | | | | | | | | | | | | | | | | | | app to produce an error if location services are turned off. Please enter the commit message for your changes. Lines starting
| | * | Merge pull request #23 from csc301-winter-2019/feat/15AndrewMihai2019-03-05
| | |\ \ | | | | | | | | | | Implemented JSON from app to server, build valid, contains all info, …
| | | * | Implemented JSON from app to server, build valid, contains all info, Form ↵feat/15Mohammed Fahim Ahmed2019-03-05
| | | | | | | | | | | | | | | | | | | | Page updated to meet specifications, submit button works
| | * | | Added location functionality to greeting page. Location data is now sentAndrew2019-03-05
| | | | | | | | | | | | | | | | | | | | to the form page after the 'get location' button is pressed.
| | * | | Merge pull request #21 from csc301-winter-2019/feat/15AndrewMihai2019-03-05
| | |\| | | | | | | | | | | | Feat/15
| | | * | class name changexuhaoy2019-02-23
| | | | |
| | | * | more info for potentially additional form page for if the user has the ↵xuhaoy2019-02-23
| | | | | | | | | | | | | | | | | | | | chance to speak with the homeless individual
| | | * | adding form for questions that does not require speaking with the homeless ↵xuhaoy2019-02-23
| | | | | | | | | | | | | | | | | | | | individual
| * | | | Merge pull request #28 from csc301-winter-2019/fix24-temp-qamergingKumar Damani2019-03-08
| |\ \ \ \ | | | | | | | | | | | | Fix24 temp qamerging
| | * \ \ \ resolve conflictsKumar Damani2019-03-08
| | |\ \ \ \
| | | * | | | added padding for distant points just in casefix/24Kumar Damani2019-03-08
| | | | | | |
| | * | | | | resolving conflictsKumar Damani2019-03-08
| |/| | | | | | | |/ / / /
| | * | | / rezooming map using leaflet bounds to show all markersKumar Damani2019-03-08
| | | |_|/ | | |/| |
| * | | | Merge pull request #24 from csc301-winter-2019/feat/8Ivan Shen2019-03-05
| |\ \ \ \ | | | | | | | | | | | | Add live updates functionality
| | * | | | remove unnecessary !!Ivan Shen2019-03-05
| | | | | |
| | * | | | Comment out prod dbIvan Shen2019-03-05
| | | | | |
| | * | | | modularize plot pointsivanshen2019-03-05
| | | | | |
| | * | | | Remove commented codeIvan Shen2019-03-05
| | | | | |
| | * | | | Point back to local dbIvan Shen2019-03-05
| | | | | |