inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-18 04:33:48 +00:00
Code Activity
7,457 Commits 9 Branches 164 Tags
6cd87e830d5b0c494aba95298162e52491db0861
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver 6cd87e830d Merge remote-tracking branch 'inventree/master' into 0.4.x 2021-08-04 12:12:12 +10:00
OliverandGitHub 7545591c59 Merge pull request #1899 from SchrodingersGat/cat-create 
Refactor "CreatePartCategory" form to API
 2021-08-04 11:52:21 +10:00
Oliver 989983bdb5 Fixed missing import 2021-08-04 11:37:59 +10:00
Oliver 83d8226ad6 Refactor "CreatePartCategory" form to API 
(cherry picked from commit 06ff961564)
 2021-08-04 11:34:42 +10:00
Oliver c4570a79de Merge remote-tracking branch 'inventree/master' into 0.4.x 2021-08-04 09:04:24 +10:00
OliverandGitHub 8daf601f00 Merge pull request #1897 from matmair/price-terms 
updating language to be clearer
 2021-08-04 09:03:13 +10:00
OliverandGitHub 69f242d11d Merge pull request #1892 from eeintech/stock_installed_items 
Re-enabled installing stock items into others
 2021-08-04 09:01:28 +10:00
OliverandGitHub 910c57c92d Merge pull request #1895 from eeintech/fix_has_ipn_filter 
'has_ipn' filter method did not return queryset
 2021-08-04 08:55:49 +10:00
Oliver 073bb7c488 Merge pull request #1894 from SchrodingersGat/non-int-serial-fix 
Fix for non-integer serial numbers

(cherry picked from commit 529742b520)
 2021-08-03 10:06:19 +10:00
OliverandGitHub 529742b520 Merge pull request #1894 from SchrodingersGat/non-int-serial-fix 
Fix for non-integer serial numbers
 2021-08-03 10:03:05 +10:00
Oliver f057937df0 Fix for non-integer serial numbers 2021-08-03 09:46:28 +10:00
OliverandGitHub 9aa5086067 Merge pull request #1819 from eeintech/part_main_details 
Cleaner part details
 2021-08-02 08:47:18 +10:00
Oliver b18f360daf 0.4.2 2021-08-02 08:43:04 +10:00
Oliver 20cc952982 Merge pull request #1887 from matmair/settings-safety 
settings fixes

(cherry picked from commit d154ca08ea)
 2021-08-02 08:42:34 +10:00
Oliver cd39fd1dc2 Merge pull request #1890 from matmair/fix-for-1888 
catch connection errors in exchange update

(cherry picked from commit db57e9516b)
 2021-08-02 08:42:26 +10:00
OliverandGitHub d154ca08ea Merge pull request #1887 from matmair/settings-safety 
settings fixes
 2021-08-02 08:38:34 +10:00
OliverandGitHub db57e9516b Merge pull request #1890 from matmair/fix-for-1888 
catch connection errors in exchange update
 2021-08-02 08:34:52 +10:00
OliverandGitHub 7ed43f5a11 Merge pull request #1886 from inventree/revert-1885-docker-publish 
Revert "Publish on tags also"
 2021-07-30 13:39:49 +10:00
OliverandGitHub 1d19393442 Revert "Publish on tags also" 2021-07-30 12:42:03 +10:00
OliverandGitHub 6d0b01d0fb Merge pull request #1885 from SchrodingersGat/docker-publish 
Publish on tags also
 2021-07-30 12:33:31 +10:00
Oliver 13898d6687 Publish on tags also 2021-07-30 11:51:06 +10:00
Oliver 0e59c15773 0.4.1 2021-07-30 11:26:53 +10:00
OliverandGitHub eb883d7e70 Merge pull request #1884 from SchrodingersGat/typo-fix 
logging.get -> logging.getLogger
 2021-07-30 00:09:43 +10:00
Oliver Walters d9f4c34a42 logging.get -> logging.getLogger 2021-07-29 23:44:52 +10:00
OliverandGitHub 3806e3ebeb Merge pull request #1880 from SchrodingersGat/settings-fix 
Bug fix
 2021-07-29 17:56:45 +10:00
Oliver c39e3aaa82 Bug fix 2021-07-29 17:52:24 +10:00
OliverandGitHub 60e4022568 Merge pull request #1879 from SchrodingersGat/docker-improvements 
Specify how many workers to use
 2021-07-29 17:19:41 +10:00
