6fa370091f
Merge commit 'd7e8533061a995595f520f31f7d4b56440078f5b'
2022-10-25 17:38:59 -04:00
0e9f66e1ad
Merge commit '1f25521506a6ed4caef400a13903af86a7eb83d2'
2022-10-25 16:54:06 -04:00
2e3a5f579a
mypy
2022-10-25 16:47:40 -04:00
897c8ee9b9
Added `get_localtime` script
...
Added test for new script, with test process
2022-10-25 15:56:48 -04:00
41ab09fc48
Merge commit '999e0f4d2b7a3c3665feb806fd4f00dc50f2de8e'
2022-10-25 14:20:02 -04:00
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
0939e31d7c
Merge commit '2b702661f3bd9b79de887e82e5a5925d07341eb6'
2022-10-21 16:46:41 -04:00
4d48e0fb90
Merge commit 'f0b608789b6cdc3ef4303efac053746c98571a48'
2022-10-21 16:28:09 -04:00
a55337102a
resolved merge conflicts in backend w/ burnettk
2022-10-21 10:38:13 -04:00
338c40ae48
Merge commit '4a48d9cccd1ca8619b3dbef3c10bcce667c9d9e0'
2022-10-20 16:00:12 -04:00
01d39f31dd
Merge commit 'c661100e03eef762cb51b02be1b309ec47be7002'
2022-10-20 07:19:24 -04:00
2a1d8ee4e9
Merge commit 'a166df83031cb88d223e5c75ae8db8c896622821'
2022-10-19 15:17:17 -04:00
228681f8e7
Merge commit '64e7049c9a0a4360101a155a41ce64ae692acd3c'
2022-10-18 16:41:10 -04:00
37d1fa831a
Merge commit '4f0f5b1ece069ec56f8eb4154d61334a321749a1'
2022-10-18 07:09:34 -04:00
989281f554
Merge commit '93dbce681ec89bc45479748aaae06ddd92b64da4'
2022-10-13 20:45:04 -04:00
5ceb2b49a1
Merge main, resolve conflicts
2022-10-12 15:32:33 -04:00
66e3f52c24
Merge commit '883e65384f1e36a0310f4fdcff57ac486890cd5e' as 'spiffworkflow-backend'
2022-10-12 10:22:22 -04:00
burnettk
mike cullerton
Jon Herron
Mike Cullerton
jasquat