d0f380e224
Uses Python 3.6.9
2020-05-20 16:49:55 -04:00
595364b415
Merge branch 'ec2/dev' into dev
2020-05-20 16:34:53 -04:00
29b1d43006
Merge branch 'dev' into rrt/testing
2020-05-20 16:34:21 -04:00
b915794000
Fixes more paths.
2020-05-20 15:57:54 -04:00
de7cebbd7d
o
2020-05-20 15:32:40 -04:00
616a47bd10
Fixes file paths
2020-05-20 15:17:03 -04:00
5f793db606
It is critical that the Pipfile python version matches the python version on the server.
2020-05-20 15:07:16 -04:00
865188795f
Adds git. Purges apt cache after
2020-05-20 15:04:41 -04:00
97130e504a
Adds git
2020-05-20 14:57:03 -04:00
91a228d3f4
Trying to slim down the size of the image
2020-05-20 14:33:39 -04:00
2c407ae607
adding requirements.txt and a way to regenerate it.
2020-05-20 14:21:39 -04:00
57615edde3
adding wsgi configuration.
2020-05-20 14:01:09 -04:00
8647ebee42
Moving spiff back to master branch, with fixes for parallel, and performance improvements.
2020-05-20 10:57:20 -04:00
976285fa3b
Merge pull request #72 from sartography/testing
...
Testing
2020-05-20 10:45:00 -04:00
3e50b992a2
Merge pull request #71 from sartography/dev
...
Dev
2020-05-20 10:16:01 -04:00
51ece390f3
Merge branch 'testing' into dev
2020-05-20 10:03:41 -04:00
3808786f11
Merge branch 'rrt/dev' into dev
2020-05-20 10:02:44 -04:00
48f9873548
Adding yet another flush, because Travis builds keep failing due to database race condition issues in this method.
2020-05-20 10:02:30 -04:00
b8dc8bd24e
Merge pull request #70 from sartography/staging
...
Staging
2020-05-20 09:28:38 -04:00
c6de4a60e7
Merge pull request #69 from sartography/testing
...
Testing
2020-05-20 09:02:09 -04:00
6f60b04b98
Merge pull request #68 from sartography/dev
...
Dev
2020-05-20 08:45:16 -04:00
e454993f6e
Merge branch 'testing' into dev
2020-05-20 00:14:51 -04:00
9fd3e8f1a5
Merge pull request #67 from sartography/rrt/dev
...
Rrt/dev
2020-05-20 00:14:21 -04:00
fc63d26322
Merge pull request #66 from sartography/feature/docx_images
...
Feature/docx images
2020-05-20 00:13:50 -04:00
58189285ad
Cleans up
2020-05-20 00:12:48 -04:00
2b5687c3a3
Fixes pernicious bug where template document versions were not being updated properly, and template completion script was not honoring version numbers
2020-05-20 00:10:32 -04:00
481a9ed04c
Gets image ids from task data and Injects images into jinja docx
2020-05-19 21:51:54 -04:00
2f86a25032
Merge pull request #65 from sartography/feature/ldap_lookup
...
Quick cleanup, adding a space
2020-05-19 16:24:40 -04:00
c4f2bd8dc6
Quick cleanup, adding a space
2020-05-19 16:23:20 -04:00
66a3304541
Merge pull request #63 from sartography/feature/ldap_lookup
...
ldap lookup.
2020-05-19 16:22:02 -04:00
951710d762
ldap lookup.
...
Refactored calls into a new lookup_service to keep things tidy.
New keys for all enum/auto-complete fields:
PROP_OPTIONS_FILE = "spreadsheet.name"
PROP_OPTIONS_VALUE_COLUMN = "spreadsheet.value.column"
PROP_OPTIONS_LABEL_COL = "spreadsheet.label.column"
PROP_LDAP_LOOKUP = "ldap.lookup"
FIELD_TYPE_AUTO_COMPLETE = "autocomplete"
2020-05-19 16:11:43 -04:00
d93a954309
Merge pull request #62 from sartography/staging
...
Staging
2020-05-18 21:53:56 -04:00
62ed26e968
Merge pull request #61 from sartography/testing
...
Testing
2020-05-18 21:36:51 -04:00
1944dbc9c4
Merge pull request #60 from sartography/dev
...
Dev
2020-05-18 21:20:28 -04:00
20ce052e7b
Merge branch 'testing' into dev
2020-05-18 21:03:22 -04:00
a35229c954
Merge branch 'rrt/dev' into dev
2020-05-18 21:02:02 -04:00
dff92c6e4c
fixing a test.
2020-05-18 20:49:50 -04:00
30bd6bef08
Another nav fix from spiff.
2020-05-18 18:27:30 -04:00
ecaac76fa5
More nav fixes via spiffworkflow.
2020-05-18 15:44:28 -04:00
26a8b633d1
Merge pull request #59 from sartography/dev
...
Dev
2020-05-18 13:20:47 -04:00
16b96eade5
Merge branch 'rrt/dev' into dev
2020-05-18 13:10:31 -04:00
5c5c2a7312
Assure that new lines entered in text-fields are correctly added to the final word document.
2020-05-18 11:55:10 -04:00
5f2331f081
Bumping w/ fixes in spiffworkflow for reset token.
2020-05-18 06:56:29 -04:00
7ce460fffc
using a branch of spiffworkflow that fixes a deep recursion issue - this isn't perfect, but it's miles better than it was.
2020-05-17 17:06:00 -04:00
c456b3cdfd
Merge pull request #47 from sartography/testing
...
Testing
2020-05-17 14:00:49 -04:00
fc080ce7a8
Don't reset the token to something that already has a token. Terrible things happen and we hit a recursion.
2020-05-17 13:29:36 -04:00
d62c173494
Updating with new changes to the spiffworkflow navigation.
2020-05-17 11:57:04 -04:00
f3c3d3c44e
Merge pull request #58 from sartography/testing
...
Testing
2020-05-16 16:08:23 -04:00
ed7b427af4
Merge pull request #57 from sartography/feature/navigation
...
Feature/navigation
2020-05-16 16:01:43 -04:00
fafdf56ad2
Merge remote-tracking branch 'origin/testing' into feature/navigation
2020-05-16 15:46:14 -04:00
Aaron Louie
Dan Funk
Aaron Louie