Commit Graph

44 Commits

Author SHA1 Message Date
mike cullerton b646fa98bd 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
jasquat 9d4e096a5d return next task when running an instance w/ burnettk 2022-11-08 12:36:11 -05:00
jbirddog 8b47cf49fb First pass at custom report/perspective for Process Instance List (#23) 2022-11-08 09:26:42 -05:00
mike cullerton 43069236d1 remove process_group_identifier from process-instances endpoint 2022-11-07 17:25:04 -05:00
Dan d1e612e7d2 Merge commit '39f9dcba4d497b121ef7f24e58e735b62b0e03d4' into main 2022-11-07 14:35:45 -05:00
mike cullerton 19bbc0da92 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 9d6d6cf2af started test for test_script_unit_test_run 2022-11-07 10:34:14 -05:00
mike cullerton d6ad90ac15 Fix url in test 2022-11-06 15:09:56 -05:00
mike cullerton 0dad6788ff Fix urls for uspend and resume endpoints 2022-11-06 14:23:16 -05:00
burnettk 921fc04d29 Merge remote-tracking branch 'origin/main' into feature/carbon_ui 2022-11-04 18:33:07 -04:00
jasquat 57cc5f732b pyl is passing w/ burnettk 2022-11-04 11:03:40 -04:00
burnettk 061953b806 Merge commit 'a0b923c9ad98d07d3cf46dca689a01b13d41aa02' 2022-11-04 09:33:44 -04:00
jasquat 7fffa650b0 some more updates for group forms w/ burnettk 2022-11-03 15:55:50 -04:00
jbirddog 09ac38291e From the logs, allow viewing a diagram in a previous state (#15)
Co-authored-by: Elizabeth Esswein <elizabeth.esswein@gmail.com>
2022-11-02 14:34:59 -04:00
jasquat dbb011c911 Merge commit '95d9dbf036f09b62054c04a64d5c7a9e3002173c' 2022-11-02 14:17:16 -04:00
mike cullerton 013489105d fixed failing test 2022-11-01 16:58:53 -04:00
mike cullerton 89d73614af Merge branch 'main' into feature/nested-groups 2022-11-01 16:49:55 -04:00
mike cullerton 4edf96ae76 First stab at nested folders.
Added temp endpoints
Changes to tests and test helpers
2022-11-01 16:48:04 -04:00
jasquat fe54014107 added script to get the frontend url w/ burnettk 2022-10-31 11:50:14 -04:00
jasquat 35eb15b793 added script to get the group members w/ burnettk 2022-10-31 11:39:54 -04:00
burnettk 79718ad7c4 re-order imports the way backend always used to 2022-10-31 09:25:35 -04:00
jasquat 93526cadfd added script to get the process info and do not set error message when a task fails from the frontend w/ burnettk 2022-10-28 16:46:09 -04:00
jasquat c63e9cf521 pyl passes w/ burnettk 2022-10-27 15:38:04 -04:00
mike cullerton 586ed3166f Don't need parent. Just use the whole path for the group id 2022-10-27 11:47:53 -04:00
jasquat f2aa518830 Merge commit 'b9d7ded29b64c9d3b66ae97e966e019fe0537b62' 2022-10-27 10:50:50 -04:00
mike cullerton f8878e0f77 Committing so Jon can view code 2022-10-27 10:41:44 -04:00
Mike Cullerton 9d43fd1aab Merge pull request #7 from sartography/feature/get-local-time
Feature  get_localtime script
2022-10-26 11:06:06 -04:00
burnettk 5e58904238 Merge commit 'd7e8533061a995595f520f31f7d4b56440078f5b' 2022-10-25 17:38:59 -04:00
burnettk cef27d43a0 Merge commit '1f25521506a6ed4caef400a13903af86a7eb83d2' 2022-10-25 16:54:06 -04:00
mike cullerton c9b95af89a mypy 2022-10-25 16:47:40 -04:00
mike cullerton 4002ac1a70 Added `get_localtime` script
Added test for new script, with test process
2022-10-25 15:56:48 -04:00
Jon Herron 2aba139f59 Merge commit '999e0f4d2b7a3c3665feb806fd4f00dc50f2de8e' 2022-10-25 14:20:02 -04:00
Mike Cullerton 6b741de900 Refresh token (#6)
* Handle refreshed tokens if present

* Small cleanup

* No longer require secrets to be modified by the user that created them
Rename creator_user_id column to user_id

Co-authored-by: Jon Herron <jon.herron@yahoo.com>
Co-authored-by: mike cullerton <michaelc@cullerton.com>
2022-10-25 14:12:32 -04:00
jasquat a4305764a1 Merge commit '2b702661f3bd9b79de887e82e5a5925d07341eb6' 2022-10-21 16:46:41 -04:00
jasquat 8ebf524c12 Merge commit 'f0b608789b6cdc3ef4303efac053746c98571a48' 2022-10-21 16:28:09 -04:00
jasquat f9a1003a88 resolved merge conflicts in backend w/ burnettk 2022-10-21 10:38:13 -04:00
burnettk f7557c48e9 Merge commit '4a48d9cccd1ca8619b3dbef3c10bcce667c9d9e0' 2022-10-20 16:00:12 -04:00
burnettk dce7ad5080 Merge commit 'c661100e03eef762cb51b02be1b309ec47be7002' 2022-10-20 07:19:24 -04:00
burnettk 35e94ad968 Merge commit 'a166df83031cb88d223e5c75ae8db8c896622821' 2022-10-19 15:17:17 -04:00
jasquat 1bc549f3df Merge commit '64e7049c9a0a4360101a155a41ce64ae692acd3c' 2022-10-18 16:41:10 -04:00
burnettk 37decafb7d Merge commit '4f0f5b1ece069ec56f8eb4154d61334a321749a1' 2022-10-18 07:09:34 -04:00
Jon Herron 789b2345fd Merge commit '93dbce681ec89bc45479748aaae06ddd92b64da4' 2022-10-13 20:45:04 -04:00
Jon Herron 7ec037bbde Merge main, resolve conflicts 2022-10-12 15:32:33 -04:00
Jon Herron c30d6bbe1e Merge commit '883e65384f1e36a0310f4fdcff57ac486890cd5e' as 'spiffworkflow-backend' 2022-10-12 10:22:22 -04:00