reimbursinator

Conservancy/reimbursinator

Fork 0

Commit graph

05f29b3584

Merge pull request #109 from danieldupriest/policy-error-handling Daniel Dupriest 2019-03-03 01:08:52 -0800
b0f41070ec Refreshed database and added frank user. kououken 2019-03-03 01:08:20 -0800
a7a1a6c5a5 Merge branch 'section-approval' kououken 2019-03-03 01:00:11 -0800
2a62eb94b1 Made fresh database with frank user. kououken 2019-03-03 00:59:44 -0800
914a35c7fb

Merge pull request #107 from danieldupriest/request-tracker-integration rupikad 2019-03-02 21:17:53 -0800
6cd7903555 Added economy class check to policy.py file. Joe Arriaga 2019-03-02 20:37:38 -0800
8aab530293 Merge remote-tracking branch 'origin/master' into section-approval kououken 2019-03-02 14:45:14 -0800
00131ad41f Merge remote-tracking branch 'origin/master' into policy-error-handling kououken 2019-03-02 14:44:28 -0800
3a73760ab4 Merge branch 'request-tracker-integration' of https://github.com/danieldupriest/reimbursinator into request-tracker-integration kououken 2019-03-02 14:43:09 -0800
c0c36b39e8 Merge remote-tracking branch 'origin' into request-tracker-integration kououken 2019-03-02 14:40:41 -0800
955909ce2b Merge remote-tracking branch 'origin/master' into policy-tests kououken 2019-03-02 14:11:32 -0800
fd39ca7df7 Implemented tests for all policy rules. kououken 2019-03-02 14:10:00 -0800
6c4c31601b

Merge pull request #110: Unit tests for creating a form group Daniel Dupriest 2019-03-02 11:03:02 -0800
57b25ebbfd Update file name Preston Doman 2019-03-01 23:39:16 -0800
10fff3d46b

Added a description to the project readme. Daniel Dupriest 2019-03-01 17:05:42 -0800
ca7db96af9 Finish createFormGroup tests Preston Doman 2019-03-01 17:02:49 -0800
9d71f805ac Add first createFormGroup unit tests Preston Doman 2019-03-01 15:51:51 -0800
40e86aff34

Update .env Daniel Dupriest 2019-03-01 14:41:38 -0800
ba94134c45 Reinserted '.env' file. Whoops! kououken 2019-03-01 14:13:05 -0800
d0fa8dbea8 Added error-checking when accessing policy file to catch changes. kououken 2019-03-01 14:11:05 -0800
4c5c3fed63 Subject line will omit RT formatting if no number is provided. kououken 2019-03-01 13:11:41 -0800
4dee825973 Updated frontend to send reference number when creating report. kououken 2019-03-01 12:53:57 -0800
c94bede4be Added request tracker support as a 'reference_number' field in the report model. kououken 2019-03-01 12:26:43 -0800
b1b21c84c7 Added 'approved' field to sections. Added env to gitignore. kououken 2019-03-01 11:38:12 -0800
9658afda32

Merge pull request #105 from danieldupriest/collapse-scrolling rupikad 2019-02-27 19:39:07 -0800
e8bf239ae0

Merge pull request #104 from danieldupriest/ViewReportUpdate ppdom 2019-02-26 14:31:55 -0800
e4ebd097ec Render decimal field types with number type Preston Doman 2019-02-26 13:48:51 -0800
c18a215c44 Revert back to displaying decimal number instead of whole Jack 2019-02-24 12:38:25 -0800
792c3afe7b Fix collapse issue Preston Doman 2019-02-24 00:24:23 -0800
59056b3062 Update on view report Jack 2019-02-23 14:40:30 -0800
b58fff8888

Merge pull request #97 from danieldupriest/implement-sending-email ppdom 2019-02-23 14:07:48 -0800
1d4d3912dc Merged latest changes from master. kououken 2019-02-23 13:55:22 -0800
648c2a5851

