mike cullerton
f8878e0f77
Committing so Jon can view code
2022-10-27 10:41:44 -04:00
burnettk
bc3f0d9e20
Merge commit '00dc4e149d8396e54d0bbfa77915a57ab8aa972e'
2022-10-26 13:42:08 -04:00
burnettk
5e58904238
Merge commit 'd7e8533061a995595f520f31f7d4b56440078f5b'
2022-10-25 17:38:59 -04:00
jasquat
b6d65fe2f6
Merge commit 'e228ab4b80138b3e943b11774c1fd47957ea7562'
2022-10-25 16:55:11 -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
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
Dan
53a733e05b
Merge commit 'eff49e1ddb2e70d62e45866b429a1350443107d0' into main
2022-10-25 11:53:09 -04:00
Dan
1fcceaf264
Merge commit 'ac929cbae7717affed5fa357a56cf1a0256289d5' into main
2022-10-25 11:25:20 -04:00
burnettk
50a4c2c2e0
Merge commit '9a1e33696a744527a18dbec667140edb4038ac94'
2022-10-21 17:51:39 -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
Dan
2870b98150
Merge commit 'c5a2f8b16c9a614b944a6e4610594eba1dac7b9f' into main
2022-10-21 16:18:25 -04:00
jasquat
f9a1003a88
resolved merge conflicts in backend w/ burnettk
2022-10-21 10:38:13 -04:00
jbirddog
5af593e8af
Pause/resume process instances ( #2 )
...
Collab with @cullerton
2022-10-20 16:44:08 -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
c6c196812b
Merge commit '4fdb0f3ec4b3b6a68cc2e56ed84ffb6dc2743068'
2022-10-19 19:32:59 -04:00
burnettk
35e94ad968
Merge commit 'a166df83031cb88d223e5c75ae8db8c896622821'
2022-10-19 15:17:17 -04:00
burnettk
d108c79d26
Merge commit '9781908243408ed221f2b0131a00b8a9612f81f3'
2022-10-19 10:31:35 -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