inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 21:25:42 +00:00
Code Activity
12,253 Commits 7 Branches 132 Tags
58003bc2cb2211df046881a1cc976148081cf38e
Commit Graph

12253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias
16239289c0 remove dead code 2022-01-20 23:56:39 +01:00
Matthias
967efae8f1 make simpler 2022-01-20 23:55:48 +01:00
Matthias
21125eb892 add docstring 2022-01-20 23:55:07 +01:00
Matthias
3d2113d98b make simpler 2022-01-20 23:53:50 +01:00
Matthias
9da234002b add comment 2022-01-20 23:51:53 +01:00
Matthias
f8c4470d98 make simpler 2022-01-20 23:51:42 +01:00
Matthias
db66546606 rename to not shadow builtin 2022-01-20 23:49:21 +01:00
Matthias
ef22b9fc1b remove unneeded assingments 2022-01-20 23:47:59 +01:00
Matthias Mair
a540a5582e Merge branch 'inventree:master' into matmair/issue2279 2022-01-20 23:35:53 +01:00
Oliver
9ed0a6fece Merge pull request #2559 from SchrodingersGat/modal-form-fixes 
Modal form fixes
 2022-01-19 19:39:27 +11:00
Oliver Walters
9ffcdbc417 Fix issues when re-opening a secondary modal 2022-01-19 19:18:20 +11:00
Oliver Walters
3c328feb65 Donate keyboard focus when creating a secondary modal 2022-01-19 19:03:47 +11:00
Oliver Walters
21f2dd5896 Use modal "depth" to construct form fields 
- Top level modals are not changed
 2022-01-19 18:57:53 +11:00
Oliver
688806b5d3 Merge pull request #2558 from SchrodingersGat/user-menu-fix 
Slight menu and icon tweaks
 2022-01-19 15:17:17 +11:00
Oliver Walters
f16b18f7ad icon fixes 2022-01-19 14:41:22 +11:00
Oliver Walters
40564f0357 Rearrange drop-down menu 2022-01-19 14:38:05 +11:00
Oliver
cc6bbdf09a Merge pull request #2557 from SchrodingersGat/docker-dev-proxy 
Adds an option to enable nginx proxy for "dev mode" in docker
 2022-01-19 13:06:39 +11:00
Oliver Walters
f9ffbe322a Adds note 2022-01-19 12:32:30 +11:00
Oliver Walters
fcb958c5c0 Adds an option to enable nginx proxy for "dev mode" in docker 
- Commented out by default
- No functional change unless code is un-commented in the docker-compose script
 2022-01-19 12:31:35 +11:00
Oliver
dc84b41c90 Merge pull request #2556 from eeintech/po_qty_decimal_fix 
Allow decimal for quantity received on PO
 2022-01-19 10:39:50 +11:00
eeintech
391836689d Allow decimal for quantity received on PO 2022-01-17 09:04:14 -05:00
Oliver
a066b9b18d Merge pull request #2548 from SchrodingersGat/i18n-fix 
Fix for i18n javascript
 2022-01-14 00:26:35 +11:00
Oliver Walters
6f3918deea Fix for i18n javascript 2022-01-14 00:02:00 +11:00
Oliver
9b1ccedbb4 Merge pull request #2546 from SchrodingersGat/plugin-bool-fix 
Display "boolean" plugin setting values as checkboxes
 2022-01-13 17:18:01 +11:00
Oliver
c64ab4b605 Merge pull request #2547 from SchrodingersGat/form-checkbox-patch 
"patch" for legacy checkboxes in HTML forms
 2022-01-13 17:17:49 +11:00
Oliver
2f01691095 "patch" for legacy checkboxes in HTML forms 
- Update to match the style of more "modern" API-driven forms
- These legacy forms will be removed in future revision anyway
 2022-01-13 16:37:42 +11:00
Oliver
eb21e1f844 Display "boolean" plugin setting values as checkboxes 2022-01-13 16:22:38 +11:00
Oliver
8afce7b61a Merge pull request #2545 from inventree/dependabot/pip/django-3.2.11 
Bump django from 3.2.10 to 3.2.11
 2022-01-13 14:35:07 +11:00
dependabot[bot]
1927daa56d Bump django from 3.2.10 to 3.2.11 
Bumps [django](https://github.com/django/django) from 3.2.10 to 3.2.11.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.10...3.2.11)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-13 02:26:20 +00:00
Oliver
f6566bd476 Merge pull request #2544 from inventree/dependabot/pip/pillow-9.0.0 
Bump pillow from 8.3.2 to 9.0.0
 2022-01-13 13:25:40 +11:00
dependabot[bot]
f997e092b1 Bump pillow from 8.3.2 to 9.0.0 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.3.2 to 9.0.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.3.2...9.0.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-13 01:11:42 +00:00
Oliver
c55b31d2fd Merge pull request #2543 from SchrodingersGat/plugin-schedule-fix 
Adds the ability for 'scheduled tasks' to be member functions of plugins
 2022-01-13 11:25:48 +11:00
Oliver
3fb77f466c PEP fixes 2022-01-13 11:00:33 +11:00
Oliver
ae016730f8 Fix - needs a global function to schedule 2022-01-13 10:53:33 +11:00
Oliver
519a1009ab Fix: wrap args in quotes 2022-01-13 10:47:37 +11:00
Oliver
934de1f772 Adds the ability for 'scheduled tasks' to be member functions of plugins 2022-01-13 10:24:47 +11:00
Matthias Mair
c490574082 Merge branch 'inventree:master' into matmair/issue2279 2022-01-12 14:36:04 +01:00
Oliver
7f31e08c56 Merge pull request #2541 from SchrodingersGat/table-fix 
Fix "actions" column for part purchase order table
 2022-01-12 15:35:08 +11:00
Oliver
5df8377213 Fix "actions" column for part purchase order table 2022-01-12 15:12:53 +11:00
Oliver
0c37c2ce13 Merge pull request #2540 from SchrodingersGat/500 
Adds custom error handler page for 500
 2022-01-12 14:52:51 +11:00
Oliver
ebad01b497 Merge pull request #2525 from matmair/matmair/issue2519 
Refactor action and barcode plugins and cleanup
 2022-01-12 14:40:24 +11:00
Oliver
684de69251 Adds custom error handler page for 500 2022-01-12 13:06:50 +11:00
Oliver
506f5696ca Merge pull request #2539 from SchrodingersGat/exchange-rate-bug-fix 
Add try/except blocks for calls to conert_money
 2022-01-12 12:23:40 +11:00
Matthias
ee99052d04 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2279 2022-01-12 02:13:50 +01:00
Oliver
7ce55f4195 Add try/except blocks for calls to conert_money 2022-01-12 11:57:33 +11:00
Matthias
8690326a8f PEP fix 2022-01-12 01:04:25 +01:00
Matthias
678b89e093 consolidate helpers 2022-01-12 00:59:09 +01:00
Matthias
3dab1ab736 remove unneeded branches 2022-01-12 00:56:18 +01:00
Matthias
4f74ae3fce readd import 2022-01-12 00:22:06 +01:00
Matthias
62236474e2 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2519 2022-01-12 00:12:32 +01:00