Commit graph

436 commits

Author SHA1 Message Date
kououken
1d4d3912dc Merged latest changes from master. 2019-02-23 13:55:22 -08:00
ppdom
648c2a5851
Merge pull request #98 from danieldupriest/adjust_json_key
Removed extra keys
2019-02-23 13:42:57 -08:00
kououken
1c8eb17e85 Fixed 'lowest_fare' rule bug. 2019-02-23 12:59:27 -08:00
kououken
b19cd21b41 Repaired all the broken field references. 2019-02-22 19:22:32 -08:00
Daniel Dupriest
b28a73d97f
Create placeholder config file for server settings 2019-02-22 12:42:54 -08:00
Rupika
87a3074b16 removed number, id, and completed attributes from the JSON data section 2019-02-22 11:39:12 -08:00
kououken
b23fcaa4a2 Fixed bug in subject line formatting. 2019-02-21 19:41:26 -08:00
kououken
d876852e7e Added rule violations to emails. 2019-02-21 16:43:39 -08:00
kououken
fbf89d4876 Implemented email sending code. 2019-02-21 16:18:39 -08:00
ppdom
432e48fddc
Merge pull request #96 from danieldupriest/update-policy
Update to more detailed policy file
2019-02-20 22:25:28 -08:00
kououken
91021d968e Merge remote-tracking branch 'origin/master' into update-policy 2019-02-20 21:28:33 -08:00
ppdom
8e1e9f0900
Merge pull request #94 from danieldupriest/textHome
Add text content at home page
2019-02-20 21:23:50 -08:00
kououken
60589967e1 Merge remote-tracking branch 'origin/master' into update-policy 2019-02-20 21:17:56 -08:00
Daniel Dupriest
8f290fe2ed
Merge pull request #93: Update section completion and show rule violations
Display rule violations and update section completion flag
2019-02-20 21:14:25 -08:00
Preston Doman
de827145f4 Add support for three section states 2019-02-20 20:56:33 -08:00
kououken
a07258c1f5 All sections added to policy file. 2019-02-20 17:38:57 -08:00
kououken
9ea335d68f Fixed bugs in rules returning strings. 2019-02-20 17:05:36 -08:00
kououken
bc7fc340f5 Initial update of policy file. 2019-02-20 16:20:44 -08:00
sliang17
89d16cbefd modified spelling mistakes and remove p tags 2019-02-20 16:06:46 -08:00
sliang17
5e7972bed9 Add text content at home page 2019-02-20 11:21:15 -08:00
Preston Doman
02f27c2247 Clean up code 2019-02-19 22:42:30 -08:00
Preston Doman
0a5241e5f3 Implement section footer and header toggling 2019-02-19 20:15:04 -08:00
Logan Miller
161555b20f
Merge pull request #92 from danieldupriest/implement-submit-report
Reports can now be 'submitted', and you cannot modify submitted reports.
2019-02-19 15:40:12 -08:00
kououken
c899263f0c Changed error status to 409, which makes more sense. 2019-02-19 15:33:01 -08:00
rupikad
38b71d33d0
Merge pull request #90 from danieldupriest/fix-admin-css
Added 3rd 'admin' server on port 8445 to serve admin css/js.
2019-02-19 14:36:24 -08:00
kououken
deabfa8dd1 Reports can now be 'submitted', and you cannot modify submitted reports. 2019-02-19 12:45:39 -08:00
Preston Doman
f927820293 Merge branch 'master' into display-rule-violations 2019-02-18 23:17:16 -08:00
ppdom
744505346f
Merge pull request #91 from danieldupriest/newSubmitButton
Update the submit report button
2019-02-18 20:21:37 -08:00
sliang17
440f54db85 Update the submit report button 2019-02-18 20:14:48 -08:00
kououken
12e9b2a8be Updated django to 2.1.6 2019-02-18 18:17:45 -08:00
kououken
8586077a84 Added 3rd 'admin' server on port 8445 to serve admin css/js. 2019-02-18 17:48:51 -08:00
Logan Miller
adc3b5863f
Merge pull request #88 from danieldupriest/add-spinners
Add spinners
2019-02-17 21:43:02 -08:00
Preston Doman
69959a3510 Merge branch 'master' into display-rule-violations 2019-02-16 20:33:19 -08:00
hui2018
a18ead6f7f
Merge pull request #87 from danieldupriest/add-rules-to-section
Added rules to section and comment backend code
2019-02-16 20:19:22 -08:00
Preston Doman
48ea8d59b9 Remove console logs 2019-02-16 20:05:32 -08:00
Preston Doman
20d3b08653 Add spinner to the save button 2019-02-16 19:58:55 -08:00
Preston Doman
8f98dc06ec Remove logging statements 2019-02-16 18:56:16 -08:00
Preston Doman
30676d35ab Add function to refresh page on new report close 2019-02-16 18:42:19 -08:00
Preston Doman
e1873fe4ae Add loading spinner to report table 2019-02-16 16:41:11 -08:00
Preston Doman
13ba704824 Fix empty report table message 2019-02-16 16:07:43 -08:00
Preston Doman
830394798c Fix formatting of rule violation footer 2019-02-16 15:22:04 -08:00
Preston Doman
8c659bb608 Merge branch 'master' into display-rule-violations 2019-02-16 14:40:19 -08:00
Preston Doman
323be88f75 Add rule violation footer 2019-02-16 12:24:19 -08:00
kououken
c864d4dd5a Merged changes from master. 2019-02-16 12:21:29 -08:00
Logan Miller
8da8e55279
Merge pull request #86 from danieldupriest/fix-input-fields
Fix input fields
2019-02-16 12:11:47 -08:00
kououken
d1bdab0701 Added docstring comments to all functions and classes. Renamed 'get_reports' to 'get_report'. 2019-02-16 12:11:37 -08:00
Logan Miller
04f36014a3
Merge pull request #81 from danieldupriest/owner-check
Implemented owner-checking and Unauthorized error messages.
2019-02-16 11:57:17 -08:00
kououken
52fa39aa7a Merge remote-tracking branch 'origin/master' into owner-check 2019-02-16 10:37:32 -08:00
Daniel Dupriest
c5b50715d3
Merge pull request #85: Return section json when section updated
prints out JSON with section & field details
2019-02-16 10:33:48 -08:00
kououken
915c470904 Remerged changes from master. 2019-02-16 08:31:45 -08:00