Preston Doman
|
635edf83b6
|
Merge conflict resolved
|
2019-01-30 20:35:44 -08:00 |
|
hui2018
|
bd9ba06bba
|
Merge pull request #47 from danieldupriest/condense-pages
Condense pages
|
2019-01-30 17:02:48 -08:00 |
|
hui2018
|
9e6f08675d
|
Merge pull request #46 from danieldupriest/show-report-history
Show report history
|
2019-01-30 17:02:01 -08:00 |
|
Preston Doman
|
546b0730da
|
Add edit report form function
|
2019-01-30 15:42:09 -08:00 |
|
Preston Doman
|
9ecbc6eb27
|
Change navbar brand from an anchor to a div
|
2019-01-30 10:14:49 -08:00 |
|
Preston Doman
|
1b2dab0632
|
Condense pages, rename html files, and update navbar
|
2019-01-30 09:03:11 -08:00 |
|
ppdom
|
c569993f75
|
Merge pull request #45 from danieldupriest/rework-policy-files
Moved policy files into 'backend/' and fixed (most) formatting issues.
|
2019-01-30 01:16:02 -08:00 |
|
Preston Doman
|
41a4ab6c8b
|
Update endpoint url
|
2019-01-30 00:48:04 -08:00 |
|
Preston Doman
|
f1da66abcc
|
Merge branch 'master' into show-report-history
|
2019-01-30 00:27:29 -08:00 |
|
Preston Doman
|
4eeb7bb5ae
|
Change formatting
|
2019-01-30 00:25:45 -08:00 |
|
Preston Doman
|
5aebef7be4
|
Refactor code
|
2019-01-29 22:17:44 -08:00 |
|
rupikad
|
0b04057da2
|
Merge pull request #43 from danieldupriest/api-endpoint-rework
Reworked API endpoints with correct types and some sample JSON.
|
2019-01-29 17:03:12 -08:00 |
|
Preston Doman
|
72dd3d9900
|
Add form-building function
|
2019-01-29 17:01:39 -08:00 |
|
kououken
|
875641fbe4
|
Fixed policy file spacing.
|
2019-01-29 16:56:56 -08:00 |
|
kououken
|
a70d9aa6bc
|
Moved policy files into 'backend/' and fixed (most) formatting issues.
|
2019-01-29 16:39:35 -08:00 |
|
Preston Doman
|
3fe22134fd
|
Refactor using callback functions
|
2019-01-29 16:21:22 -08:00 |
|
Preston Doman
|
9c633d6ac5
|
Add modal popup for the edit button
|
2019-01-29 14:59:28 -08:00 |
|
Preston Doman
|
d8aee961ca
|
Add buttons and more responsive styling to report table
|
2019-01-29 13:45:00 -08:00 |
|
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 |
|
kououken
|
1ff30226f9
|
Added 'report_pk' to report list json.
|
2019-01-28 13:23:49 -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 |
|
kououken
|
a4dbb3f644
|
Reworked API endpoints with correct types and some sample JSON.
|
2019-01-27 14:22:42 -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 |
|