Back end master#26

Open

hamilbrian wants to merge 21 commits intomasterfrom

Commits on Apr 16, 2020

Merge pull request #17 from deibele1/JohnBranch
deibele1
authored
No real changes, I just removed the consumes attribute from the get events and replaced it with produces. We don't need to specify the content type in the header of a get request
deibele1
committed
30day, 60day, and 90day now list in order of which event is coming next by date
John-Aye
committed
backend only returns basic event info for security purposes
John-Aye
committed
event controllers now include category
John-Aye
committed
Merge branch 'BackEndMaster' into JohnBranch
John-Aye
authored
output for basic event info is now in the correct order
John-Aye
committed
Merge branch 'JohnBranch' of https://github.com/deibele1/TeamDeathStar into JohnBranch
John-Aye
committed
get events by category now works at /1 for politics, /2 for economics, etc
John-Aye
committed

Commits on Apr 17, 2020

Merge pull request #18 from deibele1/JohnBranch
deibele1
authored
Fixed null description
EC2 Default User
committed
Changed to update
EC2 Default User
committed
added prediction controller
unknown
committed

Commits on Apr 18, 2020

clean up
hamilbrian
committed
cleanup
hamilbrian
committed