Commit graph

124 commits

Author SHA1 Message Date
Logan Miller
88a09e5816
Merge pull request #44 from danieldupriest/show-report-history
Add list report history functionality to view_history.html
2019-01-28 14:02:22 -08:00
Logan Miller
0a930a21ed
Merge pull request #39 from danieldupriest/example_policy
Created example policy config file
2019-01-28 13:53:44 -08:00
Logan Miller
c665a83729
Merge pull request #37 from danieldupriest/model-string-representations
Gave all models string representations and set up file storage.
2019-01-28 13:49:52 -08:00
Preston Doman
d4b569187e Remove setRequestHeaders line 2019-01-27 21:40:49 -08:00
Preston Doman
d3acce9b78 Change endpoint url depending on detected OS 2019-01-27 21:39:48 -08:00
Preston Doman
1691392b43 Add list report history functionality to view_history.html 2019-01-27 16:21:51 -08:00
Daniel Dupriest
a4628c5f3c
Merge pull request #42 from danieldupriest/site-redesign
Add new pages for each user action
2019-01-27 11:13:12 -08:00
Daniel Dupriest
546c83f6f8
Merge pull request #41 from danieldupriest/validate-email
validate email
2019-01-27 11:09:37 -08:00
Preston Doman
37f50409d7 Add new pages for each user action 2019-01-26 23:31:59 -08:00
Jack
ad3e1f7ea4 Validat email in the pattern of 'string@string.string' 2019-01-26 18:18:59 -08:00
joe-arriaga
0f7d844dda
Update hasher.py 2019-01-26 12:05:07 -08:00
sliang17
19bbc409f9
Merge pull request #38 from danieldupriest/dashboard-nav-card
Add card with nav pills to dashboard
2019-01-26 11:40:47 -08:00
Joe Arriaga
368bc0964c Replaced tabs with spaces in simple_poicy.py. 2019-01-25 21:29:38 -08:00
Preston Doman
e1cb44be72 Add card with nav pills to dashboard 2019-01-25 21:18:23 -08:00
Daniel Dupriest
fbe95aac0b
Merge pull request #29 from danieldupriest/example_policy
Added example policy
2019-01-25 19:45:29 -08:00
kououken
1a68176f80 Gave all models string representations and set up file storage. 2019-01-25 14:37:03 -08:00
Daniel Dupriest
71c1208bfa
Merge pull request #36 from danieldupriest/create_api_serializer
Create api serializer
2019-01-25 13:01:26 -08:00
Rupika
c9fbe8d60e adding model = models.report 2019-01-25 12:45:34 -08:00
Rupika
496ec5626e fix errors 2019-01-23 18:18:19 -08:00
Rupika
fe516ec96b Got serializer code to work, need to fix submitting null "date submitted" fields in report 2019-01-23 13:40:37 -08:00
Rupika
4bc54d5dcc fixed merge conflict in settings.py? 2019-01-23 10:25:50 -08:00
Rupika
c2f1899e20 updating my code 2019-01-22 23:11:41 -08:00
Logan Miller
acc2a6ecc2
Merge pull request #35 from danieldupriest/create-custom-user
Create custom user
2019-01-22 18:40:55 -08:00
Logan Miller
05f612ab06
Merge pull request #34 from danieldupriest/BootstrapSignupForm
Bootstrap signup form
2019-01-22 18:17:02 -08:00
joe-arriaga
ab3366529b
Merge branch 'master' into create-custom-user 2019-01-22 17:56:02 -08:00
joe-arriaga
f299e3a24e
Merge pull request #33 from danieldupriest/enable-cors-support
Enabled cors headers for django
2019-01-22 17:33:39 -08:00
joe-arriaga
d7bc7cda09
Merge pull request #32 from danieldupriest/docker-compose-fix
Removed duplicate 'image:' line in docker-compose, trying to fix bug.
2019-01-22 17:23:07 -08:00
Daniel Dupriest
63f3465ca4 Created initial user and some sample report objects. Initialized superuser to admin/admin 2019-01-22 17:03:07 -08:00
Daniel Dupriest
bd1bf44059 Created CustomUser and tweaked backend models. 2019-01-22 16:38:09 -08:00
Preston Doman
6a5f5ec2c2 Update form and navbar formatting and remove extra index.html links 2019-01-22 15:02:06 -08:00
Preston Doman
9e9e85919c Merge branch 'master' into BootstrapSignupForm 2019-01-22 14:51:54 -08:00
Preston Doman
0add4e59ba Fix favicon bug 2019-01-22 14:51:46 -08:00
Daniel Dupriest
64b47c3345 Enabled cors headers for django 2019-01-22 13:34:47 -08:00
Daniel Dupriest
1a63d006df Removed duplicate 'image:' line in docker-compose, trying to fix bug. 2019-01-22 12:31:30 -08:00
sliang17
5175646e51
Merge pull request #31 from danieldupriest/FixLoginLogoutFaviconBugs
Fix login logout favicon bugs
2019-01-22 11:36:15 -08:00
Preston Doman
9366120871 Merge branch 'master' into FixLoginLogoutFaviconBugs 2019-01-22 10:48:17 -08:00
Preston Doman
ad0afab699 Fix the logging in/out and favicon bugs 2019-01-22 10:46:11 -08:00
sliang17
1afcb1dda6
Merge pull request #30 from danieldupriest/ResponsivePageInDashboard
Making the tabs in dashboard responsive
2019-01-22 10:45:24 -08:00
Jack
a6807a4d57 Making the tabs in dashboard responsive 2019-01-22 09:37:48 -08:00
hui2018
eb1df00620
Merge pull request #28 from danieldupriest/BootstrapLoginForm
Bootstrap login form
2019-01-22 08:31:24 -08:00
sliang17
b08e5adf92
Merge pull request #27 from danieldupriest/update-django
Updated django version to fix vulnerability.
2019-01-22 00:02:05 -08:00
Preston Doman
77f99eb180 Add Bootstrap styling to the signup form 2019-01-21 21:18:34 -08:00
Joe Arriaga
e88cb95010 Added policy file. 2019-01-21 16:34:58 -08:00
Preston Doman
457fae09aa Update Bootstrap styling to login form 2019-01-20 21:50:19 -08:00
Preston Doman
b93e889923 Add Bootstrap styling to login form 2019-01-20 21:45:42 -08:00
Daniel Dupriest
b3177b906b Updated django version to fix vulnerability. 2019-01-20 15:16:56 -08:00
joe-arriaga
c3611737e8
Merge pull request #26 from danieldupriest/database-models
Database models all implemented. Migrations made.
2019-01-20 15:06:39 -08:00
Daniel Dupriest
36252079d7 Database models all implemented. Migrations made. 2019-01-20 14:39:11 -08:00
Joe Arriaga
609eab2ca0 Created example policy config files. Added my name to the README. 2019-01-20 13:59:03 -08:00
Logan Miller
7bfe8a44ea
Merge pull request #24 from danieldupriest/stub_api_call
Stub api call
2019-01-20 13:20:15 -08:00