inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-06-14 19:15:41 +00:00
Code Activity
8,856 Commits 7 Branches 121 Tags
1643a2ccb2efc3d23c42f5b005f4e38fc087e54c
Commit Graph

8856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver
1643a2ccb2 Merge pull request #2054 from matmair/fix-for-2004 
Fix for 2004
 2021-09-14 10:00:19 +10:00
Matthias
847fb62ab5 js style 2021-09-13 23:25:13 +02:00
Matthias
c890a4a6d0 only add button per name once 2021-09-13 23:18:44 +02:00
Oliver
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
github-actions[bot]
cfce9c6b73 updated translation base 2021-09-12 13:15:43 +00: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
github-actions[bot]
de9b53cc0f updated translation base 2021-09-12 12:29:48 +00:00
Oliver
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
github-actions[bot]
3f172c24ef updated translation base 2021-09-08 04:34:30 +00:00
Oliver
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