kououken
|
6b7189d6cf
|
Preparing .gitignore to track .env file.
|
2019-03-08 17:00:16 -08:00 |
|
Daniel Dupriest
|
901102a304
|
Merge pull request #120: Add finalize and review buttons
Finalize and review buttons
|
2019-03-08 11:21:33 -08:00 |
|
Preston Doman
|
90f77f9ca1
|
Merge branch 'master' into finalize-and-review-buttons
|
2019-03-07 13:17:05 -08:00 |
|
Preston Doman
|
c7b7e8f1f5
|
Fix stuff
|
2019-03-07 13:16:46 -08:00 |
|
ppdom
|
318cb0a985
|
Merge pull request #118 from danieldupriest/FixesFor108
fixes for ticket #108 changed "true" to true
|
2019-03-07 12:59:18 -08:00 |
|
ppdom
|
59f7ca655b
|
Merge pull request #117 from danieldupriest/review_error_msg
Review error msg
|
2019-03-07 12:41:17 -08:00 |
|
Preston Doman
|
66bb614e74
|
Change order of alert and button update
|
2019-03-07 00:20:10 -08:00 |
|
Preston Doman
|
ec148d870d
|
Fix argument to animateButton
|
2019-03-06 23:26:55 -08:00 |
|
Preston Doman
|
84210d6dac
|
Add button animations
|
2019-03-06 23:13:09 -08:00 |
|
Preston Doman
|
729cce46b7
|
Resolve merge conflicts
|
2019-03-06 21:16:40 -08:00 |
|
Preston Doman
|
0c1e1c6359
|
Add finalize and submit for review buttons
|
2019-03-06 21:10:51 -08:00 |
|
Jack
|
dd83414b2f
|
fixes for ticket #108 changed "true" to true
|
2019-03-06 21:01:35 -08:00 |
|
Rupika
|
edece4092f
|
Merge branch 'master' into review_error_msg
|
2019-03-06 20:24:41 -08:00 |
|
Daniel Dupriest
|
024e5dae9c
|
Merge pull request #113: Add economy ticket question/rule to policy
Added economy class check to policy.py file.
|
2019-03-06 18:00:18 -08:00 |
|
sliang17
|
4a3cac48bd
|
Merge pull request #116 from danieldupriest/testing-mock
Implemented tests for create_report and get_report
|
2019-03-06 17:44:05 -08:00 |
|
Rupika
|
3dd95a1b12
|
modified db
|
2019-03-06 16:44:44 -08:00 |
|
joe-arriaga
|
fdc3ebad96
|
Update policy.py
|
2019-03-06 16:42:58 -08:00 |
|
Rupika
|
0388be6802
|
added error message for submitting after review report, and fixed some variable names to avoid overshadowing from outer scope
|
2019-03-06 16:39:34 -08:00 |
|
kououken
|
b40b6e450e
|
Changed test user to test_user_1, in case we need more.
|
2019-03-06 15:36:47 -08:00 |
|
kououken
|
ddeaef8894
|
Merge remote-tracking branch 'origin/master' into testing-mock
|
2019-03-06 15:25:11 -08:00 |
|
Daniel Dupriest
|
d8b9788c6f
|
Merge pull request #115 from danieldupriest/createCard-unit-tests
Create card unit tests
|
2019-03-06 15:18:37 -08:00 |
|
kououken
|
08e915d216
|
Emptied reports from database.
|
2019-03-06 15:12:23 -08:00 |
|
kououken
|
8fc4a2ba88
|
Implemented tests for create_report API and get_report helper function.
|
2019-03-06 15:10:18 -08:00 |
|
joe-arriaga
|
cbac519687
|
Update policy.py
|
2019-03-06 14:49:50 -08:00 |
|
Preston Doman
|
62cebfba0f
|
Move tests directory
|
2019-03-06 13:36:51 -08:00 |
|
joe-arriaga
|
f2943e1d69
|
Update policy.py
|
2019-03-06 09:50:52 -08:00 |
|
Preston Doman
|
7ec581b627
|
Finish displayListOfReports tests
|
2019-03-05 16:20:06 -08:00 |
|
Preston Doman
|
5ac57e88e2
|
Add displayListOfReports tests
|
2019-03-05 15:58:41 -08:00 |
|
rupikad
|
86055b38e2
|
Merge pull request #112 from danieldupriest/policy-tests
Implemented tests for all policy file rules and fixed more policy bugs
|
2019-03-04 16:52:40 -08:00 |
|
rupikad
|
5e8836f18c
|
Merge pull request #114 from danieldupriest/finalize_report_api
Finalize report api
|
2019-03-04 16:49:17 -08:00 |
|
Rupika
|
eec0af4211
|
fixed email subject line
|
2019-03-04 16:45:52 -08:00 |
|
Preston Doman
|
839edcf794
|
Add createReportForm tests
|
2019-03-04 15:34:03 -08:00 |
|
Preston Doman
|
f250e3adda
|
Add createCardFooter tests
|
2019-03-04 13:32:18 -08:00 |
|
Preston Doman
|
7a68ec8bac
|
Add createCollapsibleCard and createCollapsibleCardBody tests
|
2019-03-04 00:36:36 -08:00 |
|
Rupika
|
09813acf30
|
added review/final status to email subject
|
2019-03-03 15:16:38 -08:00 |
|
Rupika
|
c8286778bc
|
change report() function in views to create_report()
|
2019-03-03 14:46:12 -08:00 |
|
Rupika
|
dac67f8fc6
|
added finalize report api function & url
|
2019-03-03 12:59:26 -08:00 |
|
kououken
|
ea59dc6e69
|
Merge remote-tracking branch 'origin/master' into policy-tests
|
2019-03-03 01:09:46 -08:00 |
|
Daniel Dupriest
|
05f29b3584
|
Merge pull request #109 from danieldupriest/policy-error-handling
Policy error handling implemented
|
2019-03-03 01:08:52 -08:00 |
|
kououken
|
b0f41070ec
|
Refreshed database and added frank user.
|
2019-03-03 01:08:20 -08:00 |
|
kououken
|
a7a1a6c5a5
|
Merge branch 'section-approval'
|
2019-03-03 01:00:11 -08:00 |
|
kououken
|
2a62eb94b1
|
Made fresh database with frank user.
|
2019-03-03 00:59:44 -08:00 |
|
rupikad
|
914a35c7fb
|
Merge pull request #107 from danieldupriest/request-tracker-integration
Implement Request Tracker integration
|
2019-03-02 21:17:53 -08:00 |
|
Joe Arriaga
|
6cd7903555
|
Added economy class check to policy.py file.
|
2019-03-02 20:37:38 -08:00 |
|
kououken
|
8aab530293
|
Merge remote-tracking branch 'origin/master' into section-approval
|
2019-03-02 14:45:14 -08:00 |
|
kououken
|
00131ad41f
|
Merge remote-tracking branch 'origin/master' into policy-error-handling
|
2019-03-02 14:44:28 -08:00 |
|
kououken
|
3a73760ab4
|
Merge branch 'request-tracker-integration' of https://github.com/danieldupriest/reimbursinator into request-tracker-integration
|
2019-03-02 14:43:09 -08:00 |
|
kououken
|
c0c36b39e8
|
Merge remote-tracking branch 'origin' into request-tracker-integration
|
2019-03-02 14:40:41 -08:00 |
|
kououken
|
955909ce2b
|
Merge remote-tracking branch 'origin/master' into policy-tests
|
2019-03-02 14:11:32 -08:00 |
|
kououken
|
fd39ca7df7
|
Implemented tests for all policy rules.
|
2019-03-02 14:10:00 -08:00 |
|