Commit Graph

431 Commits

Author SHA1 Message Date
burnettk 0c5e4500c1 lint and regen schema 2022-12-22 21:15:10 -05:00
jasquat 41c18ea4ec added test to check only privileged users can call refresh_permissions w/ burnettk 2022-12-22 17:12:21 -05:00
jasquat 4f1054c307 pyl passes w/ burnettk 2022-12-22 16:42:52 -05:00
jasquat 99e8dccd6e added script to refresh permissions w/ burnettk 2022-12-22 16:14:52 -05:00
jasquat 3de31af94f pyl w/ burnettk 2022-12-22 12:32:26 -05:00
jasquat 8816f43b5e added script to get all permissions for the confirmation page when adding permissions from a process model w/ burnettk 2022-12-22 12:20:34 -05:00
jasquat 4e4d415c58 added test to for permission to process group w/ burnettk 2022-12-22 10:46:40 -05:00
jasquat f7a60e0dfe fixed slashes to colons in permission macros w/ burnettk 2022-12-22 10:34:19 -05:00
jasquat b2885159bd pyl 2022-12-22 09:59:55 -05:00
jasquat 82d67bacc3 added ALL macro for easier use with admin groups and some failure test cases 2022-12-22 09:57:13 -05:00
jasquat c00252815d added remaining tests for current permission macros 2022-12-22 09:29:31 -05:00
jasquat 5def5acdf8 added test for perm macros w/ burnettk 2022-12-21 17:38:56 -05:00
jasquat 53036f76c3 minor tweak to test bpmn w/ burnettk 2022-12-21 13:51:49 -05:00
jasquat 36c395e074 do not force permissions to use the v1.0 path prefix but it can be used if desired w/ burnettk 2022-12-21 12:13:33 -05:00
jasquat 4ddc99527a pyl w/ burnettk 2022-12-21 11:42:45 -05:00
jasquat fcc79e639a added permission to run privileged scripts w/ burnettk 2022-12-21 11:24:38 -05:00
jasquat e6d04ecc1a pyl fixed w/ burnettk 2022-12-20 16:14:55 -05:00
jasquat 33d9b6660e pyl w/ burnettk 2022-12-20 15:47:30 -05:00
jasquat b51f9ba5a1 merged in main and resolved conflicts w/ burnettk 2022-12-20 15:06:34 -05:00
jasquat c1ad29f518 set the completed by user on human task w/ burnettk 2022-12-20 14:58:15 -05:00
jasquat 4e13d8f2cb added remaining filter tests w/ burnettk 2022-12-20 14:39:04 -05:00
jasquat 0de462ae63 added another filter test 2022-12-20 13:50:09 -05:00
jasquat 313e01f836 added test for report filters w/ burnettk 2022-12-20 12:29:14 -05:00
jasquat 2ada0814b1 renamed test process instance create method w/ burnettk 2022-12-20 11:19:04 -05:00
jasquat 9687c3d1ea some initial changes to refactor report filters w/ burnettk 2022-12-20 11:16:06 -05:00
Elizabeth Esswein fed2062ccf fix conflicts for like the thousandth time 2022-12-20 10:41:45 -05:00
jasquat 5b11804f5f renamed active task to human task since we are no longer deleting them w/ burnettk 2022-12-19 16:23:02 -05:00
Elizabeth Esswein c2f8cec700 fix conflicts yet again 2022-12-19 15:28:44 -05:00
Elizabeth Esswein e5cefcea80 fix typing problem 2022-12-19 14:01:52 -05:00
jasquat 0d69029292 updates to disallow modifying a process instance when it is not in the correct state w/ burnettk 2022-12-19 12:55:25 -05:00
Elizabeth Esswein 01fed4758d add integration tests for process nav endpoints 2022-12-19 11:33:48 -05:00
Dan fcc593ea6b Fixing some tests. 2022-12-19 10:09:19 -05:00
Dan 170d9c3098 Adding tests for the user service , and closing a few logic errors. Adding support for a single wild card for matching all users. 2022-12-19 10:05:19 -05:00
Dan 55bac8eb27 Merge remote-tracking branch 'origin/main' into feature/bpmn_user_permissions 2022-12-16 15:25:10 -05:00
jasquat e3b0d59cd0 fix broken unit tests in backend 2022-12-15 14:57:07 -05:00
Dan 6ca754f8a4 When loading permissions and the user does not exist, add records to the UserGroupAssignmentWaiting table that can be picked up later.
Request "profile" scope over OpenID so we can get a few more bits of information when avilable.
Add a "clear_perissions" script
Add an "add_permissions" script
Add an "add_permissions" script
When logging in for the first time, check for any awaiting permissions and assign them.
Add "enumerate" as a whitelisted function to React Schema
Add a "display_name" to the user table

