aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Merge branch 'master' into qaKumar Damani2019-04-23
|\
| * removing some unnecessary files from mobileKumar Damani2019-04-23
| * switched tabs to 2 spacesKumar Damani2019-04-23
* | Merge branch 'master' into 'qa'Kumar Damani2019-04-23
|\|
| * rearranging stuffKumar Damani2019-04-23
| * Merge branch 'web-homepage' into 'master'Kumar Damani2019-04-23
| |\
* | \ Merge branch 'web-homepage' into 'qa'Kumar Damani2019-04-23
|\ \ \ | | |/ | |/|
| * | removing jquery as never usedweb-homepageKumar Damani2019-04-23
* | | Merge pull request #75 from csc301-winter-2019/web-homepageKumar Damani2019-04-19
|\| |
| * | bug fix for initial load without any pointsKumar Damani2019-04-19
* | | Merge pull request #74 from csc301-winter-2019/web-homepageKumar Damani2019-04-19
|\| |
| * | web ui updatesKumar Damani2019-04-19
* | | Merge pull request #73 from csc301-winter-2019/web-homepageKumar Damani2019-04-18
|\| |
| * | updated readmes, removed db url linkKumar Damani2019-04-18
* | | Merge pull request #71 from csc301-winter-2019/web-homepageKumar Damani2019-04-09
|\| |
| * | copy editKumar Damani2019-04-09
| * | added very minimal stylingKumar Damani2019-04-09
| * | added proper content, no stylingKumar Damani2019-04-09
| |/
* | Merge branch 'master' into qaKumar Damani2019-04-09
|\|
| * Update README.mdKumar Damani2019-03-29
| * Merge branch 'master' of https://github.com/csc301-winter-2019/project-team-02Samarth Agarwal2019-03-29
| |\
| | * d3 docs finalKumar Damani2019-03-29
| | * Update README.mdFahim2019-03-29
| | * Update README.mdFahim2019-03-29
| * | Changed pic url for pending clicks.Samarth Agarwal2019-03-29
| * | Added undef line.Samarth Agarwal2019-03-29
| |\ \ | | |/ | |/|
| | * Added undef lineSamarth Agarwal2019-03-29
| * | Finished mergeSamarth Agarwal2019-03-29
| * | Merging.Samarth Agarwal2019-03-29
| |\|
| | * Merging.feat/33Samarth Agarwal2019-03-29
| | * Removed default status value again.Samarth Agarwal2019-03-29
| | * Removed default status value.Samarth Agarwal2019-03-29
| | * Changed null to undefined.Samarth Agarwal2019-03-29
| * | Merge pull request #67 from csc301-winter-2019/feat/28-patchIvan Shen2019-03-29
| |\ \
| * \ \ Merge pull request #64 from csc301-winter-2019/feat/34Kumar Damani2019-03-29
| |\ \ \
| * \ \ \ Merge pull request #66 from csc301-winter-2019/feat/35AndrewMihai2019-03-29
| |\ \ \ \
| * \ \ \ \ Merge pull request #65 from csc301-winter-2019/feat/20AndrewMihai2019-03-29
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #68 from csc301-winter-2019/qa-temp-merging-feat33Samarth-Agarwal12019-03-29
|\ \ \ \ \ \ \
| * | | | | | | Continuing merge.qa-temp-merging-feat33Samarth Agarwal2019-03-29
| * | | | | | | Doing mergeSamarth Agarwal2019-03-29
|/| | | | | | | | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Implemented feature so that whenever a point is clicked a red dot shows up at...Samarth Agarwal2019-03-29
| |/ / / / /
| * | | | | Merge pull request #62 from csc301-winter-2019/feat/36feat/31Kumar Damani2019-03-29
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #61 from csc301-winter-2019/feat/36Kumar Damani2019-03-29
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | remove unused codefeat/36Kumar Damani2019-03-29
| * | | | | | added short descriptionKumar Damani2019-03-29
| |/ / / / /
* | | | | | Merge branch 'feat/34' into qaKumar Damani2019-03-28
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | bug with liveupdates adding duplicate pointsfeat/34Kumar Damani2019-03-28
* | | | | | Merge pull request #59 from csc301-winter-2019/feat/35AndrewMihai2019-03-28
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Moved button icons beside button textfeat/35Andrew2019-03-28
| | |/ / / | |/| | |
* | | | | fix conflictsivanshen2019-03-28
|\ \ \ \ \ | | |_|_|/ | |/| | |