inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-04 07:05:41 +00:00
Code Activity
9,798 Commits 6 Branches 136 Tags
94a86e52f820f3bdefefe2025e21cb70108f3927
Commit Graph

9798 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver
51efd6b2e4 Add permissions for new mdoel 2021-10-13 14:06:36 +11:00
Oliver
37bd5c0507 Add serializer and API endpoint for BomItemSubstitute class 2021-10-13 13:58:41 +11:00
Oliver
f3f41730be Add "substitutes" column to BOM table 2021-10-13 11:58:40 +11:00
Oliver
324ccd805d Include BomItem substitutes in the serializer 2021-10-13 11:07:44 +11:00
Oliver
7c396f9f39 Enable optional pagination for the BomItem API endpoint 2021-10-13 11:07:34 +11:00
Oliver
a00dc9b0b1 Add migration file for new database model 2021-10-13 10:50:24 +11:00
Oliver
e20ddc289e Merge branch 'master' into bom-substitutes 2021-10-13 10:15:03 +11:00
Oliver
384d268534 Merge pull request #2145 from SchrodingersGat/revert-1fb76b9 
Revert 1fb76b9
 2021-10-13 09:55:21 +11:00
Oliver
4f985ae225 Revert 1fb76b9 
Removes global functions to enable / disable entire sections of functionality
 2021-10-13 09:40:17 +11:00
rocheparadox
5f159e5f02 Merge remote-tracking branch 'upstream/master' 2021-10-12 20:07:14 +05:30
rocheparadox
a01918d4b9 removed blank line at the end of file 2021-10-12 19:54:09 +05:30
rocheparadox
4fddc656c4 removed unused import 
added unit tests for PART_NAME_FORMAT
 2021-10-12 19:51:21 +05:30
Oliver
77324c496c Merge pull request #2144 from SchrodingersGat/docker-fix 
Updates for building cryptography lib
 2021-10-13 01:13:29 +11:00
Oliver Walters
1832a6f1fa Run APK upgrade 
Ref:
 2021-10-13 00:53:41 +11:00
Oliver Walters
c3e0c9378f Upgrade pip as part of dockerfile 2021-10-13 00:52:48 +11:00
Oliver Walters
ac242c01c1 Updates for building cryptography lib 2021-10-13 00:46:46 +11:00
rocheparadox
2bf51b0ac3 Added PART_NAME_FORMAT to Inventree settings and exposed the same in settings window with a validator 2021-10-12 19:06:23 +05:30
rocheparadox
f4239fbfd3 Merge remote-tracking branch 'upstream/master' 2021-10-12 18:54:51 +05:30
Oliver Walters
4eb8c60ee0 Add new BomItemSubstitute model 2021-10-12 22:22:49 +11:00
Oliver
2990dbf512 Merge pull request #2142 from SchrodingersGat/docker-repo-fix 
remove 'repository' arg from docker builds
 2021-10-12 21:49:02 +11:00
Oliver Walters
ec24f77da8 remove 'repository' arg from docker builds 2021-10-12 21:29:55 +11:00
Oliver
b9ad6bf9f9 Merge pull request #2137 from SchrodingersGat/nameless-user-fix 
Handle rare case where user instance has no name assigned
 2021-10-12 14:39:53 +11:00
Oliver
75bfdd615e Fixes for unit tests 2021-10-12 11:38:25 +11:00
rocheparadox
beadfb4659 Merge remote-tracking branch 'upstream/master' 2021-10-11 22:29:01 +05:30
rocheparadox
2d77b21a4e PART_NAME_FORMAT is introduced to display the names of parts in custom format. - For Feature Request InvenTree#2085 
full_name construction in part.js is obsolete/redundant since the same is constructed in backend and sent through api response
 2021-10-11 22:21:12 +05:30
Oliver
40e5536300 Handle rare case where user instance has no name assigned 2021-10-11 21:39:34 +11:00
Oliver
772d3fa67d Merge remote-tracking branch 'inventree/l10_crowdin' 2021-10-11 21:02:35 +11:00
Oliver
5b4d646ca3 Merge pull request #2135 from SchrodingersGat/docs-fix-fix 
re-simplify the documentation URL
 2021-10-11 18:54:56 +11:00
Oliver
62ce278fb7 Fix: New translations django.po from Crowdin 2021-10-11 17:29:16 +11:00
Oliver
c125cc4b29 Fix: New translations django.po from Crowdin 2021-10-11 17:29:15 +11:00
Oliver
e9350ca0e4 Fix: New translations django.po from Crowdin 2021-10-11 17:29:13 +11:00
Oliver
004bb35245 Fix: New translations django.po from Crowdin 2021-10-11 17:29:12 +11:00
Oliver
b1f51afac1 Fix: New translations django.po from Crowdin 2021-10-11 17:29:11 +11:00
Oliver
f0d2a32990 Fix: New translations django.po from Crowdin 2021-10-11 17:29:09 +11:00
Oliver
fe06542498 Fix: New translations django.po from Crowdin 2021-10-11 17:29:08 +11:00
Oliver
20874ca68a Fix: New translations django.po from Crowdin 2021-10-11 17:29:07 +11:00
Oliver
e1b0dc3669 Fix: New translations django.po from Crowdin 2021-10-11 17:29:05 +11:00
Oliver
b56c0e3a56 Fix: New translations django.po from Crowdin 2021-10-11 17:29:04 +11:00
Oliver
181091ce2d Fix: New translations django.po from Crowdin 2021-10-11 17:29:02 +11:00
Oliver
51e822a1f5 Fix: New translations django.po from Crowdin 2021-10-11 17:29:01 +11:00
Oliver
b334b85363 Fix: New translations django.po from Crowdin 2021-10-11 17:28:59 +11:00
Oliver
f722c765b3 Fix: New translations django.po from Crowdin 2021-10-11 17:28:58 +11:00
Oliver
ce550cfcd0 Fix: New translations django.po from Crowdin 2021-10-11 17:28:57 +11:00
Oliver
0299dda74c Fix: New translations django.po from Crowdin 2021-10-11 17:28:55 +11:00
Oliver
4a701a7a3a Fix: New translations django.po from Crowdin 2021-10-11 17:28:54 +11:00
Oliver
76b0ed3243 Fix: New translations django.po from Crowdin 2021-10-11 17:28:53 +11:00
Oliver
00f8d98094 re-simplify the documentation URL 
- dev version = "latest"
- stable version = "x.y.z"
- Requires an explicit docs version release for every software release
 2021-10-11 17:26:48 +11:00
Oliver
19a8c712d4 Merge pull request #2017 from matmair/fr-1421-sso 
SSO!
 2021-10-11 17:20:08 +11:00
Oliver
d874dc29b1 Fix: New translations django.po from Crowdin 2021-10-11 12:03:48 +11:00
Oliver
20ab5c7cf0 Fix: New translations django.po from Crowdin 2021-10-11 12:03:47 +11:00