aboutsummaryrefslogtreecommitdiff
path: root/web
Commit message (Collapse)AuthorAge
* Merge branch 'master' into 'qa'qaKumar Damani2019-04-24
|\ | | | | | | | | minor update to index See merge request kdam0/helpthehomeless!9
| * minor update to indexHEADmasterKumar Damani2019-04-24
| |
* | Merge branch 'master' into 'qa'Kumar Damani2019-04-24
|\| | | | | | | | | Master See merge request kdam0/helpthehomeless!8
| * Merge branch 'master' of gitlab.com:kdam0/helpthehomelessKumar Damani2019-04-24
| |\
| * | updates to readme and index pageKumar Damani2019-04-24
| | |
* | | Merge branch 'HH-feat-2' into 'qa'Kumar Damani2019-04-23
|\ \ \ | | |/ | |/| | | | | | | removed js library for dark mode basemap See merge request kdam0/helpthehomeless!6
| * | removed js library for dark mode basemapHH-feat-2Kumar Damani2019-04-23
| | |
* | | Merge branch 'HH-feat-2' into 'qa'Kumar Damani2019-04-23
|\| | | | | | | | | | | | | | added dark mode option See merge request kdam0/helpthehomeless!5
| * | added dark mode optionKumar Damani2019-04-23
| |/
* | Merge branch 'master' into qaKumar Damani2019-04-23
|\|
| * switched tabs to 2 spacesKumar Damani2019-04-23
| |
* | Merge branch 'master' into 'qa'Kumar Damani2019-04-23
|\| | | | | | | | | Master See merge request kdam0/helpthehomeless!3
| * rearranging stuffKumar Damani2019-04-23
| |
* | Merge branch 'web-homepage' into 'qa'Kumar Damani2019-04-23
|\| | | | | | | | | removing jquery as never used See merge request kdam0/helpthehomeless!2
| * 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 points
| * 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 updates
| * web ui updatesKumar Damani2019-04-19
| |
* | Merge pull request #73 from csc301-winter-2019/web-homepageKumar Damani2019-04-18
|\| | | | | updated readmes, removed db url link
| * updated readmes, removed db url linkKumar Damani2019-04-18
| |
* | Merge pull request #71 from csc301-winter-2019/web-homepageKumar Damani2019-04-09
|\| | | | | Web homepage
| * 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
|\|
| * 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
| | |
* | | 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 ↵Samarth Agarwal2019-03-29
| | | | | | | | | | | | at its base to focus on it and the screen zooms to put the point in the center.
* | | Merge branch 'feat/34' into qaKumar Damani2019-03-28
|\ \ \ | | |/ | |/|
| * | bug with liveupdates adding duplicate pointsfeat/34Kumar Damani2019-03-28
| | |
* | | Merge pull request #56 from csc301-winter-2019/feat/34Kumar Damani2019-03-28
|\| | | | | | | | Feat/34
| * | saving status of point in db. loading only new or pending points in home pageKumar Damani2019-03-28
| | |
| * | Modified schema to include 'status' in mockpoints.js and points.js.Samarth Agarwal2019-03-28
| |/
| * fixed packacge.json conflit, during merge of fix/25 with masterKumar Damani2019-03-28
| |\
* | | Revert "Revert "Feat/30""revert-49-revert-45-feat/30Samarth-Agarwal12019-03-27
| | |
* | | Revert "Feat/30"revert-45-feat/30Samarth-Agarwal12019-03-27
| | |
* | | Merge pull request #46 from csc301-winter-2019/fix/25Kumar Damani2019-03-26
|\ \ \ | | |/ | |/| bring in the data folder inside the web folder as its a hard dependen…
| * | bring in the data folder inside the web folder as its a hard dependency for ↵fix/25Kumar Damani2019-03-26
| | | | | | | | | | | | the index.js, so heroku needs it
* | | Merge branch 'qa' into feat/30Samarth-Agarwal12019-03-26
|\| | | |/ |/|
| * for both validationsKumar Damani2019-03-26
| |