inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-04 07:05:41 +00:00
Code Activity
7,657 Commits 6 Branches 136 Tags
a5f26c7f0922ca72a4711c8092ccebd85772292f
Commit Graph

7657 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
eeintech
d43312d162 Missing comma propagating to translated JS files 2021-07-28 13:29:12 -04:00
Oliver
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
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
Oliver
20b6e0fd1a Update version.py 2021-07-28 15:46:52 +10:00
Oliver
9d9bfd6c30 Update version.py 
0.4.0 release
0.4.0 		2021-07-28 15:46:20 +10:00
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