Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,978 Commits 6 Branches 99 Tags 484 MiB
4c86593159
Commit Graph

4978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
b7718d9c6c Specify user and logfile 2021-03-19 22:08:11 +11:00
Oliver Walters
283663633a First pass at a supervisor.conf file 2021-03-19 21:52:36 +11:00
Oliver Walters
1fa0c84b55 Merge remote-tracking branch 'inventree/master' 2021-03-19 12:40:18 +11:00
Oliver
c9464fd393
Merge pull request #1412 from SchrodingersGat/pillow-version 
Bump pillow version
 2021-03-19 11:25:10 +11:00
Oliver Walters
84aea1d587 Bump pillow version 2021-03-19 10:59:28 +11:00
Oliver Walters
6c9e070b83 Merge branch 'master' of https://github.com/schrodingersgat/inventree 2021-03-18 11:14:54 +11:00
Oliver Walters
0f8a682085 Merge remote-tracking branch 'inventree/master' 2021-03-18 11:14:47 +11:00
Oliver
57289fe141
Merge pull request #1410 from SchrodingersGat/image-downloader 
Image downloader
 2021-03-18 11:10:07 +11:00
Oliver Walters
9c91ba4692 Add image download functionality for company 2021-03-18 09:20:24 +11:00
Oliver Walters
4e7243b999 Add modal image overlay for company 2021-03-17 23:55:21 +11:00
Oliver Walters
e3a5a56371 Add "modal image" display for part thumbnails 2021-03-17 23:44:47 +11:00
Oliver Walters
db47629867 Cleanup 2021-03-17 23:15:48 +11:00
Oliver Walters
8b310d8e47 Check length of response 2021-03-17 23:11:38 +11:00
Oliver Walters
be30933bfa Add custom form template 2021-03-17 23:06:56 +11:00
Oliver Walters
9a710ca28f Fix image download code 2021-03-17 23:02:32 +11:00
Oliver Walters
47a1143570 Catch error when generating company thumbnail images 2021-03-17 11:55:51 +11:00
Oliver Walters
5f19f534fc Catch error if invalid image is uploaded 2021-03-17 09:47:57 +11:00
Oliver
e2e870858d
Merge pull request #1400 from eeintech/ipn_edit_setting 
Add setting to disable IPN editing after part is created (web only)
 2021-03-17 09:47:39 +11:00
Oliver Walters
15678f789c Add global setting to enable download of files / images from remote URL 2021-03-17 08:40:30 +11:00
Oliver Walters
45edb7e802 Add button 2021-03-17 08:28:38 +11:00
Oliver Walters
5b7d35e6f7 add View 2021-03-17 08:28:28 +11:00
Oliver Walters
3900f9b1b6 Add form for submitting image URL 2021-03-17 08:28:12 +11:00
eeintech
8619af9f09 Template fix for stock actions 2021-03-16 12:32:56 -04:00
eeintech
85474516a3 Merge branch 'master' of github.com:inventree/InvenTree into ipn_edit_setting 2021-03-16 10:23:27 -04:00
Oliver Walters
6946abae13 CSS fix for modal error info dialog 2021-03-16 16:42:33 +11:00
Oliver
5e48009241
Merge pull request #1407 from eeintech/bom_match_headers 
Split required and part match headers for BOM import
 2021-03-16 08:19:32 +11:00
eeintech
64a57128bc Return True for BOM valid flag if part does not have BOM items 2021-03-15 10:37:30 -04:00
eeintech
d39bd88440 Split required and part match headers for BOM import 2021-03-15 09:41:04 -04:00
eeintech
7b81a470b9 Merge branch 'master' of github.com:inventree/InvenTree into ipn_edit_setting 2021-03-15 08:50:31 -04:00
Oliver Walters
97f93f8b03 Merge remote-tracking branch 'inventree/master' 2021-03-15 21:13:53 +11:00
Oliver
247cbe0154
Merge pull request #1406 from SchrodingersGat/part-pricing-form-error 
Add option to hide form error message
 2021-03-15 21:01:19 +11:00
Oliver Walters
2de879d2ba Add option to hide form error message 2021-03-15 20:30:18 +11:00
Oliver
b17a50bd51
Merge pull request #1405 from SchrodingersGat/css-tweak 
Small tweak for breadcrumb div css
 2021-03-15 17:52:14 +11:00
Oliver Walters
9918860820 Small tweak for breadcrumb div css 2021-03-15 17:00:14 +11:00
Oliver Walters
c6e154f996 PEP style fixes 2021-03-15 10:15:48 +11:00
Oliver Walters
c1aed51de1 Fix import error 2021-03-15 09:34:32 +11:00
Oliver Walters
24823adc6d Adds unit tests for version number comparison 2021-03-15 08:51:50 +11:00
Oliver Walters
6ea846ce45 Add a #TODO 2021-03-15 08:36:27 +11:00
Oliver Walters
f6dd710d6e Automatically delete old heartbeat messages 2021-03-15 08:35:06 +11:00
Oliver Walters
de85d61451 Directly compare version tuples, rather than converting to primitive 2021-03-15 08:31:19 +11:00
Oliver
5ff18a0a3a
Merge pull request #1403 from matmair/translations-de 
unified translation scheme
 2021-03-15 08:27:24 +11:00
Oliver
82faccc62f
Merge pull request #1401 from eeintech/stock_filter_assembly 
Stock filter for parts assemblies
 2021-03-13 07:48:15 +11:00
Oliver
59e98bc22d
Merge pull request #1402 from eeintech/fix_typo 
Fixed build typo
 2021-03-13 07:46:11 +11:00
eeintech
acb0b2c10a Fixed build typo 2021-03-12 11:46:56 -05:00
eeintech
429f9d0a13 Removed test print 2021-03-12 11:19:20 -05:00
eeintech
89c7c87f1e Add stock filter for parts assemblies 2021-03-12 11:18:19 -05:00
eeintech
b152f7041b Add setting to disable IPN editing after part is created (web only) 2021-03-12 10:30:31 -05:00
Oliver Walters
700effcee7 Remove celery reference 2021-03-12 16:57:27 +11:00
Oliver Walters
18b559fee7 Fix for unit test 2021-03-12 16:28:54 +11:00
Oliver Walters
9d404afec0 Add 'ignore' rules for the django-q tables 2021-03-12 16:00:25 +11:00