aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #64 from csc301-winter-2019/feat/34Kumar Damani2019-03-29
|\ | | | | Feat/34
| * bug with liveupdates adding duplicate pointsfeat/34Kumar Damani2019-03-28
| |
| * Merge branch 'feat/34' of github.com:csc301-winter-2019/project-team-02 into ↵Kumar Damani2019-03-28
| |\ | | | | | | | | | feat/34
| | * fixed spacingKumar Damani2019-03-28
| | |
| | * saving status of point in db. loading only new or pending points in home pageKumar Damani2019-03-28
| | |
| | * Merge branch 'feat/34' of github.com:csc301-winter-2019/project-team-02 into ↵Kumar Damani2019-03-27
| | |\ | | | | | | | | | | | | feat/34
| | | * Modified schema to include 'status' in mockpoints.js and points.js.Samarth Agarwal2019-03-27
| | | |
| | * | Modified schema to include 'status' in mockpoints.js and points.js.Samarth Agarwal2019-03-27
| | | |
| * | | fixed spacingKumar 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
| | | |
* | | | Merge pull request #66 from csc301-winter-2019/feat/35AndrewMihai2019-03-29
|\ \ \ \ | | | | | | | | | | Moved button icons beside button text
| * | | | Moved button icons beside button textfeat/35Andrew2019-03-28
| |/ / /
* | | | Merge pull request #65 from csc301-winter-2019/feat/20AndrewMihai2019-03-29
|\ \ \ \ | | | | | | | | | | Feat/20
| * | | | Added a back button to the map pagefeat/20Andrew2019-03-28
| | | | |
| * | | | Drop pin feature completedAndrew2019-03-28
| | | | |
| * | | | 6ix map commit 2.0Andrew2019-03-26
| | | | |
| * | | | Map of 6ix appears when you press drop pinAndrew2019-03-26
| | |_|/ | |/| |
* | | | Merge pull request #62 from csc301-winter-2019/feat/36feat/31Kumar Damani2019-03-29
|\ \ \ \ | |_|/ / |/| | | Feat/36
| * | | remove unused codefeat/36Kumar Damani2019-03-29
| | | |
| * | | added short descriptionKumar Damani2019-03-29
|/ / /
* | | fixed packacge.json conflit, during merge of fix/25 with masterKumar Damani2019-03-28
|\ \ \ | |_|/ |/| |
| * | 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
| * | 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
| |/
* | Merge pull request #51 from csc301-winter-2019/feat/30Samarth-Agarwal12019-03-27
|\ \ | |/ |/| Feat/30
| * 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
| |\ | |/ |/|
* | Merge pull request #42 from csc301-winter-2019/feat/32Kumar Damani2019-03-20
|\ \ | | | | | | Feat/32
| * | fixing ui bugs. 1. side bar max height reduced to 500px. 2. fix for words ↵feat/32Kumar Damani2019-03-20
| | | | | | | | | | | | too long
| * | fixed web typeKumar Damani2019-03-15
| | |
| * | added back the back buttonKumar 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 ↵Kumar Damani2019-03-15
| | | | | | | | | | | | front end web changes yet
| | * Saving changes before merge.Samarth Agarwal2019-03-21
| |/ |/|
* | added d3 planKumar Damani2019-03-15
| |
* | Merge pull request #36 from csc301-winter-2019/setup-prodKumar Damani2019-03-14
|\| | | | | Setup prod
| * added evn urls for prod, and mobileKumar Damani2019-03-14
| |
| * updated proddb configKumar Damani2019-03-13
|/
* typos fixed in iter2-review docKumar Damani2019-03-10
|
* Merge branch 'master' of github.com:csc301-winter-2019/project-team-02Kumar Damani2019-03-10
|\
| * Merge pull request #34 from csc301-winter-2019/fix-location-bug-d2Kumar Damani2019-03-10
| |\ | | | | | | Fix location bug d2
| | * added proper app settingsfix-location-bug-d2Kumar Damani2019-03-10
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-08 12:32:10 +0000