Commit Graph

67 Commits

Author SHA1 Message Date
burnettk 3d377d9ef7 Merge commit 'b1722ee29d500c7317b62982b1e16bf562caa213' 2022-10-26 16:24:48 -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 f0b673282c Merge commit '70480e9f91a1053531ea5db32a13a791c39fd89f' 2022-10-24 10:44:38 -04:00
burnettk b114ff827b Merge commit 'd643de93e5ceaae28a6e65044cc85dd039530d2c' 2022-10-21 17:28:37 -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
jasquat f9a1003a88 resolved merge conflicts in backend w/ burnettk 2022-10-21 10:38:13 -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 35e94ad968 Merge commit 'a166df83031cb88d223e5c75ae8db8c896622821' 2022-10-19 15:17:17 -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 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
Jon Herron c30d6bbe1e Merge commit '883e65384f1e36a0310f4fdcff57ac486890cd5e' as 'spiffworkflow-backend' 2022-10-12 10:22:22 -04:00