aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| | | | |
| * | | | Added live update functionality (feat 8)ivanshen2019-03-05
| | | | |
| * | | | Merge branch 'qa' of github.com:csc301-winter-2019/project-team-02 into qaivanshen2019-03-05
| |\ \ \ \
* | \ \ \ \ Merge pull request #25 from csc301-winter-2019/masterKumar Damani2019-03-05
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | sync qa with master
| * | | | Merge pull request #22 from csc301-winter-2019/feat7-qa-mergingKumar Damani2019-03-05
| |\ \ \ \ | | |/ / / | |/| | | Feat7 qa merging
| | * | | Merge branch 'feat7-qa-merging' of ↵feat7-qa-mergingKumar Damani2019-03-05
| | |\ \ \ | | |/ / / | |/| | | | | | | | github.com:csc301-winter-2019/project-team-02 into feat7-qa-merging
| * | | | updated iteration-plan after two members dropped courseKumar Damani2019-03-01
| | | | |
* | | | | Merge pull request #13 from csc301-winter-2019/feat/5AndrewMihai2019-03-05
|\ \ \ \ \ | | |_|/ / | |/| | | Feat/5
| * | | | Created the greeting page of application. Page contains button to fetchAndrew2019-02-24
| | | | | | | | | | | | | | | | | | | | location, and button to drop pin. Both buttons lead to blank pages. This is an initial prototype.
| * | | | Merge pull request #12 from csc301-winter-2019/masterAndrewMihai2019-02-21
| |\ \ \ \ | | | |_|/ | | |/| | Merging new commits from master into feat/5 branch
* | | | | Merge pull request #20 from csc301-winter-2019/feat7-qa-mergingKumar Damani2019-03-04
|\ \ \ \ \ | | |_|_|/ | |/| | | Feat7 qa merging
| * | | | merged feat7 into tempKumar Damani2019-02-28
|/| | | |
| * | | | displaying all the fields in the marker popup, better var namingfeat/7Kumar Damani2019-02-28
| | | | |
| * | | | changed index to use pointscollection by defaultKumar Damani2019-02-28
| | | | |
| * | | | sending geo data to front end, displaying it as markers, and taken out ↵Kumar Damani2019-02-28
| | |_|/ | |/| | | | | | | | | | schema defs from index into models folder
* | | | Merge pull request #14 from csc301-winter-2019/feat/19Ivan Shen2019-02-27
|\ \ \ \ | | | | | | | | | | feat/19: add route to insert mobile request to database
| * | | | pulled in latest masterKumar Damani2019-02-27
| |\| | |
| | * | | Merge pull request #18 from csc301-winter-2019/fix-master-urgentKumar Damani2019-02-27
| | |\ \ \ | | | | | | | | | | | | Fix master urgent
| * | | | | feat-19: add route to insert mobile request to databaseivanshen2019-02-26
| |/ / / /
* | | | | Merge pull request #17 from csc301-winter-2019/fix-master-urgentKumar Damani2019-02-27
|\ \ \ \ \ | | |/ / / | |/| | | Fix master urgent
| * | | | fixed default zoom level for mapKumar Damani2019-02-27
| | | | |
| * | | | fixed spaces to indentsKumar Damani2019-02-27
| | | | |
| * | | | removed unnecessary db call breaking homepage due to db updateKumar Damani2019-02-27
| |/ / /