Oliver 542c204ca0 PEP fixes 2021-07-29 16:39:51 +10:00
Oliver dd12a593f4 Specify how many workers to use 2021-07-29 16:37:34 +10:00
OliverandGitHub 935ef968de Merge pull request #1878 from SchrodingersGat/js-template-stuff 
Js template stuff
 2021-07-29 13:42:47 +10:00
Oliver 7756c766c3 Fix stock.js 2021-07-29 12:35:21 +10:00
Oliver 4381a16b0e Template cleanup 2021-07-29 12:31:07 +10:00
Oliver 6fe5f0e0e6 Fixes for order.js 2021-07-29 11:58:32 +10:00
Oliver ba5479090a Fix nav.js 2021-07-29 11:54:04 +10:00
Oliver 28bf5bfdbc Fix table_filters.js 2021-07-29 11:52:50 +10:00
Oliver a222efda33 Fix rendering issues 2021-07-29 11:43:50 +10:00
Oliver 27ec65a002 Add 'settings.js' which provides all settings (global and user) as a dynamic javascript file 
- Minimal database hits required
 2021-07-29 11:28:04 +10:00
Oliver 915756eacf Improve test output 2021-07-29 09:28:08 +10:00
Oliver 8e97d14f1f Rename CI test 2021-07-29 09:26:56 +10:00
Oliver 14aebfdae1 Split dynamic javascript files into two separate directories 
- One gets translated and is served statically
- One does not get translated and is served dynamically
- Add CI step
 2021-07-29 09:23:24 +10:00
Oliver bc3c3be751 force linux-style line endings for .sh files 2021-07-29 09:10:46 +10:00
Oliver 0a73032950 Merge pull request #1877 from eeintech/fix_search_js 
Fixed missing comma propagating to translated JS files

(cherry picked from commit 2009773d9d)
 2021-07-29 08:27:49 +10:00
OliverandGitHub 2009773d9d Merge pull request #1877 from eeintech/fix_search_js 
Fixed missing comma propagating to translated JS files
 2021-07-29 08:27:20 +10:00
OliverandGitHub 430f737953 Merge pull request #1876 from SchrodingersGat/mpn-api 
Adds an API filter class for the ManufacturerPart list endpoint
 2021-07-29 00:23:44 +10:00
Oliver baa6283d20 Fixes 2021-07-28 23:47:50 +10:00
Oliver 5744796506 Adds an API filter class for the ManufacturerPart list endpoint 2021-07-28 23:32:49 +10:00
Oliver a7229b5b0b Merge pull request #1874 from SchrodingersGat/docker-dev-fix 
Copy static files when starting dev server

(cherry picked from commit 50eb70f538)
 2021-07-28 22:50:31 +10:00
OliverandGitHub 50eb70f538 Merge pull request #1874 from SchrodingersGat/docker-dev-fix 
Copy static files when starting dev server
 2021-07-28 22:50:03 +10:00
Oliver 399e44fce7 Copy static files when starting dev server 2021-07-28 22:30:41 +10:00
OliverandGitHub 20b6e0fd1a Update version.py 2021-07-28 15:46:52 +10:00
OliverandGitHub 9d9bfd6c30 Update version.py 
0.4.0 release
 2021-07-28 15:46:20 +10:00
OliverandGitHub 5dc11ad8e9 Merge pull request #1873 from SchrodingersGat/translation 
Translation
 2021-07-28 15:45:08 +10:00