Add a test for adding a new permission
Add a test for adding a user to group
Adding a test for deleting all permissions.
Adding a display name for the user table
2022-12-15 14:40:31 -05:00
Dan 1e71892999 Merge remote-tracking branch 'origin/unit_test_404' into feature/bpmn_user_permissions 2022-12-15 07:19:19 -05:00
Dan b94e0f7266 Assure our open-id system can return emails.
Update our data from Open ID Systems when users log in
2022-12-13 08:14:44 -05:00
Dan 552229110c Removing two fields from user table that were not used (uid, name)
Request email from open id clients, as this would provide a handy way to uniquely reference users when assigning to groups.
During Login do a lookup on email if possible -- so that permissions assignments based on email can be connected when sigining in through openid.
Don't use "open_id" for the service name on user accounts, use the iss string provided through open id,  this will allow us to support more than one open id platform.
Update the KeyCloak configuration so it is able to return email addresses for users -- which will make permission assignment easier in the future.
Removed several unused commands in the user_service class.
2022-12-12 15:43:19 -05:00
jasquat 518a6e1606 pyl 2022-12-12 15:36:03 -05:00
jasquat 85be6db77c added test to get the diagram for a given process instance call activity 2022-12-12 15:33:31 -05:00
jasquat 14be1fa06b strip off spaces from git service command stdout 2022-12-12 10:05:08 -05:00
burnettk 5394241f2b comment out test not working in CI 2022-12-10 23:35:56 -05:00
burnettk 87a93b2d4c indicate main explicitly for ci 2022-12-10 22:50:52 -05:00
jasquat 6122fb0ae5 added secret verification to webhook endpoint w/ burnettk 2022-12-09 16:51:00 -05:00
jasquat d7221690f0 fixed broken test w/ burnettk 2022-12-09 15:19:43 -05:00
jasquat 27099a0d8e mypy w/ burnettk cullerton 2022-12-08 17:12:19 -05:00
jasquat 62814da9a6 added git creds for pushing on publish w/ burnettk cullerton 2022-12-08 16:39:23 -05:00
jasquat 803835e76d merged in main and resolved conflicts w/ burnettk cullerton 2022-12-08 15:31:25 -05:00
jasquat ab430b5843 pyl passes 2022-12-08 13:47:30 -05:00
jasquat 375e4023dd added new notification component that allows links based on carbons w/ burnettk cullerton 2022-12-08 12:28:23 -05:00
Dan d80e4b3456 Merge branch 'main' into feature/create_containers 2022-12-06 18:06:09 -05:00
mike cullerton 3b0e97a380 Merge branch 'main' into feature/git-integration
# Conflicts:
#	spiffworkflow-backend/tests/spiffworkflow_backend/integration/test_process_api.py
2022-12-06 16:27:36 -05:00
mike cullerton cfe4c521c8 Merging this unfinished test so I don't lose it.
It doesn't test anything yet.
Need to deal w/ a bunch of mock stuff
2022-12-06 16:14:46 -05:00
jasquat 731bf6737d cleaned up more api routes for permissions w/ burnettk 2022-12-05 16:06:08 -05:00
jasquat 688163a1a8 pyl w/ burnettk 2022-12-05 14:10:07 -05:00
Dan 88a94ec6da running py_pl -- mainly reordering imports. 2022-12-05 12:29:19 -05:00
jasquat ebcc523871 added support to order reports by given column and metadata headers w/ burnettk 2022-12-05 10:59:27 -05:00
Dan 698cbc81c9 Fixes based off KB's super kind review.
-------
* Remove unnecessary packages from dockerfile for the demo-connect proxy.
* Rename an environment variable that mentioned Status.im in what is now a generic connector.
* Fixed a spelling mistake.
2022-12-05 10:46:26 -05:00
burnettk 92bdbf8761 test for automatic saving of process instance metadata on instance save 2022-12-04 22:35:16 -05:00
burnettk c1373f521e remove dup test process model 2022-12-04 14:40:34 -05:00
burnettk 612d26a38b add order_by to make this query deterministic 2022-12-03 20:16:20 -05:00
burnettk 981ceca4e3 lint 2022-12-03 11:24:21 -05:00
burnettk 698c39d9e5 add extraction, needs test 2022-12-02 17:15:22 -05:00
burnettk b1b7f322ee fix tests 2022-12-02 16:53:01 -05:00
jasquat ed5095ca37 using an array for metadata extraction paths now instead of dictionaries w/ burnettk 2022-12-02 16:03:43 -05:00
jasquat 04bf91a0d2 added some support to add process model metadata. need to fix frontend w/ burnettk 2022-12-02 15:46:05 -05:00
Dan 8d54f1582f I can't say I love flake8.
Removing dependency on rust (monkeytype)
2022-12-01 16:23:03 -05:00
Dan e0dc3d19b5 fixing some typing issues, white space, etal... 2022-12-01 15:01:25 -05:00
Dan 186727e371 Reorder config imports so that instance config is dead last - and can override everything else.
Updated docker-compose for running a demo.
run_pyl fixes
2022-12-01 14:13:22 -05:00
Dan 7e3daaab3d A little cleanup of the ui
Don't check authorization on static assets
Do not require unique username on user table (uniqueness check is on the service and service id composite.)
2022-12-01 12:12:37 -05:00
jasquat acc33288b9 added correlations to message list table w/ burnettk 2022-11-30 15:08:04 -05:00
Dan 975b961632 Adding a blueprint for openid - a very lightweight embedded authentication system to make it eaiser to try out SpiffWorkflow when you don't have openID set up with Google etal.
Removing all calls to open id's user_info endpoint - as these are unncessiary.
Adding a users section to the permission files -- so we can handle all user/group/permissions in one file when needed.
There was a very confusing is_admin function on the user model that needed killin.
2022-11-30 11:32:55 -05:00
jasquat 258b478954 added api to get list of process report columns 2022-11-29 17:32:29 -05:00
jasquat 88c6d625bb some cleanup for metadata w/ burnettk 2022-11-29 16:19:55 -05:00
jasquat 33b9e5b943 metadat reports work w/ burnettk 2022-11-29 16:09:55 -05:00
jasquat 385e8cea2b WIP more metadata reporting w/ burnettk 2022-11-29 15:59:46 -05:00
jasquat 0268d279e3 some basics to add metadata to reports w/ burnettk cullerton 2022-11-28 17:03:00 -05:00
jasquat 54a04a38d9 fixed issue ensuring active tasks are up to date w/ burnettk cullerton 2022-11-28 15:47:56 -05:00
jasquat d12e606c84 added script to save process instance metadata and fixed permissions issue w/ burnettk cullerton 2022-11-28 15:26:50 -05:00
burnettk ecee3c4548 lint 2022-11-25 00:46:43 -05:00
burnettk 069f717ee7 tests passing 2022-11-25 00:08:38 -05:00
burnettk fe4f3a6af4 gotta fix usage of is_model 2022-11-24 16:28:10 -05:00
burnettk 5f7182c5d6 working on tests 2022-11-24 13:01:53 -05:00
burnettk e9a09342d5 oh my god why were these ever instance methods 2022-11-24 12:38:41 -05:00
burnettk 37fcc547f7 remove column 2022-11-24 12:28:53 -05:00
burnettk 10d8156972 renames 2022-11-24 12:00:26 -05:00
burnettk f8e78d352d start adding display name and removing garbage 2022-11-24 11:51:31 -05:00
jasquat 1c9cee4081 updated breadcrumb to use display name w/ burnettk 2022-11-23 15:39:10 -05:00
jasquat ecf96166b1 created new users for keycloak and fixed some permissions for core user w/ burnettk cullerton 2022-11-22 13:01:08 -05:00
jasquat b49a1cd30f added recursive option to process model list to recurse or not and fix some ui components 2022-11-22 09:05:33 -05:00
mike cullerton 26cc8fd0a9 Merge branch 'main' into move-group-or-model 2022-11-21 15:56:44 -05:00
jasquat 95c0d96ee9 allow getting all process models, process instances should not save when they are initialized, and fixed some cypress tests w/ burnettk 2022-11-21 14:12:04 -05:00
mike cullerton 77a76a7529 use correct separator. 2022-11-21 12:05:25 -05:00
mike cullerton 788ee628d4 see if this solves the windows build problem 2022-11-21 08:36:39 -05:00
mike cullerton 0b6f6610b4 asst syntax cleanup 2022-11-19 15:45:13 -05:00
mike cullerton 3972e4ebe7 mypy 2022-11-19 15:24:37 -05:00
mike cullerton ed3efd6d07 test for move model 2022-11-19 14:47:50 -05:00
mike cullerton 03e454c685 process group move api endpoint 2022-11-19 13:24:40 -05:00
jasquat 67d6a01161 pyl is passing w/ burnettk cullerton 2022-11-18 16:45:44 -05:00
mike cullerton cf09b2258b precommit 2022-11-18 15:50:20 -05:00
jasquat 3640657c71 ran some pyl w/ burnettk cullerton 2022-11-18 15:06:02 -05:00
mike cullerton fe582261fe Cleanup - renaming frenzy, use os.path.abspath 2022-11-17 16:35:28 -05:00
mike cullerton 897615d0fd Rename CAT_JSON_FILE, WF_JSON_FILE, add_spec, update_spec 2022-11-17 12:08:42 -05:00
Jon Herron 1584f52a18 Merge branch 'main' of github.com:sartography/spiff-arena into send_filters 2022-11-16 13:52:03 -05:00
jasquat 21e3786377 fixed broken test w/ burnettk 2022-11-15 17:49:46 -05:00
jasquat 93d9aa845f pyl w/ burnettk 2022-11-15 17:38:37 -05:00
jasquat 56c8c0c633 added some permissions to the process model show page w/ burnettk 2022-11-15 17:35:16 -05:00
Dan Funk c2056071d5
Merge pull request #39 from sartography/feature/call_activity_selection
Feature/call activity selection
2022-11-15 16:23:50 -05:00
Dan d68b103116 Assure changes to process ids are updated in the cache on a file save,
and remove old references that no longer exist.  Still some work to do here.
2022-11-15 16:04:05 -05:00
Jon Herron b54b3dabb2 Getting ./bin/pyl to pass 2022-11-15 15:56:12 -05:00
Jon Herron 9fac3c2d54 filters to_dict 2022-11-15 15:45:55 -05:00
Dan Funk 7ad891bb6a
Merge pull request #38 from sartography/feature/call_activity_selection
Fixing a bug in SpiffWorkflow (new version in poetry.lock)
2022-11-15 15:06:31 -05:00
jasquat 74accb33ce pyl 2022-11-15 15:06:22 -05:00
jbirddog 3205b85f42
Merge process_instance_list query filters with report filters (#37) 2022-11-15 15:05:37 -05:00
Dan 3a1a25eba9 Fixing a bug in SpiffWorkflow (new version in poetry.lock)
fixing a test
2022-11-15 14:55:00 -05:00
jasquat b62955deaa added permission service to frontend to allow checking for permissions w/ burnettk 2022-11-15 14:40:35 -05:00
burnettk 4e8f8c5524 fix mypy typing stuff. w/ jasquat 2022-11-15 10:28:18 -05:00
burnettk fbc15c97fe run_pyl 2022-11-15 10:11:26 -05:00
Dan 2b300d0d4e Merge remote-tracking branch 'origin/main' into feature/call_activity_selection 2022-11-15 09:55:02 -05:00
Dan 055824b778 Adding a very simple api endpoint that just returns a list of every process known to the system. 2022-11-14 21:54:13 -05:00
Dan 36f5eef6cc Assure that the list of cached Spec References includes all Process Instances and DMNs (even those that are not primary) 2022-11-14 20:31:20 -05:00
jasquat d319e2a623 fixed failing tests w/ burnettk 2022-11-14 17:38:44 -05:00
jasquat b661c8f3c5 more refactoring for process instance list w/ burnettk 2022-11-14 17:35:04 -05:00
Dan 7d1d72290d Mostly a name change from BpmnProcessIdLookup to SpecReferenceCache. I landed on this unfortunate name because:
1. It's not just processes, it contains the list of all DMN Decisions as well.
2. It is closely linked to the SpecReference object that can be generated by looking through all the Spec files to find the processes and decisions they contain.
3. It is a cache of information, the file system is the source of truth.  Seems likely we will cache more things in the future -- so setting things up this way made sense.
2022-11-14 15:23:37 -05:00
jasquat a7c4088925 merged in main and resolved pyl issues w/ burnettk 2022-11-14 12:24:23 -05:00
Dan 2cdad7d492 work in spiff is approved and merged, updating dependency 2022-11-14 10:40:52 -05:00
burnettk 0ad11dcd2e lint and mypy 2022-11-12 22:07:30 -05:00
Dan 195c609d58 Adding a display name to the BPMN Process ID Lookup Table
Removing (very nearly, except for script unit tests) all the XML Parsing we were doing, see related PR on SpiffWorkflow
Moved the Custom Parser into its own file to solve some circular import issues
2022-11-12 12:36:07 -05:00
burnettk d25c37153a pyl 2022-11-11 11:39:15 -05:00
mike cullerton 1a6da88504 removed duplicate code 2022-11-11 08:17:50 -05:00
mike cullerton 677ffc4130 renamed and reordered some methods in base_test.py 2022-11-11 08:02:35 -05:00
mike cullerton 4cc5845971 Merge branch 'main' into feature/nested-groups-2
# Conflicts:
#	spiffworkflow-frontend/src/routes/ProcessGroupShow.tsx
2022-11-10 16:50:11 -05:00
mike cullerton 9679720b5a Delete groups now checks for running instances in nested models
also, pyl
2022-11-10 16:44:27 -05:00
jasquat bd42234891 use error as a status instead of faulted w/ burnettk 2022-11-10 15:55:17 -05:00
jasquat a544c10a09 Merge commit '127ef67f120ef4035a5f214f6b140488eca60a8d' 2022-11-09 17:01:17 -05:00
jbirddog 4a852a5b3b
Move to Python 3.11 (#27) 2022-11-09 13:45:16 -05:00
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
jasquat 005821a9ff return next task when running an instance w/ burnettk 2022-11-08 12:36:11 -05:00
jbirddog fc7bf31670
First pass at custom report/perspective for Process Instance List (#23) 2022-11-08 09:26:42 -05:00
mike cullerton 1f3f5dbc2e remove process_group_identifier from process-instances endpoint 2022-11-07 17:25:04 -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 fdfd45e64a Fix url in test 2022-11-06 15:09:56 -05:00
mike cullerton 43eb0284ce Fix urls for uspend and resume endpoints 2022-11-06 14:23:16 -05:00
burnettk eede34b564 Merge remote-tracking branch 'origin/main' into feature/carbon_ui 2022-11-04 18:33:07 -04:00
jasquat edfa95124a pyl is passing w/ burnettk 2022-11-04 11:03:40 -04:00
burnettk 4ec67848a4 Merge commit 'a0b923c9ad98d07d3cf46dca689a01b13d41aa02' 2022-11-04 09:33:44 -04:00
jasquat d46ac958a2 some more updates for group forms w/ burnettk 2022-11-03 15:55:50 -04:00
jbirddog 76fac5fb6d
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 1579fb177d Merge commit '95d9dbf036f09b62054c04a64d5c7a9e3002173c' 2022-11-02 14:17:16 -04:00
mike cullerton 442120d4ce fixed failing test 2022-11-01 16:58:53 -04:00
mike cullerton 912229a196 Merge branch 'main' into feature/nested-groups 2022-11-01 16:49:55 -04:00
mike cullerton 5f41828baf First stab at nested folders.
Added temp endpoints
Changes to tests and test helpers
2022-11-01 16:48:04 -04:00
jasquat f2477571c3 added script to get the frontend url w/ burnettk 2022-10-31 11:50:14 -04:00
jasquat 592c4fc49c added script to get the group members w/ burnettk 2022-10-31 11:39:54 -04:00
burnettk 6399978b23 re-order imports the way backend always used to 2022-10-31 09:25:35 -04:00
jasquat 28054e59cf 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 e26a91ff8c pyl passes w/ burnettk 2022-10-27 15:38:04 -04:00
mike cullerton 0642c16467 Don't need parent. Just use the whole path for the group id 2022-10-27 11:47:53 -04:00
jasquat e782fcee78 Merge commit 'b9d7ded29b64c9d3b66ae97e966e019fe0537b62' 2022-10-27 10:50:50 -04:00
mike cullerton 82bb4bac59 Committing so Jon can view code 2022-10-27 10:41:44 -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
burnettk 0e9f66e1ad Merge commit '1f25521506a6ed4caef400a13903af86a7eb83d2' 2022-10-25 16:54:06 -04:00
mike cullerton 2e3a5f579a mypy 2022-10-25 16:47:40 -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
Jon Herron 41ab09fc48 Merge commit '999e0f4d2b7a3c3665feb806fd4f00dc50f2de8e' 2022-10-25 14:20:02 -04:00
Mike Cullerton 043614a005
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 0939e31d7c Merge commit '2b702661f3bd9b79de887e82e5a5925d07341eb6' 2022-10-21 16:46:41 -04:00
jasquat 4d48e0fb90 Merge commit 'f0b608789b6cdc3ef4303efac053746c98571a48' 2022-10-21 16:28:09 -04:00
jasquat a55337102a resolved merge conflicts in backend w/ burnettk 2022-10-21 10:38:13 -04:00
burnettk 338c40ae48 Merge commit '4a48d9cccd1ca8619b3dbef3c10bcce667c9d9e0' 2022-10-20 16:00:12 -04:00
burnettk 01d39f31dd Merge commit 'c661100e03eef762cb51b02be1b309ec47be7002' 2022-10-20 07:19:24 -04:00
burnettk 2a1d8ee4e9 Merge commit 'a166df83031cb88d223e5c75ae8db8c896622821' 2022-10-19 15:17:17 -04:00
jasquat 228681f8e7 Merge commit '64e7049c9a0a4360101a155a41ce64ae692acd3c' 2022-10-18 16:41:10 -04:00
burnettk 37d1fa831a Merge commit '4f0f5b1ece069ec56f8eb4154d61334a321749a1' 2022-10-18 07:09:34 -04:00
Jon Herron 989281f554 Merge commit '93dbce681ec89bc45479748aaae06ddd92b64da4' 2022-10-13 20:45:04 -04:00
Jon Herron 5ceb2b49a1 Merge main, resolve conflicts 2022-10-12 15:32:33 -04:00
Jon Herron 66e3f52c24 Merge commit '883e65384f1e36a0310f4fdcff57ac486890cd5e' as 'spiffworkflow-backend' 2022-10-12 10:22:22 -04:00