Merge pull request #98 from danieldupriest/adjust_json_key ppdom 2019-02-23 13:42:57 -0800
1c8eb17e85 Fixed 'lowest_fare' rule bug. kououken 2019-02-23 12:59:27 -0800
b19cd21b41 Repaired all the broken field references. kououken 2019-02-22 19:22:32 -0800
b28a73d97f

Create placeholder config file for server settings Daniel Dupriest 2019-02-22 12:42:54 -0800
87a3074b16 removed number, id, and completed attributes from the JSON data section Rupika 2019-02-22 11:39:12 -0800
b23fcaa4a2 Fixed bug in subject line formatting. kououken 2019-02-21 19:41:26 -0800
d876852e7e Added rule violations to emails. kououken 2019-02-21 16:43:39 -0800
fbf89d4876 Implemented email sending code. kououken 2019-02-21 16:18:39 -0800
432e48fddc

Merge pull request #96 from danieldupriest/update-policy ppdom 2019-02-20 22:25:28 -0800
91021d968e Merge remote-tracking branch 'origin/master' into update-policy kououken 2019-02-20 21:28:33 -0800
8e1e9f0900

Merge pull request #94 from danieldupriest/textHome ppdom 2019-02-20 21:23:50 -0800
60589967e1 Merge remote-tracking branch 'origin/master' into update-policy kououken 2019-02-20 21:17:56 -0800
8f290fe2ed

Merge pull request #93: Update section completion and show rule violations Daniel Dupriest 2019-02-20 21:14:25 -0800
de827145f4 Add support for three section states Preston Doman 2019-02-20 20:56:33 -0800
a07258c1f5 All sections added to policy file. kououken 2019-02-20 17:38:57 -0800
9ea335d68f Fixed bugs in rules returning strings. kououken 2019-02-20 17:05:36 -0800
bc7fc340f5 Initial update of policy file. kououken 2019-02-20 16:20:44 -0800
89d16cbefd modified spelling mistakes and remove p tags sliang17 2019-02-20 16:06:46 -0800
5e7972bed9 Add text content at home page sliang17 2019-02-20 11:21:15 -0800
02f27c2247 Clean up code Preston Doman 2019-02-19 22:42:30 -0800
0a5241e5f3 Implement section footer and header toggling Preston Doman 2019-02-19 20:15:04 -0800
161555b20f

Merge pull request #92 from danieldupriest/implement-submit-report Logan Miller 2019-02-19 15:40:12 -0800
c899263f0c Changed error status to 409, which makes more sense. kououken 2019-02-19 15:33:01 -0800
38b71d33d0

Merge pull request #90 from danieldupriest/fix-admin-css rupikad 2019-02-19 14:36:24 -0800
deabfa8dd1 Reports can now be 'submitted', and you cannot modify submitted reports. kououken 2019-02-19 12:45:39 -0800
f927820293 Merge branch 'master' into display-rule-violations Preston Doman 2019-02-18 23:17:16 -0800
744505346f

Merge pull request #91 from danieldupriest/newSubmitButton ppdom 2019-02-18 20:21:37 -0800
440f54db85 Update the submit report button sliang17 2019-02-18 20:14:48 -0800
12e9b2a8be Updated django to 2.1.6 kououken 2019-02-18 18:17:45 -0800
8586077a84 Added 3rd 'admin' server on port 8445 to serve admin css/js. kououken 2019-02-18 17:48:51 -0800
adc3b5863f

Merge pull request #88 from danieldupriest/add-spinners Logan Miller 2019-02-17 21:43:02 -0800
69959a3510 Merge branch 'master' into display-rule-violations Preston Doman 2019-02-16 20:33:19 -0800
a18ead6f7f

