Matthias Mair
b118890676
Merge branch 'inventree:master' into matmair/issue2694
2022-04-23 21:30:01 +02:00
Matthias Mair
8f13f36e2d
Merge branch 'inventree:master' into matmair/issue2788
2022-04-23 21:29:52 +02:00
Matthias Mair
2f0291864f
Merge branch 'inventree:master' into matmair/issue2385
2022-04-23 21:29:37 +02:00
Matthias Mair
756eb4f4ea
Merge branch 'inventree:master' into matmair/issue2385
2022-04-20 00:05:26 +02:00
Matthias Mair
d2e3d824b0
Merge branch 'inventree:master' into plugin-mark-sample
2022-04-20 00:03:42 +02:00
Matthias Mair
544a590b7a
Merge branch 'inventree:master' into plugin-mark-sample
2022-04-19 18:24:21 +02:00
Matthias Mair
3e39f99ccb
Merge branch 'inventree:master' into matmair/issue2788
2022-04-19 18:24:15 +02:00
Matthias Mair
b3dca68c6b
Merge branch 'inventree:master' into matmair/issue2694
2022-04-19 18:24:12 +02:00
Matthias Mair
1399b4fbb3
Merge branch 'inventree:master' into matmair/issue2385
2022-04-19 18:23:49 +02:00
Matthias Mair
a6a03acf92
re-add plugin on startup switch
2022-04-14 01:22:09 +02:00
Matthias Mair
547c51b81b
pep fix
2022-04-06 01:47:11 +02:00
Matthias Mair
b087422290
add import back in
2022-04-06 01:45:19 +02:00
Matthias Mair
b53bf6de9c
pep fix
2022-04-06 01:42:24 +02:00
Matthias Mair
41b75e4928
Merge branch 'inventree:master' into matmair/issue2385
2022-04-05 02:05:05 +02:00
Matthias Mair
4ab27e5f3c
Merge branch 'inventree:master' into matmair/issue2694
2022-04-05 02:03:40 +02:00
Matthias Mair
ed60666695
Merge branch 'inventree:master' into matmair/issue2788
2022-04-05 02:03:37 +02:00
Matthias Mair
346327b545
Merge branch 'inventree:master' into plugin-mark-sample
2022-04-05 02:03:29 +02:00
Matthias Mair
ce68ee3781
Merge branch 'inventree:master' into matmair/issue2694
2022-03-20 22:15:27 +01:00
Matthias Mair
cc50eff3a1
Merge branch 'master' into matmair/issue2694
2022-03-20 02:29:20 +01:00
Matthias Mair
eeccf8e6bf
pep fix
2022-03-18 07:52:36 +01:00
Matthias Mair
0cd8aae250
raise blocker again
2022-03-18 07:50:02 +01:00
Matthias Mair
a97f2be8fa
remove test
2022-03-18 07:49:16 +01:00
Matthias Mair
a1791645fa
just raise
2022-03-18 02:19:32 +01:00
Matthias Mair
57df39086c
Merge branch 'inventree:master' into fix-set_user
2022-03-16 15:16:26 +01:00
Matthias Mair
966eb60dd8
Merge branch 'inventree:master' into matmair/issue2694
2022-03-16 15:16:07 +01:00
Matthias Mair
1e57bdcfba
Merge branch 'inventree:master' into matmair/issue2279
2022-03-16 15:15:46 +01:00
Matthias Mair
91464ad3d0
Merge branch 'inventree:master' into matmair/issue2524
2022-03-16 15:15:27 +01:00
Matthias Mair
e4c293f721
fix formatter
2022-03-15 13:43:41 +01:00
Matthias Mair
9d001c07bd
fix assertation
2022-03-15 00:04:57 +01:00
Matthias Mair
4100834ce9
Merge branch 'inventree:master' into matmair/issue2279
2022-03-14 23:14:29 +01:00
Matthias Mair
69a792a520
Merge branch 'inventree:master' into matmair/issue2694
2022-03-14 23:14:17 +01:00
Matthias Mair
a024df0147
Merge branch 'inventree:master' into coverage-changes
2022-03-14 23:14:14 +01:00
Matthias Mair
ec021624cd
Merge branch 'inventree:master' into matmair/issue2694
2022-03-08 21:26:21 +01:00
Matthias Mair
0a9e85e801
Merge branch 'inventree:master' into matmair/issue2279
2022-03-08 21:26:05 +01:00
Matthias Mair
2c8e7ac810
Merge branch 'inventree:master' into matmair/issue2279
2022-03-07 00:03:47 +01:00
Matthias Mair
b9ee436110
Merge branch 'inventree:master' into matmair/issue2694
2022-03-07 00:03:33 +01:00
Matthias Mair
56142b9303
Merge branch 'inventree:master' into matmair/issue2694
2022-03-06 19:54:14 +01:00
Matthias Mair
d9e27b7ecf
Merge branch 'inventree:master' into matmair/issue2279
2022-03-06 19:54:06 +01:00
Matthias Mair
6071f6545b
Merge branch 'inventree:master' into matmair/issue2279
2022-03-03 23:55:04 +01:00
Matthias Mair
b2676e3629
Merge branch 'inventree:master' into matmair/issue2501
2022-03-01 20:19:23 +01:00
Matthias Mair
56e6783556
Merge branch 'inventree:master' into matmair/issue2279
2022-03-01 20:14:25 +01:00
Matthias Mair
0957feafa1
fix test
2022-03-01 20:12:38 +01:00
Matthias Mair
56e0b5f98d
Add as superuser
2022-03-01 12:31:56 +01:00
Matthias Mair
a500e8cf54
Fix typo
2022-03-01 12:28:31 +01:00
Matthias Mair
484a53ff8e
Update apps.py
...
Update env names
2022-03-01 12:26:16 +01:00
Matthias Mair
2f4cae4c9d
Update config_template.yaml
...
Change name for config name
2022-03-01 12:25:04 +01:00
Matthias Mair
5cc214dfbc
Update settings.py
...
Add comment to explain usage
2022-03-01 12:23:17 +01:00
Matthias Mair
86ba69eeaf
Merge branch 'inventree:master' into matmair/issue2279
2022-02-28 00:45:58 +01:00
Matthias Mair
bb480b1e81
Add DO to readme
2022-02-26 23:10:55 +01:00
Matthias Mair
0e40a78705
update test to aaccount for new js-file
2022-02-23 00:55:55 +01:00
Matthias Mair
e4c6f6e8e4
Merge branch 'inventree:master' into matmair/issue2279
2022-02-23 00:54:54 +01:00
Matthias Mair
8b8e95385b
Merge branch 'inventree:master' into translation-fixes
2022-02-20 22:20:00 +01:00
Matthias Mair
a6641d067b
Merge branch 'inventree:master' into matmair/issue2279
2022-02-20 22:19:30 +01:00
Matthias Mair
da0eda0b27
Merge branch 'inventree:master' into matmair/issue2279
2022-02-20 02:36:53 +01:00
Matthias Mair
626f44d195
Merge branch 'inventree:master' into matmair/issue2279
2022-02-16 02:02:02 +01:00
Matthias Mair
0be2f8cf02
Merge branch 'inventree:master' into coverage-fixes
2022-02-15 01:48:55 +01:00
Matthias Mair
880d78f2c6
Pep
2022-02-13 06:24:05 +01:00
Matthias Mair
c6da462229
Remove settings mods
2022-02-13 06:22:15 +01:00
Matthias Mair
975c81ccfe
Merge branch 'inventree:master' into fix-html-tags
2022-02-12 00:32:26 +01:00
Matthias Mair
18e0a7b7e6
fix spelling
...
Thanks @Stephano120
Good catch!
2022-01-28 20:19:38 +01:00
Matthias Mair
d998f8bfbe
Merge branch 'inventree:master' into fix-html-tags
2022-01-24 23:39:21 +01:00
Matthias Mair
af04056843
Merge branch 'inventree:master' into style-fix
2022-01-24 23:39:17 +01:00
Matthias Mair
c7b6dc5929
Merge branch 'inventree:master' into matmair/issue2279
2022-01-21 01:31:48 +01:00
Matthias Mair
d045bffa84
Merge branch 'inventree:master' into template-reduce-duplication
2022-01-21 01:31:45 +01:00
Matthias Mair
a540a5582e
Merge branch 'inventree:master' into matmair/issue2279
2022-01-20 23:35:53 +01:00
Matthias Mair
c490574082
Merge branch 'inventree:master' into matmair/issue2279
2022-01-12 14:36:04 +01:00
Matthias Mair
2bc4d57ffa
remove double code
2022-01-10 02:49:34 +01:00
Matthias Mair
f219a10b2f
small fix to language in readme
...
normally the kind of API we supply is called REST
2022-01-09 22:46:28 +01:00
Matthias Mair
9e21dde6de
Merge branch 'inventree:master' into webhooks
2022-01-08 21:42:18 +01:00
Matthias Mair
8799985f75
Merge branch 'inventree:master' into stale
2022-01-07 00:08:28 +01:00
Matthias Mair
978018e284
Merge branch 'inventree:master' into matmair/issue2279
2022-01-07 00:08:17 +01:00
Matthias Mair
67e4fd9d34
Merge branch 'inventree:master' into webhooks
2022-01-07 00:08:11 +01:00
Matthias Mair
a02ae8c20d
add welcome messages
2022-01-05 23:41:04 +01:00
Matthias Mair
9b1e944509
ignore everything that got a milestone
...
this helps keeping false positives lower
2022-01-04 00:04:05 +01:00
Matthias Mair
993b368d3d
new stale check
2022-01-03 23:59:16 +01:00
Matthias Mair
5c4c9bfaed
Merge branch 'inventree:master' into matmair/issue2279
2021-12-29 23:54:54 +01:00
Matthias Mair
b6b6e10f4d
Merge branch 'inventree:master' into webhooks
2021-12-29 23:54:48 +01:00
Matthias Mair
d763959269
Merge branch 'inventree:master' into api-mixin
2021-12-29 23:54:33 +01:00
Matthias Mair
3ed8fc6ad4
Merge branch 'inventree:master' into webhooks
2021-12-15 00:21:03 +01:00
Matthias Mair
acbee38600
Merge branch 'inventree:master' into matmair/issue2279
2021-12-15 00:20:48 +01:00
Matthias Mair
271ad1dc87
Merge branch 'inventree:master' into matmair/issue2279
2021-12-11 00:09:32 +01:00
Matthias Mair
f6d43946b3
Merge branch 'inventree:master' into webhooks
2021-12-11 00:08:56 +01:00
Matthias Mair
89758f28b2
Merge branch 'inventree:master' into matmair/issue2201
2021-12-11 00:08:29 +01:00
Matthias Mair
25e0324eb1
Merge branch 'inventree:master' into matmair/issue2279
2021-12-09 23:56:27 +01:00
Matthias Mair
ac0a5d4efc
Merge branch 'inventree:master' into webhooks
2021-12-09 23:56:18 +01:00
Matthias Mair
75aeab48b8
Merge branch 'inventree:master' into matmair/issue2250
2021-12-09 23:56:08 +01:00
Matthias Mair
b8404c44b4
Merge branch 'inventree:master' into webhooks
2021-12-08 18:28:11 +01:00
Matthias Mair
cdcac90319
Merge branch 'inventree:master' into matmair/issue2279
2021-12-08 18:27:57 +01:00
Matthias Mair
1060f60117
Merge branch 'inventree:master' into webhooks
2021-12-04 17:53:21 +01:00
Matthias Mair
2a0e07abe0
Merge branch 'inventree:master' into matmair/issue2201
2021-12-04 17:53:13 +01:00
Matthias Mair
502d701a70
Merge branch 'inventree:master' into pipeline
2021-12-04 17:53:02 +01:00
Matthias Mair
0d9f76a019
Merge branch 'inventree:master' into matmair/issue2279
2021-12-04 17:52:58 +01:00
Matthias Mair
6bc3e3ccbb
Workflow remaster ( #2416 )
...
* Workflow remaster (#28 )
* set default ref
* only trigger version number if pullrequest
* try skipping just a step
* Workflow remaster (#29 )
* set default ref
* only trigger version number if pullrequest
* always run style
* try skipping just a step
* try adding a step so everything continues
* Workflow remaster (#30 )
* set default ref
* only trigger version number if pullrequest
* always run style
* try skipping just a step
* try adding a step so everything continues
* maybe this does not fail them
* skip ahead
* do not skip the whole job, just the steps
2021-12-04 11:01:18 +11:00
Matthias Mair
ec3b5b6cbc
Merge branch 'inventree:master' into workflow-remaster
2021-12-02 17:13:49 +01:00
Matthias Mair
4904beb45a
Merge branch 'inventree:master' into webhooks
2021-12-02 17:08:36 +01:00
Matthias Mair
932b78d3e8
Merge branch 'inventree:master' into matmair/issue2279
2021-12-02 17:08:18 +01:00
Matthias Mair
cf3d2d0df9
Merge branch 'inventree:master' into load-minified-fa
2021-12-02 09:23:13 +01:00
Matthias Mair
11e527a02a
Merge branch 'inventree:master' into plugin-2037
2021-12-02 09:23:05 +01:00
Matthias Mair
fcf7f615aa
Merge branch 'inventree:master' into webhooks
2021-12-02 09:22:48 +01:00
Matthias Mair
b687659ddd
Merge branch 'inventree:master' into matmair/issue2327
2021-11-28 17:26:19 +01:00
Matthias Mair