| Commit message (Collapse) | Author | Age | ||
|---|---|---|---|---|
| ... | ||||
| * | | | | | Merge pull request #28 from csc301-winter-2019/fix24-temp-qamerging | Kumar Damani | 2019-03-08 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Fix24 temp qamerging | |||
| | * \ \ \ \ | resolve conflicts | Kumar Damani | 2019-03-08 | |
| | |\ \ \ \ \ | ||||
| | | * | | | | | added padding for distant points just in casefix/24 | Kumar Damani | 2019-03-08 | |
| | | | | | | | | ||||
| | * | | | | | | resolving conflicts | Kumar Damani | 2019-03-08 | |
| |/| | | | | | | |/ / / / / | ||||
| | * | | / / | rezooming map using leaflet bounds to show all markers | Kumar Damani | 2019-03-08 | |
| | | |_|/ / | |/| | | | ||||
| * | | | | | Merge pull request #24 from csc301-winter-2019/feat/8 | Ivan Shen | 2019-03-05 | |
| |\ \ \ \ \ | | | | | | | | | | | | | Add live updates functionality | |||
| | * | | | | | remove unnecessary !! | Ivan Shen | 2019-03-05 | |
| | | | | | | | ||||
| | * | | | | | Comment out prod db | Ivan Shen | 2019-03-05 | |
| | | | | | | | ||||
| | * | | | | | modularize plot points | ivanshen | 2019-03-05 | |
| | | | | | | | ||||
| | * | | | | | Remove commented code | Ivan Shen | 2019-03-05 | |
| | | | | | | | ||||
| | * | | | | | Point back to local db | Ivan Shen | 2019-03-05 | |
| | | | | | | | ||||
| | * | | | | | Added live update functionality (feat 8) | ivanshen | 2019-03-05 | |
| | | | | | | | ||||
| | * | | | | | Merge branch 'qa' of github.com:csc301-winter-2019/project-team-02 into qa | ivanshen | 2019-03-05 | |
| | |\ \ \ \ \ | ||||
| * | \ \ \ \ \ | Merge pull request #25 from csc301-winter-2019/master | Kumar Damani | 2019-03-05 | |
| |\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | sync qa with master | |||
| * | | | | | | Merge pull request #13 from csc301-winter-2019/feat/5 | AndrewMihai | 2019-03-05 | |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | Feat/5 | |||
| | * | | | | | Created the greeting page of application. Page contains button to fetch | Andrew | 2019-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/master | AndrewMihai | 2019-02-21 | |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | Merging new commits from master into feat/5 branch | |||
| * | | | | | | Merge pull request #20 from csc301-winter-2019/feat7-qa-merging | Kumar Damani | 2019-03-04 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Feat7 qa merging | |||
| | | | | | | * | Merge pull request #15 from csc301-winter-2019/mockdata | Kumar Damani | 2019-03-08 | |
| | | | | | |/| | | | | |/| | | | | | | | | | generated some mockdata | |||
| | | | | | | * | generated some mock data to test withmockdata | Kumar Damani | 2019-02-26 | |
| | | | | | | | | ||||
| | | | | * | | | Merge pull request #22 from csc301-winter-2019/feat7-qa-merging | Kumar Damani | 2019-03-05 | |
| | | | | |\ \ \ | | | | | |/ / | | | | |/| | | Feat7 qa merging | |||
| | | | | | * | | Merge branch 'feat7-qa-merging' of ↵feat7-qa-merging | Kumar Damani | 2019-03-05 | |
| | | |_|_|/| | | |/| | |/ / | | | | | | | | | | | | | github.com:csc301-winter-2019/project-team-02 into feat7-qa-merging | |||
| | | | | * | | updated iteration-plan after two members dropped course | Kumar Damani | 2019-03-01 | |
| | | | | | | | ||||
| | * | | | | | merged feat7 into temp | Kumar Damani | 2019-02-28 | |
| |/| | | | | | ||||
| | * | | | | | displaying all the fields in the marker popup, better var namingfeat/7 | Kumar Damani | 2019-02-28 | |
| | | | | | | | ||||
| | * | | | | | changed index to use pointscollection by default | Kumar Damani | 2019-02-28 | |
| | | | | | | | ||||
| | * | | | | | sending geo data to front end, displaying it as markers, and taken out ↵ | Kumar Damani | 2019-02-28 | |
| | | |_|/ / | |/| | | | | | | | | | | | | | schema defs from index into models folder | |||
| * | | | | | Merge pull request #14 from csc301-winter-2019/feat/19 | Ivan Shen | 2019-02-27 | |
| |\ \ \ \ \ | | | | | | | | | | | | | feat/19: add route to insert mobile request to database | |||
| | * | | | | | pulled in latest master | Kumar Damani | 2019-02-27 | |
| | |\| | | | | ||||
| | | * | | | | Merge pull request #18 from csc301-winter-2019/fix-master-urgent | Kumar Damani | 2019-02-27 | |
| | | |\ \ \ \ | | | |_|_|/ | | |/| | | | Fix master urgent | |||
| | * / | | | | feat-19: add route to insert mobile request to database | ivanshen | 2019-02-26 | |
| | |/ / / / | ||||
| * | | | | | Merge pull request #17 from csc301-winter-2019/fix-master-urgent | Kumar Damani | 2019-02-27 | |
| |\ \ \ \ \ | | |/ / / | |/| | | | Fix master urgent | |||
| | * | | | | fixed default zoom level for map | Kumar Damani | 2019-02-27 | |
| | | | | | | ||||
| | * | | | | fixed spaces to indents | Kumar Damani | 2019-02-27 | |
| | | | | | | ||||
| | * | | | | removed unnecessary db call breaking homepage due to db update | Kumar Damani | 2019-02-27 | |
| | |/ / / | ||||
| * | | | | Merge pull request #16 from csc301-winter-2019/master | Kumar Damani | 2019-02-26 | |
| |\| | | | | | | | | | | | sync qa with master | |||
| | * | | | added iter2 plan.md | Kumar Damani | 2019-02-24 | |
| | | |/ | |/| | ||||
| | * | | Merge pull request #11 from csc301-winter-2019/feat/4 | Kumar Damani | 2019-02-20 | |
| | |\ \ | | |/ | |/| | Feat/4 | |||
| * | | | Merge pull request #10 from csc301-winter-2019/feat/4 | Kumar Damani | 2019-02-19 | |
| |\ \ \ | | |/ | |/| | added a step for mongodb locally | |||
| | * | | added a step for mongodb locallyfeat/4 | Kumar Damani | 2019-02-19 | |
| | | | | ||||
| * | | | Merge pull request #9 from csc301-winter-2019/feat/4 | Kumar Damani | 2019-02-19 | |
| |\| | | | | | | | | Feat/4 | |||
| | * | | added error help for mongo connection | Kumar Damani | 2019-02-18 | |
| | | | | ||||
| | * | | pulling in latest master | Kumar Damani | 2019-02-18 | |
| | |\| | ||||
| | | * | Merge pull request #8 from csc301-winter-2019/fix-dir-struct | Kumar Damani | 2019-02-18 | |
| | | |\ | | | | | | | | | fixed folder structure | |||
| | * | | | pulled latest from master | Kumar Damani | 2019-02-18 | |
| | |\| | | ||||
| | * | | | properly using the atlas mongo connection | Kumar Damani | 2019-02-18 | |
| | | | | | ||||
| | * | | | added check for envs and mongo uri, updated readme | Kumar Damani | 2019-02-18 | |
| | | | | | ||||
| | * | | | fixed README | Kumar Damani | 2019-02-18 | |
| | | | | | ||||
| | * | | | added basic site with basic map | Kumar Damani | 2019-02-18 | |
| | | | | | ||||
| | * | | | added a .gitignore file | Kumar Damani | 2019-02-18 | |
| | | | | | ||||
