inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 05:05:42 +00:00
Code Activity
10,205 Commits 6 Branches 132 Tags
cefc4af86193b51807a7d0f796827ce4e8241334
Commit Graph

10205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Oliver
6dafedd0f3 Adjust login screen 2021-11-18 20:55:10 +11:00
Oliver
cac77ed134 Hide account edit actions in demo mode 2021-11-18 20:37:08 +11:00
Oliver
2a5b882a25 Navbar updates 
- Display "demo mode" with link to docs
- Remove "admin" menu action
 2021-11-18 20:34:50 +11:00
Oliver
1f5e4a1e6b Adds a template tag for testing if the server is running in demo mode 2021-11-18 20:17:27 +11:00
Oliver
4aeac79ba5 Remove very old unused file 2021-11-18 20:08:24 +11:00
Oliver
0dd3389518 Read "DEMO_MODE" into settings.py 2021-11-18 19:59:14 +11:00
Oliver
8a879832ee Merge pull request #2319 from SchrodingersGat/returned-status 
Adds fallback value if status code color is not defined
 2021-11-17 16:10:57 +11:00
Oliver
9c3b04f771 Adds fallback value if status code color is not defined 2021-11-17 14:09:20 +11:00
Oliver
96565325a8 Merge pull request #2315 from SchrodingersGat/stuff 
Small tweaks
 2021-11-17 11:24:11 +11:00
Oliver
c0f5205570 Pin markdown package version 2021-11-17 10:56:39 +11:00
Oliver
9614963f16 Put function into migration file 2021-11-17 08:58:32 +11:00