2
0
mirror of https://github.com/inventree/InvenTree.git synced 2026-05-02 07:44:35 +00:00
Commit Graph

5833 Commits

Author SHA1 Message Date
github-actions[bot] 58d28e5b6d updated translation base 2021-06-21 06:40:43 +00:00
github-actions[bot] b3960999d4 updated translation base 2021-06-21 00:54:09 +00:00
github-actions[bot] fe68bebc47 updated translation base 2021-06-20 22:34:38 +00:00
github-actions[bot] b2896622e1 updated translation base 2021-06-20 22:28:30 +00:00
github-actions[bot] e73e274837 updated translation base 2021-06-20 21:37:52 +00:00
github-actions[bot] 54a26dcdb6 updated translation base 2021-06-20 07:29:07 +00:00
github-actions[bot] bbfe761fec updated translation base 2021-06-18 12:10:15 +00:00
github-actions[bot] 139125ef95 updated translation base 2021-06-18 10:11:45 +00:00
github-actions[bot] d547848e53 updated translation base 2021-06-18 00:37:52 +00:00
github-actions[bot] f15dd08a9d updated translation base 2021-06-18 00:37:06 +00:00
github-actions[bot] a90a84fa6f updated translation base 2021-06-18 00:31:31 +00:00
github-actions[bot] 6b62475a4f updated translation base 2021-06-17 22:20:03 +00:00
github-actions[bot] ba6a3667ad updated translation base 2021-06-17 12:40:12 +00:00
github-actions[bot] a87270b371 updated translation base 2021-06-17 12:37:45 +00:00
github-actions[bot] bfd509a1de updated translation base 2021-06-17 07:02:35 +00:00
Oliver 2c3f0fc95e New Crowdin updates (#1670)
* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin

* Fix: New translations django.po from Crowdin
2021-06-17 15:48:24 +10:00
github-actions[bot] 3fc68a76f7 updated translation base 2021-06-16 23:12:21 +00:00
github-actions[bot] b161a72cbe updated translation base 2021-06-16 23:12:11 +00:00
Oliver 69c253bee5 Merge remote-tracking branch 'inventree/l10_crowdin' into l10
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
2021-06-17 08:50:32 +10:00
Oliver a8ae62e133 Merge remote-tracking branch 'inventree/master' into l10 2021-06-17 08:49:00 +10:00
Oliver 0f53a03aae Fix: New translations django.po from Crowdin 2021-06-17 08:41:06 +10:00
Oliver d85fe7cf4c Fix: New translations django.po from Crowdin 2021-06-17 08:41:04 +10:00
Oliver e1e3608700 Fix: New translations django.po from Crowdin 2021-06-17 08:41:03 +10:00
Oliver 431ae69ee9 Fix: New translations django.po from Crowdin 2021-06-17 08:41:02 +10:00
Oliver 5704dcc551 Fix: New translations django.po from Crowdin 2021-06-17 08:41:00 +10:00
Oliver 42ecb11dbc Fix: New translations django.po from Crowdin 2021-06-17 08:40:59 +10:00
Oliver b59de2a9ba Fix: New translations django.po from Crowdin 2021-06-17 08:40:58 +10:00
Oliver 716167d4d0 Fix: New translations django.po from Crowdin 2021-06-17 08:40:57 +10:00
Oliver 7fd9dd4f12 Fix: New translations django.po from Crowdin 2021-06-17 08:40:55 +10:00
github-actions[bot] 7eb420409b updated translation base 2021-06-16 22:40:13 +00:00
Oliver 5bbc44e816 Merge pull request #1666 from matmair/po-total
total price column as per #1660
2021-06-17 08:38:51 +10:00
matmair 5d3360e63b added quantity total 2021-06-17 00:23:08 +02:00
matmair dac112d908 added footer total for price 2021-06-17 00:22:32 +02:00
matmair 2fc185bd71 show footer 2021-06-16 23:57:33 +02:00
matmair 70e0933336 total price column as per #1660 2021-06-16 23:52:00 +02:00
Oliver Walters 70f3c03b64 Merge remote-tracking branch 'upstream/l10_crowdin' into l10
# Conflicts:
#	InvenTree/locale/de/LC_MESSAGES/django.po
#	InvenTree/locale/es/LC_MESSAGES/django.po
#	InvenTree/locale/fr/LC_MESSAGES/django.po
#	InvenTree/locale/it/LC_MESSAGES/django.po
#	InvenTree/locale/ja/LC_MESSAGES/django.po
#	InvenTree/locale/pl/LC_MESSAGES/django.po
#	InvenTree/locale/ru/LC_MESSAGES/django.po
#	InvenTree/locale/tr/LC_MESSAGES/django.po
#	InvenTree/locale/zh/LC_MESSAGES/django.po
2021-06-17 00:37:50 +10:00
Oliver 0781ad525e Fix: New translations django.po from Crowdin 2021-06-17 00:02:35 +10:00
Oliver f44959b9a8 Fix: New translations django.po from Crowdin 2021-06-17 00:02:34 +10:00
Oliver 626019323b Fix: New translations django.po from Crowdin 2021-06-17 00:02:31 +10:00
Oliver 1f10ab699f Fix: New translations django.po from Crowdin 2021-06-17 00:02:29 +10:00
Oliver e01a3b7c5f Fix: New translations django.po from Crowdin 2021-06-17 00:02:27 +10:00
Oliver dcb2078572 Fix: New translations django.po from Crowdin 2021-06-17 00:02:25 +10:00
Oliver 10a0eb8d70 Fix: New translations django.po from Crowdin 2021-06-17 00:02:23 +10:00
Oliver 2f9f9bd99c Fix: New translations django.po from Crowdin 2021-06-17 00:02:21 +10:00
Oliver d5014bb08a Fix: New translations django.po from Crowdin 2021-06-17 00:02:19 +10:00
github-actions[bot] 21ccf7c4a1 updated translation base 2021-06-16 13:55:59 +00:00
Oliver 9386332de1 Update version.py 2021-06-16 23:54:42 +10:00
github-actions[bot] a0a1ff6837 updated translation base 2021-06-16 13:54:22 +00:00
Oliver 731ea0238e Update version.py
Bump version number
0.2.3
2021-06-16 23:53:58 +10:00
Oliver b2247b3830 Merge pull request #1664 from SchrodingersGat/docker-production
Docker production
2021-06-16 23:52:52 +10:00