aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
| * | | | Merge pull request #24 from csc301-winter-2019/feat/8Ivan Shen2019-03-05
| |\ \ \ \
| | * | | | 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
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | / / / | | | |/ / / | | |/| | |
| * | | | | Merge pull request #13 from csc301-winter-2019/feat/5AndrewMihai2019-03-05
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Created the greeting page of application. Page contains button to fetchAndrew2019-02-24
| | * | | | Merge pull request #12 from csc301-winter-2019/masterAndrewMihai2019-02-21
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| * | | | | Merge pull request #20 from csc301-winter-2019/feat7-qa-mergingKumar Damani2019-03-04
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #15 from csc301-winter-2019/mockdataKumar Damani2019-03-08
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | generated some mock data to test withmockdataKumar Damani2019-02-26
* | | | | | | Merge pull request #22 from csc301-winter-2019/feat7-qa-mergingKumar Damani2019-03-05
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge branch 'feat7-qa-merging' of github.com:csc301-winter-2019/project-team...feat7-qa-mergingKumar Damani2019-03-05
| |\ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
* | | | | | updated iteration-plan after two members dropped courseKumar Damani2019-03-01
| * | | | | 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 schema...Kumar Damani2019-02-28
| |/ / / / |/| | | |
| * | | | Merge pull request #14 from csc301-winter-2019/feat/19Ivan Shen2019-02-27
| |\ \ \ \
| | * \ \ \ pulled in latest masterKumar Damani2019-02-27
| | |\ \ \ \ | |_|/ / / / |/| | | | |
* | | | | | Merge pull request #18 from csc301-winter-2019/fix-master-urgentKumar Damani2019-02-27
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| | | * | | 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
| | |\ \ \ | | |/ / / | |/| | |
| * | | | 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
|/ / / /
| * | | Merge pull request #16 from csc301-winter-2019/masterKumar Damani2019-02-26
| |\ \ \ | |/ / / |/| | |
* | | | added iter2 plan.mdKumar Damani2019-02-24
| |_|/ |/| |
* | | Merge pull request #11 from csc301-winter-2019/feat/4Kumar Damani2019-02-20
|\ \ \ | |_|/ |/| |
| | * Merge pull request #10 from csc301-winter-2019/feat/4Kumar Damani2019-02-19
| | |\ | | |/ | |/|
| * | added a step for mongodb locallyfeat/4Kumar Damani2019-02-19
| | * Merge pull request #9 from csc301-winter-2019/feat/4Kumar Damani2019-02-19
| | |\ | | |/ | |/|
| * | added error help for mongo connectionKumar Damani2019-02-18
| * | pulling in latest masterKumar Damani2019-02-18
| |\ \ | |/ / |/| |
* | | Merge pull request #8 from csc301-winter-2019/fix-dir-structKumar Damani2019-02-18
|\ \ \
| | * \ pulled latest from masterKumar Damani2019-02-18
| | |\ \ | |_|/ / |/| | |
| | * | properly using the atlas mongo connectionKumar Damani2019-02-18
| | * | added check for envs and mongo uri, updated readmeKumar Damani2019-02-18
| | * | fixed READMEKumar Damani2019-02-18
| | * | added basic site with basic mapKumar Damani2019-02-18
| | * | added a .gitignore fileKumar Damani2019-02-18
| | | * Merge branch 'fix-dir-struct' into qaKumar Damani2019-02-18
| | | |\ | | |_|/ | |/| |
| * | | fixed folder structureKumar Damani2019-02-18
|/ / /
* | | Merge pull request #5 from csc301-winter-2019/feat/1Samarth-Agarwal12019-02-18
|\ \ \ | |/ / |/| |
| | * Merge pull request #3 from csc301-winter-2019/feat/1Samarth-Agarwal12019-02-18
| | |\ | | |/ | |/|
| * | Removed App.js from root directory and put it within /mobile/ directoryfeat/1Samarth Agarwal2019-02-18