2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-15 03:25:42 +00:00
Commit Graph

7819 Commits

Author SHA1 Message Date
87a41c7e39 Merge pull request #2000 from SchrodingersGat/dev-conf-fix
Fix for docker development env file
2021-08-23 09:10:25 +10:00
47524f6ea3 Fix for docker development env file 2021-08-23 08:39:09 +10:00
a5f26c7f09 Merge pull request #1998 from bobek/patch-1
Fix for production docker environment
2021-08-23 08:38:04 +10:00
9fd4b5cce3 use new setting for part-actions
PR complete for #1999
2021-08-22 23:36:49 +02:00
b674d851f2 disable fucntions in master nav 2021-08-22 22:30:21 +02:00
3682eaac14 disable links in navbar in company views 2021-08-22 22:27:53 +02:00
d4efdf86e5 new settingsthe settings-page 2021-08-22 22:09:07 +02:00
8edfada22a adding settings definitions for turning off features 2021-08-22 22:08:41 +02:00
7f126e58d2 Fix for production docker environment
Values are passed as written resulting in `"WARNING"` being passed to python logger, which will complain and panic. Fix is simply to remove `"` from the value.
2021-08-22 20:59:51 +02:00
b6df623554 Merge pull request #1997 from SchrodingersGat/new-po-from-order
Refactor buttons in "order parts" wizard
2021-08-23 00:49:27 +10:00
174b7ba7f2 Fix for "new purchase order" button 2021-08-23 00:28:36 +10:00
449e0c0af2 Refactor button in first step of "order parts" wizard
- "new supplier part" button was broken
- Was linked to the old "launchModalForm" code
- Now calls createSupplierPart
2021-08-23 00:17:45 +10:00
3cf06b4960 Merge pull request #1995 from SchrodingersGat/delete-unused-images
remove some unused images
2021-08-23 00:11:39 +10:00
f2e58ebbdd remove some unused images 2021-08-22 23:54:43 +10:00
370fbea396 Merge pull request #1987 from matmair/fix-for-1986
Disable table sorting when order is fixed
2021-08-22 23:47:21 +10:00
51de0a982a Merge pull request #1990 from matmair/fix-tooltip-linebreak
Fix tooltip linebreak
2021-08-22 08:19:54 +10:00
38af66c0de fix linebreak in tooltip
found during fixing #1989
2021-08-21 00:07:45 +02:00
8fad704d76 disable ordering on stock 2021-08-20 22:53:25 +02:00
5a59a37a89 disable ordering on category 2021-08-20 22:52:57 +02:00
109b8c943e disable ordering on part-name 2021-08-20 22:52:14 +02:00
7533a9ac0c disable ordering on IPN if fixed ordering 2021-08-20 22:51:36 +02:00
8646c73021 Merge pull request #1980 from matmair/housekeeping
Housekeeping
2021-08-20 09:02:33 +10:00
5bd31f11eb Merge pull request #1978 from matmair/fix-translate
Fix translations stats - task
2021-08-20 09:01:50 +10:00
831ccec399 Merge pull request #1981 from matmair/coverage-to-setup
Merge coverage settings
2021-08-20 09:01:12 +10:00
e24a158919 Merge branch 'inventree:master' into bpm-purchase-price 2021-08-20 00:42:50 +02:00
c4700d0e10 move coverage settings into setup.cfg 2021-08-20 00:35:25 +02:00
e17f15f403 updating year on license 2021-08-20 00:31:10 +02:00
e34c27e360 removed translation part - is done now by action 2021-08-20 00:25:55 +02:00
414d2dbc96 Merge pull request #1977 from eeintech/company_templates
Fixed company templates
2021-08-20 07:47:29 +10:00
575cf87b98 also run static on update 2021-08-19 23:37:38 +02:00
ee33de711a move translation stats into own task 2021-08-19 23:36:54 +02:00
cb1e7a6cc5 only process purchase_price if prices present 2021-08-19 23:22:58 +02:00
ec7392303d Fixed company templates 2021-08-19 10:47:46 -04:00
c16ce925dd Merge pull request #1973 from SchrodingersGat/delete-expired-sessions
Run periodic (daily) task to clear out expired sessions
2021-08-19 16:53:19 +10:00
f0415640d5 Run periodic (daily) task to clear out expired sessions 2021-08-19 16:34:57 +10:00
c3048a1bf1 Merge pull request #1970 from SchrodingersGat/entrypoint
Entrypoint
2021-08-19 12:12:01 +10:00
9ed2025021 Add a TODO for future reference 2021-08-19 11:14:13 +10:00
52bdfe5465 Env interpolation doesn't seem to work in the CMD 2021-08-18 20:52:14 +10:00
eeac561b9b typo fix 2021-08-18 17:07:23 +10:00
2095d66677 Fix entrypoint / cmd for production server 2021-08-18 16:29:54 +10:00
79d7a9f922 fix typo in dockerfile 2021-08-18 15:16:22 +10:00
41db0ff60d Need to specify python3 2021-08-18 14:58:16 +10:00
db477bceab typo fix 2021-08-18 14:47:34 +10:00
d756579a06 Split production environment variables out into a .env file 2021-08-18 13:02:36 +10:00
c1ea6dbb9b Remove commented out functionality from the entrypoint command 2021-08-18 12:28:09 +10:00
c2af401854 Pin base python package requirements
- Require invoke to be installed before we can run "invoke update"
2021-08-18 12:03:24 +10:00
8fea9bc645 Re-add docker file git version info 2021-08-18 11:25:19 +10:00
7bfddd6d51 Simplify init scripts
Single script init.sh which performs the following tasks:
- Creates required directory structure
- Activates python venv (if required)
- Waits for database connection
- Runs command
2021-08-18 09:52:27 +10:00
3b8ee48581 Fix env defines in dockerfile 2021-08-18 09:34:09 +10:00
da834d8bcc Reduce cruft in logs 2021-08-18 00:04:38 +10:00