Aaron Louie
3808786f11
Merge branch 'rrt/dev' into dev
2020-05-20 10:02:44 -04:00
Aaron Louie
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
Aaron Louie
6f60b04b98
Merge pull request #68 from sartography/dev
...
Dev
2020-05-20 08:45:16 -04:00
Aaron Louie
e454993f6e
Merge branch 'testing' into dev
2020-05-20 00:14:51 -04:00
Aaron Louie
9fd3e8f1a5
Merge pull request #67 from sartography/rrt/dev
...
Rrt/dev
2020-05-20 00:14:21 -04:00
Aaron Louie
fc63d26322
Merge pull request #66 from sartography/feature/docx_images
...
Feature/docx images
2020-05-20 00:13:50 -04:00
Aaron Louie
58189285ad
Cleans up
2020-05-20 00:12:48 -04:00
Aaron Louie
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
Aaron Louie
481a9ed04c
Gets image ids from task data and Injects images into jinja docx
2020-05-19 21:51:54 -04:00
Dan Funk
2f86a25032
Merge pull request #65 from sartography/feature/ldap_lookup
...
Quick cleanup, adding a space
2020-05-19 16:24:40 -04:00
Dan Funk
c4f2bd8dc6
Quick cleanup, adding a space
2020-05-19 16:23:20 -04:00
Dan Funk
66a3304541
Merge pull request #63 from sartography/feature/ldap_lookup
...
ldap lookup.
2020-05-19 16:22:02 -04:00
Dan Funk
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
Aaron Louie
d93a954309
Merge pull request #62 from sartography/staging
...
Staging
2020-05-18 21:53:56 -04:00
Aaron Louie
62ed26e968
Merge pull request #61 from sartography/testing
...
Testing
2020-05-18 21:36:51 -04:00
Aaron Louie
1944dbc9c4
Merge pull request #60 from sartography/dev
...
Dev
2020-05-18 21:20:28 -04:00
Aaron Louie
20ce052e7b
Merge branch 'testing' into dev
2020-05-18 21:03:22 -04:00
Aaron Louie
a35229c954
Merge branch 'rrt/dev' into dev
2020-05-18 21:02:02 -04:00
Dan Funk
dff92c6e4c
fixing a test.
2020-05-18 20:49:50 -04:00
Dan Funk
30bd6bef08
Another nav fix from spiff.
2020-05-18 18:27:30 -04:00
Dan Funk
ecaac76fa5
More nav fixes via spiffworkflow.
2020-05-18 15:44:28 -04:00
Aaron Louie
26a8b633d1
Merge pull request #59 from sartography/dev
...
Dev
2020-05-18 13:20:47 -04:00
Aaron Louie
16b96eade5
Merge branch 'rrt/dev' into dev
2020-05-18 13:10:31 -04:00
Dan Funk
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
Dan Funk
5f2331f081
Bumping w/ fixes in spiffworkflow for reset token.
2020-05-18 06:56:29 -04:00
Dan Funk
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
Aaron Louie
c456b3cdfd
Merge pull request #47 from sartography/testing
...
Testing
2020-05-17 14:00:49 -04:00
Dan Funk
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
Dan Funk
d62c173494
Updating with new changes to the spiffworkflow navigation.
2020-05-17 11:57:04 -04:00
Dan Funk
f3c3d3c44e
Merge pull request #58 from sartography/testing
...
Testing
2020-05-16 16:08:23 -04:00
Dan Funk
ed7b427af4
Merge pull request #57 from sartography/feature/navigation
...
Feature/navigation
2020-05-16 16:01:43 -04:00
Dan Funk
fafdf56ad2
Merge remote-tracking branch 'origin/testing' into feature/navigation
2020-05-16 15:46:14 -04:00
Dan Funk
8a6c0a62f7
Merge pull request #55 from sartography/feature/navigation
...
Fixing a bug with navigation where elements went missing past exclusi…
2020-05-16 15:45:23 -04:00
Dan Funk
7a380fdeb4
Forgot to fix another test and to add the example file used for a previous test.
2020-05-16 15:38:15 -04:00
Dan Funk
43bf8f5337
Fixing a bug with navigation where elements went missing past exclusive gateways on subsequent forks.
2020-05-16 15:33:06 -04:00
Aaron Louie
6828bd777c
Merge pull request #54 from sartography/dev
...
Dev
2020-05-16 13:43:11 -04:00
Aaron Louie
6a5ba54957
Merge branch 'testing' into dev
2020-05-16 13:15:37 -04:00
Aaron Louie
4ed62121b9
Merge branch 'rrt/dev' into dev
2020-05-16 13:14:52 -04:00
Aaron Louie
daaa7be4ba
Corrects typo
2020-05-16 13:13:49 -04:00
Aaron Louie
c537325a98
Merge pull request #53 from sartography/dev
...
Dev
2020-05-16 12:50:04 -04:00
Aaron Louie
a8486fbbb3
Merge branch 'testing' into dev
2020-05-16 11:44:27 -04:00
Aaron Louie
d38da4d063
Merge branch 'dev' into rrt/dev
2020-05-16 11:40:18 -04:00
Aaron Louie
183a2c5d66
Run flask on PORT_0 environment variable, if defined.
2020-05-16 11:39:45 -04:00
Aaron Louie
091a1729f8
Removes CORS logging. Allows only specific origins
2020-05-16 11:36:48 -04:00
Aaron Louie
810ee17be1
Merge pull request #52 from sartography/dev
...
Allows port to be set via environment variable
2020-05-15 22:03:06 -04:00
Aaron Louie
01377bd2bf
Merge branch 'dev' into rrt/dev
2020-05-15 21:47:20 -04:00
Aaron Louie
fd7a371aa0
Merge branch 'testing' into dev
2020-05-15 21:45:59 -04:00
Aaron Louie
bf563e177b
Allows port to be set via environment variable
2020-05-15 21:32:33 -04:00
Aaron Louie
6a0973d5d5
Merge pull request #50 from sartography/dev
...
Dev
2020-05-15 20:19:55 -04:00
Aaron Louie
715a43f517
Merge branch 'testing' into dev
2020-05-15 19:03:27 -04:00
