inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 12:36:11 +00:00
Code Activity
5,025 Commits 9 Branches 164 Tags
096403b429228e3f67340cc2966f3c344e59a5f1
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 096403b429 CI file fixes 2021-04-21 12:37:20 +10:00
Oliver Walters a1e835e01b Add some new (empty) locale translation entries 
- fr
- it
- ja
- pl
- ru
- zh

Also fixes the `invoke translate` command (maybe it was changed with the recent update to Django 3.2?)

The CI pipeline now runs the translation and static collection steps, to check those for errors.
 2021-04-21 12:33:56 +10:00
OliverandGitHub 45d23bd606 Merge pull request #1497 from SchrodingersGat/docker-push 
Changes to docker workflow
 2021-04-21 11:27:45 +10:00
Oliver Walters b20c832702 Changes to docker workflow 2021-04-21 11:13:37 +10:00
OliverandGitHub 4903826be1 Merge pull request #1494 from matmair/feature/js_translation 
Translating JS-Files once
 2021-04-20 22:58:43 +10:00
OliverandGitHub 9addad9b46 Merge pull request #1493 from SchrodingersGat/multi-location-print 
Split "part category" view into separate pages
 2021-04-20 21:10:46 +10:00
Oliver Walters 4d1eb51bc4 Fixes 2021-04-20 20:42:55 +10:00
Oliver Walters 2bb86ff22b Adds missing template file 2021-04-20 20:20:00 +10:00
Oliver Walters fd3e59650a Style fixes 2021-04-20 20:15:51 +10:00
Oliver Walters c5fa0bb459 Improved API filtering for PartCategory 2021-04-20 20:15:06 +10:00
Oliver Walters 38eea21f4f Enable printing of multiple stock location labels 2021-04-20 20:06:13 +10:00
Oliver Walters 412b05d76c Allow API filtering by "cascading" stock locations 2021-04-20 20:00:15 +10:00
Oliver Walters 6986709fb8 Reorganized stock location view 2021-04-20 19:49:07 +10:00
Oliver Walters f578f68001 Split "part category" view into separate pages 2021-04-20 19:30:43 +10:00
OliverandGitHub 21708dabaf Merge pull request #1490 from SchrodingersGat/django-3.2 
Update to django 3.2
 2021-04-20 11:25:25 +10:00
Oliver Walters 0fbf39f1bc More fixes 2021-04-20 10:59:28 +10:00
Oliver Walters 6b9145ae56 Fixes required for v3.2 compatibility 
- Specify DEFAULT_AUTO_FIELD
- Specify output_field for annotations
 2021-04-20 09:14:08 +10:00
Oliver Walters 12f1fb9526 Update to django 3.2 2021-04-20 08:15:43 +10:00
OliverandGitHub 6c159e91cc Merge pull request #1489 from eeintech/stock_fixes 
Stock return to customer fix
 2021-04-20 07:38:32 +10:00
OliverandGitHub 5f04802ead Merge pull request #1487 from inventree/dependabot/pip/django-3.1.8 
Bump django from 3.1.7 to 3.1.8
 2021-04-19 21:11:08 +10:00
OliverandGitHub ebf3f6f542 Merge pull request #1488 from SchrodingersGat/suppress-warning 
Do not print EMAIL warning if in TEST mode
 2021-04-19 21:10:49 +10:00
Oliver Walters 252abb920f Do not print EMAIL warning if in TEST mode 2021-04-19 20:49:24 +10:00
OliverandGitHub afca4f244d Merge pull request #1422 from SchrodingersGat/django-latest-version 
Update requirements
 2021-04-19 20:47:57 +10:00
Oliver Walters 98be42846c Update requirements 2021-04-19 12:21:43 +10:00
OliverandGitHub 157d58b157 Merge pull request #1481 from matmair/instance-name-in-title 
Instance name in title
 2021-04-18 21:48:37 +10:00
OliverandGitHub 3bb0f7dde0 Merge pull request #1480 from SchrodingersGat/docker-build-fix 
Fix directory
 2021-04-18 20:24:16 +10:00
OliverandGitHub 26c19dc77d Merge pull request #1479 from matmair/feature/translations 
Feature/translations
 2021-04-18 20:23:51 +10:00
Oliver Walters e057d6d161 Fix directory 2021-04-18 20:00:03 +10:00
OliverandGitHub 724ecebb4c Update version.py 2021-04-18 19:54:16 +10:00
OliverandGitHub 0b5557395b Update version.py 2021-04-18 19:53:15 +10:00
OliverandGitHub 6c410521a1 Merge pull request #1476 from SchrodingersGat/docker-improvements 
Cleanup docker files
 2021-04-18 19:52:42 +10:00