Oliver 839cd55f20 Merge branch 'l10' into translation 
# 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-07-28 15:23:10 +10:00
Oliver cb3ca79654 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-07-28 15:22:31 +10:00
Oliver ef2d39c980 Fix: New translations django.po from Crowdin 2021-07-28 15:13:47 +10:00
Oliver b642a48d74 Fix: New translations django.po from Crowdin 2021-07-28 15:13:46 +10:00
Oliver a58cf8ba5d Fix: New translations django.po from Crowdin 2021-07-28 15:13:45 +10:00
Oliver 050c430400 Fix: New translations django.po from Crowdin 2021-07-28 15:13:43 +10:00
Oliver 51bc060c08 Fix: New translations django.po from Crowdin 2021-07-28 15:13:42 +10:00
Oliver 970f3f94ec Fix: New translations django.po from Crowdin 2021-07-28 15:13:41 +10:00
Oliver 39f2558a33 Fix: New translations django.po from Crowdin 2021-07-28 15:13:40 +10:00
Oliver e12a0c1d83 Fix: New translations django.po from Crowdin 2021-07-28 15:13:38 +10:00
Oliver b5d8b7d363 Fix: New translations django.po from Crowdin 2021-07-28 15:13:35 +10:00
Oliver 6e1a39d491 Fix: New translations django.po from Crowdin 2021-07-28 15:13:34 +10:00
Oliver 80b0428e37 Fix: New translations django.po from Crowdin 2021-07-28 15:13:32 +10:00
Oliver f37b1d2566 Fix: New translations django.po from Crowdin 2021-07-28 15:13:31 +10:00
Oliver d4f34bf5e6 Fix: New translations django.po from Crowdin 2021-07-28 15:13:30 +10:00
Oliver 0d3b810164 Fix: New translations django.po from Crowdin 2021-07-28 15:13:29 +10:00
Oliver 3a8b319d64 Fix: New translations django.po from Crowdin 2021-07-28 15:13:27 +10:00
Oliver 8e016e5de4 Fix: New translations django.po from Crowdin 2021-07-28 15:13:26 +10:00
Oliver 2fa37cfe88 Fix: New translations django.po from Crowdin 2021-07-28 15:13:25 +10:00
Oliver 91722a9338 Fix: New translations django.po from Crowdin 2021-07-28 15:13:24 +10:00
OliverandGitHub 78ed2776d1 Merge pull request #1863 from SchrodingersGat/settings-refactor 
Refactoring existing settings views
 2021-07-28 15:04:37 +10:00
Oliver 6fd70e4741 Fix search settings page 2021-07-28 14:18:42 +10:00
Oliver cd1ecc5e8f style fixes 2021-07-28 14:17:25 +10:00
Oliver 1fe00ef7df Refactor 'category' setttings 2021-07-28 14:16:55 +10:00
Oliver 25ff74835d Refactor PartCategoryParameter API 2021-07-28 14:05:49 +10:00
Oliver c88c291c20 Fix: New translations django.po from Crowdin 2021-07-28 07:03:04 +10:00
Oliver 2d3bed3946 Fix: New translations django.po from Crowdin 2021-07-28 07:03:02 +10:00
Oliver f4cff4437e Fix: New translations django.po from Crowdin 2021-07-28 07:03:01 +10:00
Oliver 7701060610 Fix: New translations django.po from Crowdin 2021-07-28 07:02:59 +10:00
Oliver fb94ebbd3e Fix: New translations django.po from Crowdin 2021-07-28 07:02:57 +10:00
Oliver 0791bd8daa Fix: New translations django.po from Crowdin 2021-07-28 07:02:55 +10:00
Oliver 21ee4d9b77 Fix: New translations django.po from Crowdin 2021-07-28 07:02:53 +10:00
Oliver 0a54e4274e Fix: New translations django.po from Crowdin 2021-07-28 07:02:52 +10:00
Oliver 6627fd1510 Fix: New translations django.po from Crowdin 2021-07-28 07:02:51 +10:00
Oliver e7f8ab1247 Fix: New translations django.po from Crowdin 2021-07-28 07:02:48 +10:00
Oliver 5810b63f20 Fix: New translations django.po from Crowdin 2021-07-28 07:02:46 +10:00
Oliver c4940cca5e Fix: New translations django.po from Crowdin 2021-07-28 07:02:43 +10:00
Oliver b6cf17ec53 Fix: New translations django.po from Crowdin 2021-07-28 07:02:42 +10:00
Oliver 2948cabd1c Fix: New translations django.po from Crowdin 2021-07-28 07:02:40 +10:00
Oliver 26cee8430a Fix: New translations django.po from Crowdin 2021-07-28 07:02:39 +10:00
Oliver a7f3a21dd6 Fix: New translations django.po from Crowdin 2021-07-28 07:02:38 +10:00
Oliver 5ce8715df8 Fix: New translations django.po from Crowdin 2021-07-28 07:02:36 +10:00
Oliver 08b612a472 Fix: New translations django.po from Crowdin 2021-07-28 07:02:35 +10:00
OliverandGitHub 29b496b588 Merge pull request #1870 from eeintech/fix_1864 
Fix user setting query
 2021-07-28 07:01:46 +10:00
OliverandGitHub d6420341f4 Merge pull request #1871 from eeintech/stock_item_remove_redirect 
Redirect to stock index if stock item is completely depleted
 2021-07-28 07:00:47 +10:00
Oliver c08cb43c39 Template rendering fix for inventree.js 2021-07-27 17:22:44 +10:00
Oliver a93d96de58 Cleanjup 2021-07-27 17:13:02 +10:00
Oliver 990b987692 Reload settings values "live" (without a page refresh) 2021-07-27 17:03:37 +10:00