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
8,862 Commits 9 Branches 164 Tags
8d6d16c07bab19859120723f3395b52931784f26
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver 8d6d16c07b Add template for app issues 2021-09-17 22:13:13 +10:00
OliverandGitHub 7b2b01c26f Merge pull request #2060 from SchrodingersGat/character-test 
Adds a test for non-standard characters via API
 2021-09-17 21:48:10 +10:00
Oliver e7963f8a85 test fixes 2021-09-17 21:06:07 +10:00
Oliver 11cc0c7ced Adds a test for non-standard characters via API 2021-09-17 20:53:18 +10:00
OliverandGitHub d73a7176fd Merge pull request #2055 from SchrodingersGat/test-template-table-fix 
Fix callback for test template table
 2021-09-14 10:58:57 +10:00
Oliver 5bd5c61b9d Fix callback for test template table 2021-09-14 10:43:40 +10:00
OliverandGitHub 1643a2ccb2 Merge pull request #2054 from matmair/fix-for-2004 
Fix for 2004
 2021-09-14 10:00:19 +10:00
OliverandGitHub 95924852a4 Merge pull request #2053 from SchrodingersGat/contributing 
Update contributing.md
 2021-09-13 20:29:09 +10:00
Oliver dfd500097e Update contributing.md 
(cherry picked from commit 398842d6e5)
 2021-09-13 20:03:31 +10:00
Oliver 7a7684b018 Merge branch 'l10' 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/el/LC_MESSAGES/django.po
#	InvenTree/locale/en/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/he/LC_MESSAGES/django.po
#	InvenTree/locale/id/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/ko/LC_MESSAGES/django.po
#	InvenTree/locale/nl/LC_MESSAGES/django.po
#	InvenTree/locale/no/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/sv/LC_MESSAGES/django.po
#	InvenTree/locale/th/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/vi/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
 2021-09-13 10:15:08 +10:00
Oliver 6f932551d4 Merge remote-tracking branch 'inventree/l10_crowdin' into l10 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/el/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/he/LC_MESSAGES/django.po
#	InvenTree/locale/id/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/ko/LC_MESSAGES/django.po
#	InvenTree/locale/nl/LC_MESSAGES/django.po
#	InvenTree/locale/no/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/sv/LC_MESSAGES/django.po
#	InvenTree/locale/th/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/vi/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
 2021-09-13 10:01:45 +10:00
Oliver 0bd37e61ea Fix: New translations django.po from Crowdin 2021-09-12 23:44:36 +10:00
Oliver 1501820760 Fix: New translations django.po from Crowdin 2021-09-12 23:44:35 +10:00
Oliver 0d3f738c79 Fix: New translations django.po from Crowdin 2021-09-12 23:44:33 +10:00
Oliver ad662531d2 Fix: New translations django.po from Crowdin 2021-09-12 23:44:32 +10:00
Oliver 422fa63b10 Fix: New translations django.po from Crowdin 2021-09-12 23:44:31 +10:00
Oliver 9d2f52c203 Fix: New translations django.po from Crowdin 2021-09-12 23:44:30 +10:00
Oliver 4fbc9fa70e Fix: New translations django.po from Crowdin 2021-09-12 23:44:28 +10:00
Oliver ea05883589 Fix: New translations django.po from Crowdin 2021-09-12 23:44:27 +10:00
Oliver dd9a5d218d Fix: New translations django.po from Crowdin 2021-09-12 23:44:26 +10:00
Oliver 93c3a805bf Fix: New translations django.po from Crowdin 2021-09-12 23:44:25 +10:00
Oliver a5e02f37d9 Fix: New translations django.po from Crowdin 2021-09-12 23:44:23 +10:00
Oliver 506af63d65 Fix: New translations django.po from Crowdin 2021-09-12 23:44:22 +10:00
Oliver 820631e2d1 Fix: New translations django.po from Crowdin 2021-09-12 23:44:21 +10:00
Oliver c4e6b8d7d8 Fix: New translations django.po from Crowdin 2021-09-12 23:44:19 +10:00
Oliver d4be8407fb Fix: New translations django.po from Crowdin 2021-09-12 23:44:18 +10:00
Oliver 97e984a4c0 Fix: New translations django.po from Crowdin 2021-09-12 23:44:17 +10:00
Oliver 9615ea2e1b Fix: New translations django.po from Crowdin 2021-09-12 23:44:15 +10:00
Oliver e2dbdbf1a2 Fix: New translations django.po from Crowdin 2021-09-12 23:44:14 +10:00
Oliver Walters 06c03039da Add version related tags 
- Docs URL points to correct documentation version
- Display if we are in "development" version
 2021-09-12 23:13:55 +10:00