Oliver Walters 9d88d38bf8 Enforce line-endings for more file types 2021-04-18 19:39:03 +10:00
Oliver Walters 4531030551 Fix line endings 2021-04-18 19:37:11 +10:00
Oliver Walters aced0e73c7 compose file cleanup 2021-04-18 18:58:00 +10:00
Oliver Walters 61eba2f7fc Typo fix 2021-04-18 18:54:21 +10:00
Oliver Walters 0926992b4f Updated nginx conf 2021-04-18 18:53:30 +10:00
Oliver Walters d8e1e18f4d change web -> inventree 2021-04-18 17:21:06 +10:00
OliverandGitHub b7247284a6 Merge pull request #1478 from SchrodingersGat/log-fix 
Remove log output which was leaking password into the logs
 2021-04-18 17:20:43 +10:00
Oliver Walters 1502a07b81 Remove log output which was leaking password into the logs 2021-04-18 16:54:35 +10:00
Oliver Walters eb108edb60 Adds entrypoint for starting a development server 2021-04-18 16:26:32 +10:00
Oliver Walters 270c0ea85d Cleanup docker files 2021-04-18 15:24:33 +10:00
OliverandGitHub 83002a5d51 Merge pull request #1475 from SchrodingersGat/docker-fixes 
Add binaries for database dumping
 2021-04-18 15:23:55 +10:00
Oliver Walters 9eb559bec5 More install fixes 2021-04-18 15:09:01 +10:00
Oliver Walters 69473b9bff Fix install 
Also make the web port configurable
 2021-04-18 15:05:52 +10:00
Oliver Walters c07aef7f75 Remove commented line 2021-04-18 14:58:02 +10:00
Oliver Walters cbb94d2ff7 sqlite3 -> sqlite 2021-04-18 14:57:25 +10:00
Oliver Walters 75054f870e Fix 2021-04-18 14:50:22 +10:00
Oliver Walters 124db01b63 Add binaries for database dumping 2021-04-18 14:45:41 +10:00
OliverandGitHub 2be78f5d4c Merge pull request #1469 from eeintech/stock_item_template_fix 
Fixed stock item template for items without manufacturer part
 2021-04-17 08:05:21 +10:00
OliverandGitHub d3da262687 Merge pull request #1470 from eeintech/hide_system_alert_nostaff 
Hide system alert for non-staff users
 2021-04-17 08:04:45 +10:00
OliverandGitHub d4529ec1c4 Merge pull request #1464 from matmair/translation_improv 
Translation improvments
 2021-04-16 21:46:07 +10:00
OliverandGitHub f8edcf8a0d Merge pull request #1466 from nwns/fix/handle_null_manufacturer_part 
fix: don't link manufacturer part if it doesn't have one
 2021-04-16 11:09:04 +10:00
OliverandGitHub 3e6429cb13 Merge pull request #1462 from eeintech/stock_label 
Added revision and stock item QR code URL for label creation
 2021-04-15 13:00:09 +10:00
OliverandGitHub 3a8cce9af3 Merge pull request #1417 from eeintech/manufacturer_part 
Manufacturer Parts
 2021-04-15 11:13:02 +10:00
OliverandGitHub 623d0366fc Update README.md 
Fixed docker link
 2021-04-14 07:55:12 +10:00
OliverandGitHub a8d22dac62 Merge pull request #1458 from matmair/translation_improv 
updated translation references
 2021-04-13 21:20:32 +10:00
OliverandGitHub 79dc66e840 Merge pull request #1304 from SchrodingersGat/email-support 
Support for email settings
 2021-04-13 20:42:23 +10:00
Oliver Walters d5034ece51 typo fix 2021-04-13 20:21:33 +10:00
Oliver Walters 04318c6d70 Adjust default email settings 2021-04-13 20:15:09 +10:00
Oliver Walters 96efb0eb28 Remove "forgot password" link if the email backend is not configured 2021-04-13 20:02:20 +10:00
Oliver Walters f902b79d79 And more templates 2021-04-12 20:07:38 +10:00
Oliver Walters 12a4c22a9b Password reset templates 2021-04-12 20:02:05 +10:00
Oliver Walters a9d490b716 PEP fixes 2021-04-12 19:20:41 +10:00
Oliver Walters d243ff6b37 Offload email task to background worker 2021-04-12 19:18:47 +10:00
Oliver Walters fb5a94a778 Support for email settings 2021-04-12 18:50:37 +10:00
OliverandGitHub 72f83771f1 Merge pull request #1453 from SchrodingersGat/part-parameter-api 
Part parameter api
 2021-04-11 19:41:02 +10:00
