Commit Graph

13 Commits

Author SHA1 Message Date
mike cullerton fdbe8ade6e Merge branch 'main' into feature/nested-groups
# Conflicts:
#	spiffworkflow-backend/src/spiffworkflow_backend/api.yml
#	spiffworkflow-backend/src/spiffworkflow_backend/models/process_instance_report.py
#	spiffworkflow-backend/src/spiffworkflow_backend/routes/process_api_blueprint.py
#	spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py
#	spiffworkflow-backend/tests/spiffworkflow_backend/unit/test_spec_file_service.py
#	spiffworkflow-frontend/src/routes/ProcessInstanceList.tsx
#	spiffworkflow-frontend/src/routes/ProcessInstanceReportList.tsx
#	spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx
#	spiffworkflow-frontend/src/routes/ProcessModelShow.tsx
2022-11-08 14:09:03 -05:00
Dan 3a9b7661e0 Merge commit '39f9dcba4d497b121ef7f24e58e735b62b0e03d4' into main 2022-11-07 14:35:45 -05:00
mike cullerton 23517b8953 Merge branch 'main' into feature/nested-groups
# Conflicts:
#	spiffworkflow-backend/src/spiffworkflow_backend/models/process_model.py
#	spiffworkflow-backend/src/spiffworkflow_backend/services/process_instance_processor.py
#	spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py
2022-11-07 10:56:37 -05:00
mike cullerton aeea99c0ff started test for test_script_unit_test_run 2022-11-07 10:34:14 -05:00
mike cullerton 43eb0284ce Fix urls for uspend and resume endpoints 2022-11-06 14:23:16 -05:00
jasquat 1579fb177d Merge commit '95d9dbf036f09b62054c04a64d5c7a9e3002173c' 2022-11-02 14:17:16 -04:00
jasquat 592c4fc49c added script to get the group members w/ burnettk 2022-10-31 11:39:54 -04:00
jasquat e782fcee78 Merge commit 'b9d7ded29b64c9d3b66ae97e966e019fe0537b62' 2022-10-27 10:50:50 -04:00
Mike Cullerton 4a2d37316c
Merge pull request #7 from sartography/feature/get-local-time
Feature  get_localtime script
2022-10-26 11:06:06 -04:00
burnettk 6fa370091f Merge commit 'd7e8533061a995595f520f31f7d4b56440078f5b' 2022-10-25 17:38:59 -04:00
mike cullerton 897c8ee9b9 Added `get_localtime` script
Added test for new script, with test process
2022-10-25 15:56:48 -04:00
jasquat 4d48e0fb90 Merge commit 'f0b608789b6cdc3ef4303efac053746c98571a48' 2022-10-21 16:28:09 -04:00
Jon Herron 66e3f52c24 Merge commit '883e65384f1e36a0310f4fdcff57ac486890cd5e' as 'spiffworkflow-backend' 2022-10-12 10:22:22 -04:00