OliverandGitHub 695370c8d7 Merge pull request #2048 from inventree/version-tags 
Updates for docker workflows:
 2021-09-12 22:28:26 +10:00
Oliver Walters 7b21270baf Bump version number 2021-09-12 22:08:51 +10:00
Oliver Walters 08397c5e5f different syntax 2021-09-12 22:06:06 +10:00
Oliver Walters 3d4a8bdd22 env prefix 2021-09-12 21:54:59 +10:00
Oliver Walters 06f323fe47 Use GITHUB_BASE_REF 2021-09-12 21:52:02 +10:00
Oliver Walters 6baaf98d7e fix environment variable 2021-09-12 21:49:13 +10:00
Oliver Walters 5770789ddb more fix 2021-09-12 21:40:56 +10:00
Oliver Walters fd192b65bf workflow fix 2021-09-12 21:37:30 +10:00
Oliver Walters 5ee004eabd Add workflow to check version number 2021-09-12 21:36:14 +10:00
Oliver Walters 429add9000 Updates for docker workflows: 
- check_version_number script now handles stable and development codes
 2021-09-12 21:17:56 +10:00
Oliver 0d24f3be8b Fix: New translations django.po from Crowdin 2021-09-11 13:54:59 +10:00
Oliver 45dfeb4614 Fix: New translations django.po from Crowdin 2021-09-11 12:47:26 +10:00
Oliver 4aa829877e Fix: New translations django.po from Crowdin 2021-09-11 11:45:01 +10:00
Oliver 3a82c675c2 Update .gitignore 2021-09-08 15:20:58 +10:00
Oliver 79a0140d71 Merge remote-tracking branch 'inventree/l10_crowdin' into l10 
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/el/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/he/LC_MESSAGES/django.po
#	InvenTree/locale/id/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/ko/LC_MESSAGES/django.po
#	InvenTree/locale/nl/LC_MESSAGES/django.po
#	InvenTree/locale/no/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/sv/LC_MESSAGES/django.po
#	InvenTree/locale/th/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/vi/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
 2021-09-08 15:20:13 +10:00
OliverandGitHub 71ca60d679 Merge pull request #2044 from SchrodingersGat/new-line-item 
Bug fix - "Add line item" button
 2021-09-08 14:32:51 +10:00
Oliver ca7d779116 Fix: New translations django.po from Crowdin 2021-09-08 14:15:50 +10:00
Oliver 8e85203be3 Fix: New translations django.po from Crowdin 2021-09-08 14:15:49 +10:00
Oliver 6cee801659 Fix: New translations django.po from Crowdin 2021-09-08 14:15:47 +10:00
Oliver def20d2923 Fix: New translations django.po from Crowdin 2021-09-08 14:15:45 +10:00
Oliver 821fe81411 Fix: New translations django.po from Crowdin 2021-09-08 14:15:44 +10:00
Oliver aee8ca886f Fix: New translations django.po from Crowdin 2021-09-08 14:15:42 +10:00
Oliver ed0cb33510 Fix: New translations django.po from Crowdin 2021-09-08 14:15:41 +10:00
Oliver fcc8e14a5b Fix: New translations django.po from Crowdin 2021-09-08 14:15:40 +10:00
Oliver e47c7322b8 Fix: New translations django.po from Crowdin 2021-09-08 14:15:39 +10:00
Oliver 4ca40ca83c Fix: New translations django.po from Crowdin 2021-09-08 14:15:37 +10:00
Oliver 4a7e71b0a2 Fix: New translations django.po from Crowdin 2021-09-08 14:15:36 +10:00
Oliver 8121ab32c5 Fix: New translations django.po from Crowdin 2021-09-08 14:15:35 +10:00
Oliver 50f673d25d Fix: New translations django.po from Crowdin 2021-09-08 14:15:34 +10:00
Oliver 79d3ef982a Fix: New translations django.po from Crowdin 2021-09-08 14:15:32 +10:00
Oliver 2fd179bf58 Fix: New translations django.po from Crowdin 2021-09-08 14:15:31 +10:00
Oliver 6adcf60ff8 Fix: New translations django.po from Crowdin 2021-09-08 14:15:29 +10:00
Oliver dfeffff118 Fix: New translations django.po from Crowdin 2021-09-08 14:15:28 +10:00
Oliver 6f3eb77ac9 Fix: New translations django.po from Crowdin 2021-09-08 14:15:27 +10:00
Oliver b9b23a3853 bug fix 2021-09-08 14:14:14 +10:00
OliverandGitHub 829dd0d637 Merge pull request #2043 from SchrodingersGat/received-stock-items 
Fixes for purchase order stock table
 2021-09-08 13:29:05 +10:00
