Commit Graph

10116 Commits

Author SHA1 Message Date
Matthias Mair
565fad30d7
Merge branch 'inventree:master' into webhooks 2021-11-23 18:27:09 +01:00
Oliver
e53e3b4a51
Merge pull request #2350 from matmair/matmair/issue2347
Fix sidebar translation
2021-11-23 12:57:11 +11:00
Oliver
91cd76b55f
Merge pull request #2351 from matmair/matmair/issue2335
Respect rule W293
2021-11-23 12:55:06 +11:00
Matthias
c035cd4fc2
remove omitions
enforcing styles on the supporting files does not really hurt the dev enviroment - they already confirm
2021-11-23 00:44:56 +01:00
Matthias
0733d9940f
fix ci files 2021-11-23 00:42:21 +01:00
Matthias
92f0ca07d7
remove non existant file from checks 2021-11-23 00:39:12 +01:00
Matthias
68b8dcf19e
add todo 2021-11-23 00:37:17 +01:00
Matthias
aa845ce87d
add descriptions for all ignored errors 2021-11-23 00:36:44 +01:00
Matthias
3cd891229c
check rule W293 in pipeline 2021-11-23 00:29:02 +01:00
Matthias
d884e62be1
[FR] Confirm to W293
Fixes #2335
2021-11-23 00:28:23 +01:00
Matthias
d79e9a62b4
fix trans tags 2021-11-22 23:42:29 +01:00
Matthias
2acee580c9
fix template for sidebar_item 2021-11-22 20:42:10 +01:00
Matthias
9556cd594b
fix sidebar_header template -> remove trans 2021-11-22 20:41:31 +01:00
Matthias
c20afad84d
replace sidebar_links 2021-11-22 20:40:01 +01:00
Matthias
72da18719f
fix sidebar header 2021-11-22 20:24:38 +01:00
Matthias
933c420844
fix sidebar translation
Fixes #2347
2021-11-22 20:24:22 +01:00
Oliver
b1930404bd
Merge pull request #2343 from SchrodingersGat/bom-import-tweaks
Fix for BomItem import in admin page
2021-11-21 22:38:32 +11:00
Oliver
bef8592152
Create README.md 2021-11-21 22:15:59 +11:00
Oliver
883b60ebeb
Update README.md 2021-11-21 22:15:49 +11:00
Oliver
32a8d247e2 Fix for BomItem import in admin page 2021-11-21 22:12:58 +11:00
Oliver
189db604fa
Merge pull request #2339 from matmair/protected-settings
Protected settings
2021-11-20 19:26:29 +11:00
Oliver
00ebe3c675
Merge pull request #2340 from SchrodingersGat/multi-level-bom-fix
Fix BOM export for multi-level BOMs
2021-11-20 19:25:10 +11:00
Oliver
6a6eae7e54 Bug fix for BOM uploading
(cherry picked from commit 2e04b311306259e0ead07de9e08b3ba376caf4e4)
2021-11-20 18:10:51 +11:00
Oliver
f8aa5514ae Fix BOM export for multi-level BOMs 2021-11-20 17:44:54 +11:00
Matthias
1a6a26204e
make sure protected values are never exposed 2021-11-20 00:24:17 +01:00
Matthias
1798214cd2
add protected settings in model 2021-11-19 23:59:57 +01:00
Oliver
c1727078ed
Merge pull request #2338 from matmair/fix-anguage
fix language name
2021-11-20 09:46:45 +11:00
Matthias
74b3cad566
fix language name
missing closing bracket
2021-11-19 23:41:15 +01:00
Oliver
27f3cc251c
Merge pull request #2337 from matmair/missing-new-line
PEP fix: missing new line
2021-11-20 09:05:54 +11:00
Oliver
c64c5463c8
Merge pull request #2334 from matmair/allow-no-icon
add default to icon for sidebar item
2021-11-20 08:55:03 +11:00
Matthias
a9b89cc562
PEP fix: missing new line 2021-11-19 22:41:29 +01:00
Matthias
260c51f6fc
Pulls out the webhook dev for partial merge
Fixes #2036
2021-11-19 22:35:28 +01:00
Oliver
6a235c9f15
Merge pull request #2333 from matmair/multiple-admin-btn
allow admin buttons to be assigned by class
2021-11-20 08:27:26 +11:00
Oliver
0bd0012c56
Merge pull request #2332 from matmair/style-fixes
Style fixes
2021-11-20 08:22:29 +11:00
Matthias
7dad2b02f0
add default to icon for sidebar item 2021-11-19 22:22:19 +01:00
Matthias
70916bb11f
allow admin buttons to be assigned by class 2021-11-19 21:53:08 +01:00
Matthias
512c73a59e
make diffs for extending middleware cleaner 2021-11-19 21:51:57 +01:00
Matthias
9abbb6cb5e
PEP fixes for ci / maintenance scripts 2021-11-19 21:50:41 +01:00
Oliver
4e113798b4
Merge pull request #2330 from SchrodingersGat/es-mx
Add es_MX language translation
2021-11-19 08:12:09 +11:00
Oliver
1460c73637 Add es_MX language translation 2021-11-19 07:44:33 +11:00
Oliver
7399333256
Merge pull request #2328 from SchrodingersGat/stock-item-create-fix
Record the user information when creating or updating a stock item
2021-11-18 23:34:41 +11:00
Oliver
7d80387f3c
Merge pull request #2329 from SchrodingersGat/bom-quantity-fix
Bom quantity fix
2021-11-18 23:24:44 +11:00
Oliver
15a0d260f8 Handle case where user is not specified 2021-11-18 23:15:40 +11:00
Oliver
7ca36a092e convert remaining serializers 2021-11-18 23:01:19 +11:00
Oliver
c3fb6a6861 Convert BOM quantity field to new field class 2021-11-18 22:50:37 +11:00
Oliver
1bde26a7be Copy 'help_text' through from the model field if it is not defined for the serializer field 2021-11-18 22:48:22 +11:00
Oliver
35bd6ce927 Adds a new custom serializer field - InvenTreeDecimalField
- Fixes a number of problems with using FloatField
2021-11-18 22:17:58 +11:00
Oliver
eda8bbfeeb
Merge pull request #2325 from SchrodingersGat/demo-enhancemenets
Demo enhancements
2021-11-18 21:27:34 +11:00
Oliver
bfb32f3bf6 Record the user information when creating or updating a stock item 2021-11-18 21:26:26 +11:00
Oliver
b726df3a5e style fixes 2021-11-18 20:57:44 +11:00