2
0
mirror of https://github.com/inventree/InvenTree.git synced 2026-05-05 01:03:37 +00:00
Commit Graph

9117 Commits

Author SHA1 Message Date
Oliver cfde81d09f Merge remote-tracking branch 'inventree/l10' into 0.5.1
# 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-10-11 21:00:08 +11:00
Oliver 4628bb8f08 Simplify version numbering scheme 2021-10-11 18:56:38 +11:00
github-actions[bot] dc17e3998a updated translation base 2021-10-11 07:56:21 +00:00
github-actions[bot] 5e8e900b04 updated translation base 2021-10-11 06:22:12 +00:00
github-actions[bot] 94c25c93d6 updated translation base 2021-10-11 01:01:51 +00:00
github-actions[bot] 9e41eb23ac updated translation base 2021-10-11 00:43:52 +00:00
github-actions[bot] 99352f8f84 updated translation base 2021-10-11 00:25:33 +00:00
Oliver bfb162c688 Merge pull request #2130 from SchrodingersGat/links-fix
Fix various documentation links

(cherry picked from commit 49601d2b7e)
2021-10-11 11:24:16 +11:00
github-actions[bot] 12d3646da1 updated translation base 2021-10-11 00:00:43 +00:00
github-actions[bot] a21e4560f1 updated translation base 2021-10-10 23:55:19 +00:00
Oliver 66c037b9f8 0.5 -> 0.5.1 2021-10-11 10:43:36 +11:00
Oliver 66d4b14ba4 Fix conflicts 2021-10-11 10:42:23 +11:00
github-actions[bot] 1c912088a2 updated translation base 2021-10-10 23:41:54 +00:00
github-actions[bot] 793fe39fe7 updated translation base 2021-10-08 02:10:20 +00:00
github-actions[bot] a6f5a8107a updated translation base 2021-10-07 11:45:06 +00:00
github-actions[bot] d3cdb34151 updated translation base 2021-10-07 02:55:56 +00:00
github-actions[bot] 638b478d1f updated translation base 2021-10-07 01:16:12 +00:00
Oliver 4efa8a5d3b Merge pull request #2118 from SchrodingersGat/bom-export-fix
Fix error on BOM export

(cherry picked from commit a69bcb9f18)
2021-10-07 12:15:11 +11:00
github-actions[bot] 1273d93c8c updated translation base 2021-10-07 00:01:36 +00:00
github-actions[bot] db59f99f2d updated translation base 2021-10-06 11:41:52 +00:00
github-actions[bot] 7df5215404 updated translation base 2021-10-06 10:38:04 +00:00
github-actions[bot] 6e47a1feb6 updated translation base 2021-10-06 10:05:12 +00:00
github-actions[bot] 88464ad640 updated translation base 2021-10-06 09:54:20 +00:00
github-actions[bot] 32556d660e updated translation base 2021-10-06 09:53:08 +00:00
Oliver ca0caa3d2b Merge pull request #2112 from SchrodingersGat/docs-link-fix
Fix docs link for release versions

(cherry picked from commit c2d33588d0)
2021-10-06 20:53:06 +11:00
Oliver f6bcee06cb Merge pull request #2108 from SchrodingersGat/sales-order-table-fixes
Bug fixes for SalesOrderLineItem table

(cherry picked from commit 6706d6c768)
2021-10-06 17:27:47 +11:00
github-actions[bot] 08394574ce updated translation base 2021-10-06 06:23:34 +00:00
github-actions[bot] 4a74294123 updated translation base 2021-10-05 22:53:58 +00:00
github-actions[bot] e84cad1660 updated translation base 2021-10-05 07:03:31 +00:00
github-actions[bot] 86c8d86b67 updated translation base 2021-10-05 02:21:40 +00:00
github-actions[bot] c567b7a84c updated translation base 2021-10-05 01:54:15 +00:00
Oliver 1132b6c51a Fixes for build output tables
- Only show "completed" builds in the "completed builds" table (should be obvious)
- Display "serial number" appropriately in build output allocation table

(cherry picked from commit a3ba33cae8)
2021-10-05 12:53:17 +11:00
Oliver 10e3a5f5a9 Merge pull request #2100 from SchrodingersGat/barcode-field-fix
Fix for "barcode" field in purchase order receive serializer

(cherry picked from commit 5c26769999)
2021-10-05 12:34:46 +11:00
github-actions[bot] 95bf39c127 updated translation base 2021-10-05 01:33:19 +00:00
eeintech f661a4f4ec Added migration file
(cherry picked from commit a735a3e15c)
2021-10-05 10:58:28 +11:00
eeintech 3d067b39b1 Fix plural name for Companies in Admin interface
(cherry picked from commit 6e31a8111b)
2021-10-05 10:58:22 +11:00
github-actions[bot] d01686248b updated translation base 2021-10-04 23:41:41 +00:00
Oliver 094a63f751 Bump version number -> 0.5.1 2021-10-04 09:52:15 +11:00
github-actions[bot] 024552e4d0 updated translation base 2021-10-03 22:36:56 +00:00
github-actions[bot] a5e26ceeac updated translation base 2021-10-02 15:35:10 +00:00
Oliver 2fedc1267c Merge pull request #2090 from SchrodingersGat/po-api-fix
Fix for purchase order API

(cherry picked from commit b7ff50ca87)
2021-10-03 01:33:54 +10:00
Oliver 7d3c0a7aa8 Merge pull request #2088 from inventree/0.5.0
Fixes for docker build steps
0.5.0
2021-10-01 13:46:34 +10:00
Oliver 018ab0cd05 Fixes for docker build steps 2021-10-01 13:26:43 +10:00
Oliver 0b5a4efef6 Merge pull request #2050 from inventree/0.5.0
0.5.0
2021-10-01 13:23:13 +10:00
Oliver a3c2f8b36b Merge remote-tracking branch 'inventree/l10_crowdin' into 0.5.0 2021-10-01 09:18:45 +10:00
Oliver a4f33ad839 Fix: New translations django.po from Crowdin 2021-10-01 08:51:29 +10:00
Oliver 6c8c45f1df Fix: New translations django.po from Crowdin 2021-10-01 08:51:28 +10:00
Oliver fdcd836d11 Fix: New translations django.po from Crowdin 2021-10-01 08:51:27 +10:00
Oliver 7ab7cb1d6b Fix: New translations django.po from Crowdin 2021-10-01 08:51:25 +10:00
Oliver ff6b4afb6d Fix: New translations django.po from Crowdin 2021-10-01 08:51:24 +10:00