inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-04-25 12:33:33 +00:00
Code Activity
17,644 Commits 11 Branches 155 Tags
567ad0eb6572caefc176ddef1e18070ade98f8b5
Commit Graph

17644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver 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
github-actions[bot] 0cbffe9891 updated translation base 2021-07-28 05:06:04 +00:00
Oliver 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
github-actions[bot] df4f038e44 updated translation base 2021-07-27 21:03:04 +00: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
github-actions[bot] e2fc0dfbf9 updated translation base 2021-07-27 21:02:04 +00:00
Oliver 29b496b588 Merge pull request #1870 from eeintech/fix_1864 
Fix user setting query
 2021-07-28 07:01:46 +10:00
Oliver 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
eeintech e9be3fb4ec Redirect to stock index if stock item is completely depleted 2021-07-27 11:11:30 -04:00