Commit Graph

116 Commits

Author SHA1 Message Date
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
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
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
burnettk 79718ad7c4 re-order imports the way backend always used to 2022-10-31 09:25:35 -04:00
jasquat c63e9cf521 pyl passes w/ burnettk 2022-10-27 15:38:04 -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
Jon Herron 2aba139f59 Merge commit '999e0f4d2b7a3c3665feb806fd4f00dc50f2de8e' 2022-10-25 14:20:02 -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
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
jasquat 1bc549f3df Merge commit '64e7049c9a0a4360101a155a41ce64ae692acd3c' 2022-10-18 16:41:10 -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