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
4,933 Commits 9 Branches 164 Tags
6600879ed17a6b4bd1d1351c1cd6ae23c41b3977
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Oliver Walters 1372343bd5 Updates to docker-compose file 
- Note: not ready yet!
 2021-04-10 15:27:50 +10:00
Oliver Walters 8eb571bddf Update dockerfile 2021-04-10 15:08:10 +10:00
OliverandGitHub c7e1ac5648 Merge pull request #1449 from eeintech/fix_stock_ops 
Fixed transfer stock action in template
 2021-04-10 09:19:43 +10:00
OliverandGitHub 6bf3cc9e01 Merge pull request #1446 from eeintech/bom_yaml_export 
Replace normalize with integer wrapper for quantity field
 2021-04-10 09:17:23 +10:00
OliverandGitHub 6a1bb0a806 Merge pull request #1445 from eeintech/simple_stock_table_view 
Simplified stock table view in Part and SupplierPart detail pages
 2021-04-09 11:58:33 +10:00
Oliver Walters 47a93bc4cb More environment variables for config.yaml 2021-04-08 21:01:52 +10:00
Oliver Walters 3381945e14 Add newline 2021-04-08 17:10:48 +10:00
Oliver Walters 3926276fd1 Greatly simplified "wait_for_db" command 2021-04-08 00:37:34 +10:00
Oliver Walters 71cac6e269 Simplify waiting for db 2021-04-08 00:09:51 +10:00
Oliver Walters ed304f571a Better configuration of github repo 2021-04-08 00:05:37 +10:00
Oliver Walters 14aead038e Adds docker_compose file 2021-04-07 23:46:30 +10:00
Oliver Walters d4d9263131 Add option to specify config file via environment variable 2021-04-07 23:46:03 +10:00
Oliver Walters 9c38d67b52 Merge remote-tracking branch 'upstream/master' into django-q 
# Conflicts:
#	InvenTree/InvenTree/status.py
#	InvenTree/templates/about.html
 2021-04-07 22:29:47 +10:00
Oliver Walters 4a3ca4638c Dockerfile updates 2021-04-07 22:27:55 +10:00
Oliver Walters d91531720b Unit testing for task scheduling 2021-04-07 22:17:24 +10:00
OliverandGitHub 5e0e364b6c Merge pull request #1441 from SchrodingersGat/missing-git 
Hide git information if there is an error
 2021-04-07 22:09:38 +10:00
OliverandGitHub da63ec5351 Merge pull request #1437 from matmair/translation_improv 
Translation improvements
 2021-04-07 20:57:47 +10:00
Oliver Walters 6412cf1c87 Hide git information if there is an error 2021-04-07 20:55:44 +10:00
Oliver Walters 00c4519d28 Simplify dockerfile 2021-04-02 00:54:29 +11:00
Oliver Walters 2436b1f2c9 Entrypoint script - start.sh 2021-04-02 00:40:47 +11:00
Oliver Walters 8d3b9e2ca4 Updates to settings.py 
- Create secret_key.txt if it does not exist
- Copy default settings file if it does not exist
 2021-04-02 00:06:17 +11:00
Oliver Walters be41be3981 Add "wait_for_db" management command 2021-04-02 00:03:56 +11:00
Oliver Walters 8e7e36089b Fix venv 2021-04-01 21:11:59 +11:00
Oliver Walters 47ba0599eb Reference environment variables in supervisor conf file 2021-04-01 20:44:27 +11:00
Oliver Walters db858b3cfc Install packages inside venv 2021-04-01 20:44:13 +11:00
Oliver Walters 148600a9c4 Copy gunicorn.conf.py 2021-04-01 20:38:18 +11:00
Oliver Walters 839c29117d Dockerfile updates 
- Pipe supervisor logs to stdout (so they are passed to the docker instance)
- Fix supervisor service
- Expose home dir and port as env vars
 2021-04-01 20:30:51 +11:00
Oliver Walters d446f8ddd1 Add supervisor conf file specific to docker 2021-04-01 20:14:31 +11:00
Oliver Walters 08a1a6cf43 Add configuration options for the Dockerfile 2021-04-01 20:14:17 +11:00
Oliver Walters 76ab38a06b Add docker info 2021-04-01 11:35:03 +11:00
Oliver Walters 38b9655ad9 Remove unused workflow 2021-04-01 08:43:58 +11:00
Oliver Walters b9e81c3c0e Start supervisord 
Ref: https://advancedweb.hu/supervisor-with-docker-lessons-learned/
 2021-03-31 23:39:16 +11:00
Oliver Walters b9f9b26ca5 Sudo not required, I guess? 2021-03-31 23:32:03 +11:00
Oliver Walters 7683cc1aaa APK not APT 2021-03-31 23:27:01 +11:00
Oliver Walters ff6b127f1b Typo fixin' 2021-03-31 23:22:17 +11:00
Oliver Walters 8b227ce297 More required packages, I guess... 2021-03-31 23:20:32 +11:00
Oliver Walters 286cf9b102 gcc required 2021-03-31 23:12:27 +11:00
Oliver Walters 24d36e0b66 Getting there... 2021-03-31 23:09:24 +11:00
Oliver Walters 251ec7a02f Fix lib names 2021-03-31 23:06:54 +11:00
Oliver Walters 61f8b982ce lib name fix 2021-03-31 23:03:13 +11:00
Oliver Walters 1f881dd041 Run as root 2021-03-31 23:00:22 +11:00
Oliver Walters 42b400e619 typo fix 2021-03-31 22:58:32 +11:00
Oliver Walters 601aff8283 Install git 2021-03-31 22:55:44 +11:00
Oliver Walters 58bfc80f79 Alpine uses different commands 2021-03-31 22:54:17 +11:00
Oliver Walters 2746396d11 Fix tag name 2021-03-31 22:50:41 +11:00
Oliver Walters 6017cad6b3 So apparently I cannot spell... 2021-03-31 22:48:58 +11:00
Oliver Walters 1a7b6e2613 Fix 2021-03-31 22:47:41 +11:00
Oliver Walters ab57fd3b76 Build docker image 2021-03-31 22:45:42 +11:00
Oliver Walters c0a0ca4588 PEP fix 2021-03-31 22:35:48 +11:00
Oliver Walters 3f257279ee Specify directories for CI 2021-03-31 22:31:50 +11:00
Oliver Walters 731ec25b24 Merge remote-tracking branch 'inventree/master' into django-q 
# Conflicts:
#	.github/workflows/style.yaml
#	.travis.yml
#	InvenTree/InvenTree/settings.py
 2021-03-31 22:17:38 +11:00
OliverandGitHub 53c9475e6d Update README.md 2021-03-31 22:11:01 +11:00
OliverandGitHub 9ccff64679 Update README.md 2021-03-31 22:10:12 +11:00
OliverandGitHub de3395ed26 Update README.md 2021-03-31 22:09:39 +11:00