Oliver 387680fbcd More linting 2021-09-08 13:13:40 +10:00
Oliver 20788bb559 Bump pillow version for security fix 2021-09-08 13:02:49 +10:00
Oliver a32a30de52 javascript linting 2021-09-08 13:02:03 +10:00
Oliver 1a21576f28 Adds separate option for "prevent_new_stock" to stock_table 2021-09-08 12:57:42 +10:00
OliverandGitHub ba787a0485 Merge pull request #2041 from SchrodingersGat/metadata-fixes 
Fix OPTIONS request lookup time
 2021-09-08 12:52:00 +10:00
Oliver 8368798280 Move po-line-item-table into javascript file 
- for better linting
 2021-09-08 12:51:49 +10:00
Oliver 6012855ec4 PEP fixes 2021-09-08 12:24:33 +10:00
Oliver 919b39515f Improve instance lookup for metadata layer 
- Existing call to get_object() could take > 20 seconds in some cases
- Not really sure why, some issue with the DRF library
- Was probably parsing the entire queryset rather than doing a PK lookup
- Instead, directly use the provided pk to get the model
 2021-09-08 12:18:07 +10:00
OliverandGitHub 22aa0a03c9 Merge pull request #2039 from SchrodingersGat/requirements 
Re-add gunicorn to requirements file
 2021-09-08 08:48:20 +10:00
Oliver 84528df6f8 Re-add gunicorn to requirements file 2021-09-08 08:01:05 +10:00
Oliver 5c9824429d Fix: New translations django.po from Crowdin 2021-09-08 00:10:59 +10:00
Oliver ff71f4da13 Fix: New translations django.po from Crowdin 2021-09-08 00:10:57 +10:00
Oliver 2c43b0d9fe Fix: New translations django.po from Crowdin 2021-09-08 00:10:56 +10:00
Oliver 204325d7ad Fix: New translations django.po from Crowdin 2021-09-08 00:10:53 +10:00
Oliver 80fcb2a368 Fix: New translations django.po from Crowdin 2021-09-08 00:10:51 +10:00
Oliver ea3aada1e1 Fix: New translations django.po from Crowdin 2021-09-08 00:10:50 +10:00
Oliver d8028d9eae Fix: New translations django.po from Crowdin 2021-09-08 00:10:48 +10:00
Oliver 19cd54f420 Fix: New translations django.po from Crowdin 2021-09-08 00:10:46 +10:00
Oliver 1d10c30f0a Fix: New translations django.po from Crowdin 2021-09-08 00:10:45 +10:00
Oliver 8a8e8b6e31 Fix: New translations django.po from Crowdin 2021-09-08 00:10:43 +10:00
Oliver 145dab06bb Fix: New translations django.po from Crowdin 2021-09-08 00:10:42 +10:00
Oliver f4005bc2fc Fix: New translations django.po from Crowdin 2021-09-08 00:10:39 +10:00
Oliver 5dd5404af7 Fix: New translations django.po from Crowdin 2021-09-08 00:10:37 +10:00
Oliver 53b8d7b348 Fix: New translations django.po from Crowdin 2021-09-08 00:10:36 +10:00
Oliver 0811fa1402 Fix: New translations django.po from Crowdin 2021-09-08 00:10:34 +10:00
Oliver 42cb19440e Fix: New translations django.po from Crowdin 2021-09-08 00:10:32 +10:00
Oliver 73f058d771 Fix: New translations django.po from Crowdin 2021-09-08 00:10:30 +10:00
Oliver 984135e952 Fix: New translations django.po from Crowdin 2021-09-08 00:10:29 +10:00
OliverandGitHub a70f4c86eb Merge pull request #2013 from SchrodingersGat/receive-via-api 
Receive via api
 2021-09-07 23:56:44 +10:00
Oliver Walters f349dc01ea JS lint 2021-09-07 23:41:13 +10:00
Oliver Walters f38bf6e20a Adds unit testing for barcode field 2021-09-07 23:34:14 +10:00
Oliver 88097235d8 Fix: New translations django.po from Crowdin 2021-09-07 23:15:16 +10:00
Oliver 3dc13273ad Fix: New translations django.po from Crowdin 2021-09-07 23:15:15 +10:00
Oliver de86d77ccd Fix: New translations django.po from Crowdin 2021-09-07 23:15:13 +10:00