Merge pull request #87 from danieldupriest/add-rules-to-section hui2018 2019-02-16 20:19:22 -0800
48ea8d59b9 Remove console logs Preston Doman 2019-02-16 20:05:32 -0800
20d3b08653 Add spinner to the save button Preston Doman 2019-02-16 19:58:55 -0800
8f98dc06ec Remove logging statements Preston Doman 2019-02-16 18:56:16 -0800
30676d35ab Add function to refresh page on new report close Preston Doman 2019-02-16 18:42:19 -0800
e1873fe4ae Add loading spinner to report table Preston Doman 2019-02-16 16:41:11 -0800
13ba704824 Fix empty report table message Preston Doman 2019-02-16 16:07:43 -0800
830394798c Fix formatting of rule violation footer Preston Doman 2019-02-16 15:22:04 -0800
8c659bb608 Merge branch 'master' into display-rule-violations Preston Doman 2019-02-16 14:40:19 -0800
323be88f75 Add rule violation footer Preston Doman 2019-02-16 12:24:19 -0800
c864d4dd5a Merged changes from master. kououken 2019-02-16 12:21:29 -0800
8da8e55279

Merge pull request #86 from danieldupriest/fix-input-fields Logan Miller 2019-02-16 12:11:47 -0800
d1bdab0701 Added docstring comments to all functions and classes. Renamed 'get_reports' to 'get_report'. kououken 2019-02-16 12:11:37 -0800
04f36014a3

Merge pull request #81 from danieldupriest/owner-check Logan Miller 2019-02-16 11:57:17 -0800
52fa39aa7a Merge remote-tracking branch 'origin/master' into owner-check kououken 2019-02-16 10:37:32 -0800
c5b50715d3

Merge pull request #85: Return section json when section updated Daniel Dupriest 2019-02-16 10:33:48 -0800
915c470904 Remerged changes from master. kououken 2019-02-16 08:31:45 -0800
6babc7ac86 Minor README.md change to force commit. kououken 2019-02-16 08:26:21 -0800
76974eb5c8 Implemented owner-checking and Unauthorized error messages. kououken 2019-02-15 14:21:48 -0800
f987897ef7 prints out JSON with section & field details Rupika 2019-02-15 22:41:54 -0800
14a77c95ea

Merge pull request #82 from danieldupriest/in-order-fields rupikad 2019-02-15 22:28:07 -0800
80c9c0add6

Merge branch 'master' into in-order-fields rupikad 2019-02-15 22:27:45 -0800
abf1f26c74 Merge branch 'master' into fix-input-fields Preston Doman 2019-02-15 21:04:14 -0800
490dc444a2

Merge pull request #83 from danieldupriest/file_upload_api ppdom 2019-02-15 20:47:43 -0800
0f53c69e2d Fix input field formatting Preston Doman 2019-02-15 20:15:39 -0800
c49544c80d Merge branch 'master' into file_upload_api Rupika 2019-02-15 15:30:45 -0800
6bc9171e7e optimized "check_section" function to invoke field.completed boolean Rupika 2019-02-15 15:28:39 -0800
dccc35b794 Fixed stupid single vs. double quote error. kououken 2019-02-15 15:18:02 -0800
98f39d242d Patched policy link bug where links were opening in the same tab, navigating away from the page. kououken 2019-02-15 15:12:59 -0800
f7bee92fcd Added 'number' attribute to fields in the policy file, then sorted by this number when displaying. kououken 2019-02-15 14:59:42 -0800
e48a67b988 tweaked section completed boolean and got file functionality working Rupika 2019-02-15 14:45:49 -0800
142beff183 Implemented owner-checking and Unauthorized error messages. kououken 2019-02-15 14:21:48 -0800
4077bd1d0b

Merge pull request #80: Section complete/incomplete implemented Daniel Dupriest 2019-02-15 13:01:22 -0800
1f4cf8a43c changed per diem trip duration to integer from decimal Rupika 2019-02-14 19:28:21 -0800
38e29903fe Merge branch 'master' into section_complete_boolean Rupika 2019-02-14 17:55:57 -0800
614ff3bc20

Merge pull request #79 from danieldupriest/mega-bug-fix rupikad 2019-02-14 17:54:40 -0800