Oliver Walters 8a06eaa40d Unit testing 2021-04-11 19:28:39 +10:00
Oliver Walters 85c9bc1b81 Adds detail endpoint for PartParameter model 2021-04-11 18:56:35 +10:00
OliverandGitHub 471d009e84 Merge pull request #1452 from SchrodingersGat/workflow-fox 
Fix workflow for publishing docker files
 2021-04-11 15:45:40 +10:00
Oliver Walters 029808a986 Fix workflow for publishing docker files 2021-04-11 15:45:17 +10:00
OliverandGitHub effd547260 Update version.py 2021-04-11 15:39:53 +10:00
OliverandGitHub 7c9ad3f406 Update version.py 2021-04-11 15:39:16 +10:00
OliverandGitHub 4cf0339393 Update README.md 2021-04-11 15:38:52 +10:00
OliverandGitHub a2ff3e3474 Merge pull request #1398 from SchrodingersGat/django-q 
Django q
 2021-04-11 15:38:20 +10:00
Oliver Walters c2f85b0447 docker-compose tweaks 2021-04-11 15:25:32 +10:00
Oliver Walters 8f07efa4e3 Add dockerhub badge 2021-04-11 15:15:11 +10:00
Oliver Walters b490c5d035 Add new docker workflow for publising docker images on release 2021-04-11 15:08:13 +10:00
Oliver Walters f9449da576 Merge remote-tracking branch 'upstream/master' into django-q 
# Conflicts:
#	InvenTree/InvenTree/version.py
 2021-04-11 15:03:33 +10:00
OliverandGitHub 34e95ab70c Update version.py 2021-04-11 14:49:41 +10:00
Oliver Walters 5f9236d280 Updates to docker files 2021-04-11 14:46:40 +10:00
Oliver Walters 44fe5721e0 Disgusting hack for tasks.py 2021-04-11 14:05:55 +10:00
Oliver Walters f6f3815f31 Include worker status in main API call 2021-04-11 13:58:59 +10:00
Oliver Walters 78bcbe271a Update supervisor conf file 2021-04-11 13:45:56 +10:00
Oliver Walters 2e8d3b6424 Fix for tasks.py (??) 2021-04-11 13:22:16 +10:00
Oliver Walters c9021fe991 Simplify docker build workflow 2021-04-10 22:48:23 +10:00
Oliver Walters 0e1b647e7b Remove mariadb test (uses the same backend as mysql!) 2021-04-10 22:47:30 +10:00
Oliver Walters b74d365529 Merge remote-tracking branch 'upstream/master' into django-q 2021-04-10 22:46:20 +10:00
Oliver Walters 3da5505b58 Fix build workflow 2021-04-10 22:44:37 +10:00
Oliver Walters 5a168abbfe Separated docker file into separate directory 2021-04-10 22:42:08 +10:00
Oliver Walters 8f626d305e Fix location of entrypoint scripts 2021-04-10 22:35:10 +10:00
Oliver Walters 5d9e273559 Adds nxinx service 2021-04-10 22:25:07 +10:00
Oliver Walters 91b6f98f95 Update directory structure to match docker config 2021-04-10 22:08:36 +10:00
Oliver Walters 2f1db486a0 Do not use python virtual environment inside container 2021-04-10 21:40:27 +10:00
Oliver Walters 823f84e46a Simplified volume management in docker-compose 2021-04-10 20:58:51 +10:00
Oliver Walters 178715ce61 Auto create config file in specified location if it does not exist 2021-04-10 20:57:56 +10:00
Oliver Walters e787c853e5 Update logger context 2021-04-10 20:08:13 +10:00
Oliver Walters 5e54b0f5cf Auto-generate key file if it does not exist! 2021-04-10 19:01:02 +10:00
Oliver Walters 9086c8a3bf Simplify external directory structure 
- All InvenTree data now in a single subdir
- Copy default config file (if it does not exist)
- Config file is accessible from outside world
- Update start_server and start_worker scripts
 2021-04-10 17:36:19 +10:00
OliverandGitHub e011faa9b7 Merge pull request #1450 from SchrodingersGat/company-description-optional 
Company description is no longer a required field
 2021-04-10 16:19:30 +10:00
Oliver Walters e6bd91c9e2 Company description is no longer a required field 2021-04-10 15:29:44 +10:00