Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,726 Commits 6 Branches 99 Tags 484 MiB
2a9b54f32f
Commit Graph

7726 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver
7ed43f5a11
Merge pull request #1886 from inventree/revert-1885-docker-publish 
Revert "Publish on tags also"
 2021-07-30 13:39:49 +10:00
Oliver
1d19393442
Revert "Publish on tags also" 2021-07-30 12:42:03 +10:00
Oliver
6d0b01d0fb
Merge pull request #1885 from SchrodingersGat/docker-publish 
Publish on tags also
 2021-07-30 12:33:31 +10:00
Oliver
13898d6687 Publish on tags also 2021-07-30 11:51:06 +10:00
Oliver
eb883d7e70
Merge pull request #1884 from SchrodingersGat/typo-fix 
logging.get -> logging.getLogger
 2021-07-30 00:09:43 +10:00
Oliver Walters
d9f4c34a42 logging.get -> logging.getLogger 2021-07-29 23:44:52 +10:00
Oliver
3806e3ebeb
Merge pull request #1880 from SchrodingersGat/settings-fix 
Bug fix
 2021-07-29 17:56:45 +10:00
Oliver
c39e3aaa82 Bug fix 2021-07-29 17:52:24 +10:00
Oliver
60e4022568
Merge pull request #1879 from SchrodingersGat/docker-improvements 
Specify how many workers to use
 2021-07-29 17:19:41 +10:00
Oliver
542c204ca0 PEP fixes 2021-07-29 16:39:51 +10:00
Oliver
dd12a593f4 Specify how many workers to use 2021-07-29 16:37:34 +10:00
Oliver
935ef968de
Merge pull request #1878 from SchrodingersGat/js-template-stuff 
Js template stuff
 2021-07-29 13:42:47 +10:00
Oliver
7756c766c3 Fix stock.js 2021-07-29 12:35:21 +10:00
Oliver
4381a16b0e Template cleanup 2021-07-29 12:31:07 +10:00
Oliver
6fe5f0e0e6 Fixes for order.js 2021-07-29 11:58:32 +10:00
Oliver
ba5479090a Fix nav.js 2021-07-29 11:54:04 +10:00
Oliver
28bf5bfdbc Fix table_filters.js 2021-07-29 11:52:50 +10:00
Oliver
a222efda33 Fix rendering issues 2021-07-29 11:43:50 +10:00
Oliver
27ec65a002 Add 'settings.js' which provides all settings (global and user) as a dynamic javascript file 
- Minimal database hits required
 2021-07-29 11:28:04 +10:00
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
 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