 matmair
|
79a643ccf5
|
Merge branch 'master' of https://github.com/inventree/InvenTree into translation_improv
|
2021-04-14 10:46:41 +02:00 |
|
 Oliver Walters
|
4c86593159
|
Merge remote-tracking branch 'inventree/master'
|
2021-04-14 11:08:21 +10:00 |
|
|
Oliver
|
623d0366fc
|
Update README.md
Fixed docker link
|
2021-04-14 07:55:12 +10:00 |
|
 eeintech
|
1e6c6c678f
|
Split supplier part update migration and added reverse method for manufacturer data
|
2021-04-13 10:25:53 -04:00 |
|
|
eeintech
|
42a73576da
|
Merge branch 'master' of github.com:inventree/InvenTree into manufacturer_part
|
2021-04-13 09:48:55 -04:00 |
|
|
Oliver
|
a8d22dac62
|
Merge pull request #1458 from matmair/translation_improv
updated translation references
|
2021-04-13 21:20:32 +10:00 |
|
|
matmair
|
75a249da95
|
Merge branch 'master' of https://github.com/inventree/InvenTree into translation_improv
|
2021-04-13 13:03:58 +02:00 |
|
|
matmair
|
71425d3bc5
|
updated translation references
|
2021-04-13 12:56:18 +02:00 |
|
|
Oliver
|
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 |
|
|
eeintech
|
3eae70e745
|
Merged master and company migrations
|
2021-04-12 11:10:35 -04: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 |
|
|
Oliver
|
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 |
|
|
Oliver Walters
|
ce38fe0d4c
|
Merge remote-tracking branch 'upstream/master'
|
2021-04-11 16:55:14 +10:00 |
|
|
Oliver
|
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 |
|
|
Oliver
|
effd547260
|
Update version.py
|
2021-04-11 15:39:53 +10:00 |
|
|
Oliver
|
7c9ad3f406
|
Update version.py
0.2.0
|
2021-04-11 15:39:16 +10:00 |
|
|
Oliver
|
4cf0339393
|
Update README.md
|
2021-04-11 15:38:52 +10:00 |
|
|
Oliver
|
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 |
|
|
Oliver
|
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 |
|