inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 05:05:42 +00:00
Code Activity
12,970 Commits 6 Branches 132 Tags
a81ea01e8e250d8b47a884b7419603c0a07b1109
Commit Graph

12970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
e15a4b73cd Restore docker-compose.sqlite.yml 
This is used for docker build testing in CI!
 2022-04-21 00:03:48 +10:00
Oliver Walters
0c93009bf7 Tweaks to dockerfile 2022-04-21 00:01:11 +10:00
Oliver Walters
6929d07f42 Cache the pre-built image 
- The worker container can then use it
- Saves a *lot* of time (and otherwise wasted resources)
 2022-04-20 23:52:56 +10:00
Oliver Walters
e87e478009 Fix env file reference for docker-compose.yml (development) 2022-04-20 23:34:50 +10:00
Oliver Walters
85feb30812 Refactor development docker-compose setup 2022-04-20 23:15:37 +10:00
Oliver Walters
0b3aac21ea The production docker-compose file now no longer needs to be touched at all 
Everything can be specified in the .env file!
 2022-04-20 22:46:25 +10:00
Oliver Walters
c3fff02bd8 Automatically create a database (with the correct name) when the db container is started! 2022-04-20 22:11:07 +10:00
Oliver Walters
a50f26e84d Adjust naming of nginx production file 2022-04-20 21:52:25 +10:00
Oliver Walters
e4e735a71b Refactoring docker-compose.postgresql.yml 
- Do not require duplication of username / password values
- Specify different env file
- Move to a new child directory which simplifies setup
 2022-04-20 21:44:22 +10:00
Oliver Walters
f0a01587ac Rename default docker-compose file 2022-04-20 21:18:12 +10:00
Oliver
aec7d2d0aa Merge pull request #2842 from awiswasi/vulnerability-fix 
Fixed vulnerability in jquery-ui@1.12.1
 2022-04-20 11:11:58 +10:00
Awf Wiswasi
761e822a4e Updated jquery v1.12.1 to v1.13.0 to fix a possible XSS vulnerability. 2022-04-19 17:36:34 -07:00
Oliver
8d51c592e7 Merge pull request #2843 from matmair/plugin-mark-sample 
Mark sample plugins
 2022-04-20 09:20:00 +10:00
Matthias Mair
756eb4f4ea Merge branch 'inventree:master' into matmair/issue2385 2022-04-20 00:05:26 +02:00
Matthias Mair
d2e3d824b0 Merge branch 'inventree:master' into plugin-mark-sample 2022-04-20 00:03:42 +02:00
Oliver
ad541903c8 Merge pull request #2841 from SchrodingersGat/x-forwarded-for 
X-forwarded-for
 2022-04-20 07:02:52 +10:00
Matthias Mair
544a590b7a Merge branch 'inventree:master' into plugin-mark-sample 2022-04-19 18:24:21 +02:00
Matthias Mair
3e39f99ccb Merge branch 'inventree:master' into matmair/issue2788 2022-04-19 18:24:15 +02:00
Matthias Mair
b3dca68c6b Merge branch 'inventree:master' into matmair/issue2694 2022-04-19 18:24:12 +02:00
Matthias Mair
1399b4fbb3 Merge branch 'inventree:master' into matmair/issue2385 2022-04-19 18:23:49 +02:00
Awf Wiswasi
d93cc78bf6 Fixed vulnerability to Cross-site Scripting (XSS) when accepting the value of altField option of the Datepicker widget from untrusted sources, which may lead to execution of untrusted code. Vulnerability fixed in jquery-ui@1.13.0 2022-04-19 05:50:17 -07:00
Oliver Walters
85c8b94d80 Update nginx conf files 2022-04-19 22:09:30 +10:00
Oliver Walters
7c126ed712 Added x_forwarded_for middleware 
Used to extract remote client IP (when behind balancer / proxy / etc)
 2022-04-19 21:19:25 +10:00
Oliver
8a82f22378 Merge pull request #2840 from SchrodingersGat/batch-install 
Batch install
 2022-04-19 21:15:42 +10:00
Oliver Walters
db897d5dce JS linting 2022-04-19 20:47:37 +10:00
Oliver Walters
5fe2fb615b Style fixes 2022-04-19 20:41:08 +10:00
Oliver Walters
1fb94bf04b Allow "tracked" stock items to be installed, rather than just serialized 2022-04-19 20:35:54 +10:00
Oliver Walters
0e67ea8e95 Change ordering of stock item form fields 2022-04-19 20:28:45 +10:00
Oliver Walters
7531ef8e5f Prevent annoying error messages when notification request fails 2022-04-19 20:28:35 +10:00
Oliver Walters
cffeb62bd1 Bug fix for StockItem.clean() 2022-04-19 20:28:13 +10:00
Oliver Walters
141f6ccbdf Increase unit testing for StockItem API 2022-04-19 20:10:07 +10:00
Oliver Walters
2315d0cb5d Adds ability to filter stock item tables by "tracked" status 
- Also fixes some slight errors in the API filtering logic
 2022-04-19 18:13:48 +10:00
Oliver Walters
d213e1fdc7 Move API version information into a new file 
- Keeping track of the API version history was making for a very long file!
 2022-04-19 18:11:52 +10:00
Oliver Walters
39a77f7f3a Adds a "stock items" view for a part category 
- Shows any stock items for parts which exist in (or under) the selected category
 2022-04-19 18:04:48 +10:00
Oliver Walters
86c7417296 Remove old template file 2022-04-19 17:58:54 +10:00
Oliver Walters
1dfbd30294 Bug fix for displaying batch information 2022-04-19 17:53:58 +10:00
Oliver Walters
1519a4f882 Merge remote-tracking branch 'inventree/master' 2022-04-19 17:45:21 +10:00
Oliver
3563fd8c25 Merge pull request #2839 from SchrodingersGat/persian-language 
Adds persian language support
 2022-04-19 17:14:30 +10:00
Oliver
e33d970beb Add persian translation files 2022-04-19 16:36:52 +10:00
Oliver
584c06d045 Add support for fa (farsi / persian) 2022-04-19 16:31:38 +10:00
Oliver
71b4c64e4d Merge pull request #2837 from SchrodingersGat/variant-tracking 
Variant tracking
 2022-04-19 16:08:38 +10:00
Oliver
5f503c7e0f PEP fxies 2022-04-19 13:16:45 +10:00
Oliver
5240c60e0b Render part information in stock item tracking table (if provided) 2022-04-19 13:14:54 +10:00
Oliver
e5eb1f4513 Adds button to refresh stock item tracking table 2022-04-19 13:09:14 +10:00
Oliver
48170ee096 Update stock item variant conversion form to use new function 2022-04-19 13:04:17 +10:00
Oliver
87de7e4beb Adds "convert_to_variant" function for the StockItem model 2022-04-19 12:52:36 +10:00
Oliver
ab114b52e9 Add new CONVERTED_TO_VARIANT tracking code 2022-04-19 12:46:08 +10:00
Oliver
65ee15cace Merge pull request #2836 from SchrodingersGat/batch-in-forms 
Batch in forms
 2022-04-18 23:43:38 +10:00
Oliver Walters
1cddb565da PEP fixes 2022-04-18 23:20:59 +10:00
Oliver Walters
8a6b16c1d1 Display batch code for stock items in forms 2022-04-18 23:10:38 +10:00