aboutsummaryrefslogtreecommitdiff
path: root/web
Commit message (Expand)AuthorAge
* 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
|\|
| * 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 at...Samarth Agarwal2019-03-29
* | | 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
|\| |
| * | 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 dependency for t...fix/25Kumar Damani2019-03-26
* | | Merge branch 'qa' into feat/30Samarth-Agarwal12019-03-26
|\| | | |/ |/|
| * for both validationsKumar Damani2019-03-26
| * changing error code to 422 for one of the validation conditionsKumar Damani2019-03-26
| * fixed typoKumar Damani2019-03-25
| * added data validation before inserting into dbKumar Damani2019-03-25
* | Modified some CSS properties of buttons in point details sidebar.feat/30Samarth Agarwal2019-03-26
* | Added semicolons to be consistent.Samarth Agarwal2019-03-26
* | Commented out correct line in app.js to connect to database.Samarth Agarwal2019-03-26
* | Update map.jsSamarth-Agarwal12019-03-26
* | Finished front-end side of this feature.Samarth Agarwal2019-03-22
* | Finished merge.Samarth Agarwal2019-03-21
|\|
| * fixing ui bugs. 1. side bar max height reduced to 500px. 2. fix for words too...feat/32Kumar Damani2019-03-20
| * fixed web typeKumar Damani2019-03-15
| * code cleanupKumar Damani2019-03-15
| * added FE web updates for displaying new form report. minor ui enchancementsKumar Damani2019-03-15
| * updated mobile form, updated web schemas, and /mobilerequest handler. No fron...Kumar Damani2019-03-15
* | Saving changes before merge.Samarth Agarwal2019-03-21
|/
* added evn urls for prod, and mobileKumar Damani2019-03-14
* updated proddb configKumar Damani2019-03-13
* 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