burnettk
7c9f75d2e6
Merge commit '40d3199480eada37c57edb048169575ae0d3c02a'
2022-10-25 17:53:28 -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
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
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
6e9aef9263
Merge commit '65283df3cbfe95c6cd0d69e1cc0204d91c5d535b'
2022-10-24 22:35:36 -04:00
burnettk
f6a834d05c
Merge commit 'a59108db95274bef304cbd9246537206d0b449cf'
2022-10-24 18:20:10 -04:00
burnettk
ee589b49e3
Merge commit '835160e5a82c7e0518fa25ed7fa1168c9c435739'
2022-10-24 18:14:53 -04:00
burnettk
ebd5da4d9d
Merge commit 'a1cce807be1c4ac5f04c42d780df06c216a0de9c'
2022-10-24 18:02:49 -04:00
burnettk
af1eb47568
Merge commit '7026fe1f779051f6eb99b872bcd45b14c0cbe88f'
2022-10-24 17:53:02 -04:00
burnettk
f0b673282c
Merge commit '70480e9f91a1053531ea5db32a13a791c39fd89f'
2022-10-24 10:44:38 -04:00
burnettk
50a4c2c2e0
Merge commit '9a1e33696a744527a18dbec667140edb4038ac94'
2022-10-21 17:51:39 -04:00
burnettk
b114ff827b
Merge commit 'd643de93e5ceaae28a6e65044cc85dd039530d2c'
2022-10-21 17:28:37 -04:00
jasquat
a4305764a1
Merge commit '2b702661f3bd9b79de887e82e5a5925d07341eb6'
2022-10-21 16:46:41 -04:00
Dan
ba3fc0e6fb
updateing poetry lock file.
2022-10-21 16:44:44 -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
Dan
4061258393
pointless change
2022-10-21 12:56:15 -04:00
jasquat
64c75d0437
only add status if active_task has it w/ burnettk
2022-10-21 11:10:57 -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
jasquat
df4aba86c0
Merge commit '81746ee508f6ab0ffe757856d9a3d5d855db2560'
2022-10-19 16:16:50 -04:00
burnettk
fbb7e77144
Merge commit '8f8b4717990eb86c6bfd2f309ef064152c51b452'
2022-10-19 15:25:23 -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
004378369a
Merge commit 'aa22f4b397a899fa06d06c2e9127ca98d9eb909a'
2022-10-18 10:22:31 -04:00
burnettk
37decafb7d
Merge commit '4f0f5b1ece069ec56f8eb4154d61334a321749a1'
2022-10-18 07:09:34 -04:00
burnettk
030f315d03
Merge commit 'b4975660431c275ce736e0431b98c39548200af1'
2022-10-17 21:35:30 -04:00
burnettk
bf4e933821
Merge commit 'c9bd62250452403550ae1bf1d27547d4796dd316'
2022-10-17 17:36:41 -04:00
burnettk
c6b429ea5b
Merge commit '9be0517531543655a35023af17b76dbb41eab93e'
2022-10-17 17:09:47 -04:00
burnettk
a3422f9af5
Merge commit 'a1a01ad25a1ef60b879dede6f037f0fff3381ae4'
2022-10-17 11:18:12 -04:00
burnettk
4aad51f886
Merge commit 'bee232a55a82054e629f48f0333495b61a7da7d1'
2022-10-17 10:20:35 -04:00
burnettk
bc7db19a90
Merge commit '71e189afbc127b574cca8d02fc31b2e65aff0d52'
2022-10-16 22:32:16 -04:00
jasquat
11a705015d
Merge commit 'f21d0ef3a98458deb347fb2a51fab0b5b41f7fe2'
2022-10-14 16:43:34 -04:00
Jon Herron
789b2345fd
Merge commit '93dbce681ec89bc45479748aaae06ddd92b64da4'
2022-10-13 20:45:04 -04:00
Jon Herron
307e303463
pre-commit updates
2022-10-12 15:41:50 -04:00
Jon Herron
7ec037bbde
Merge main, resolve conflicts
2022-10-12 15:32:33 -04:00
Dan
8af5e7ed93
Updaging the jinja processing so it doesn't leave a bunch of blank lines in the markdown that has strong feelings about white space. Updating the front end to render markdown formatted instructions. And adding a little css love to tables that are generated in Markdown.
2022-10-12 13:28:57 -04:00
burnettk
4ca825cdfb
Merge commit '1aea5356defc74bd99a34e1f93a8048c273b8148'
2022-10-12 11:08:08 -04:00
Jon Herron
c30d6bbe1e
Merge commit '883e65384f1e36a0310f4fdcff57ac486890cd5e' as 'spiffworkflow-backend'
2022-10-12 10:22:22 -04:00