inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-30 20:55:42 +00:00
Code Activity
14,097 Commits 6 Branches 132 Tags
4c03470e4aed684e397f5ebb535bfd9b7766a4dc
Commit Graph

14097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver
b8cd0d52d9 Fix: New translations django.po from Crowdin 2021-06-09 10:22:55 +10:00
Oliver
60fd027ec3 Fix: New translations django.po from Crowdin 2021-06-09 10:22:53 +10:00
Oliver
5f85300993 Fix: New translations django.po from Crowdin 2021-06-09 10:22:52 +10:00
Oliver
e7f3709502 Fix: New translations django.po from Crowdin 2021-06-09 10:22:51 +10:00
github-actions[bot]
60592ef850 updated translation base 2021-06-09 00:04:05 +00:00
Oliver
120c371a11 Merge pull request #1647 from SchrodingersGat/thumbnail-error-catch 
BuildItemSerializer: Handle errors when thumbnail is not found
 2021-06-09 10:02:42 +10:00
Oliver
9fd212d1b2 BuildItemSerializer: Handle errors when thumbnail is not found 2021-06-09 09:41:27 +10:00
dependabot[bot]
2a059f345e Build(deps): Bump pillow from 8.1.1 to 8.2.0 
Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
- [Release notes](https://github.com/python-pillow/Pillow/releases)
- [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
- [Commits](https://github.com/python-pillow/Pillow/compare/8.1.1...8.2.0)

---
updated-dependencies:
- dependency-name: pillow
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 19:49:34 +00:00
Oliver
fd63e49e60 Merge pull request #1644 from SchrodingersGat/test-table-fix 
Stock Test: Fix display of stock test table
 2021-06-08 20:27:06 +10:00
Oliver
3aadf94a9c Stock Test: Fix display of stock test table 
- Incorrect parent node was set
 2021-06-08 16:15:40 +10:00
Matthias
74c4c559e4 clearer wording for internal price settings 2021-06-07 05:33:20 +02:00
Matthias
4f3bfe569a added in internal prices in price calculations 2021-06-07 05:25:13 +02:00
Matthias
0e8a97acb0 added permissions 2021-06-07 05:23:13 +02:00
Matthias
37c0025399 settings for internal prices added 2021-06-07 04:58:37 +02:00
Matthias
62638f76ed fixing wrong page title 2021-06-07 04:00:12 +02:00
Matthias
6ae9fa716c added internal price to part_pricing 2021-06-07 00:19:37 +02:00
Matthias
27282c8049 Merge branch 'master' of https://github.com/inventree/InvenTree into internal-price 2021-06-06 18:15:41 +02:00
Matthias
413fa2e842 merging in sidebar icon changes fr upstream 2021-06-06 17:50:13 +02:00
Matthias
5a869d247f Merge branch 'master' of https://github.com/inventree/InvenTree into part-import 2021-06-06 17:46:33 +02:00
Matthias
d70b4bcabb refactor 2021-06-06 17:44:02 +02:00
Matthias
4f7edac213 back button 2021-06-06 17:43:16 +02:00
Matthias
a535f8df42 hide scrollbar if not needed 2021-06-06 16:40:51 +02:00
Oliver
63cbcde4c1 Fix: New translations django.po from Crowdin 2021-06-07 00:38:35 +10:00
Oliver
e861a0e417 Fix: New translations django.po from Crowdin 2021-06-07 00:38:34 +10:00
Oliver
b0522ee439 Fix: New translations django.po from Crowdin 2021-06-07 00:38:32 +10:00
Oliver
ac906ce608 Fix: New translations django.po from Crowdin 2021-06-07 00:38:31 +10:00
Oliver
d4f30d4f4c Fix: New translations django.po from Crowdin 2021-06-07 00:38:30 +10:00
Oliver
5e98d912c2 Fix: New translations django.po from Crowdin 2021-06-07 00:38:29 +10:00
Oliver
7206930e20 Fix: New translations django.po from Crowdin 2021-06-07 00:38:28 +10:00
Oliver
989d40eafd Fix: New translations django.po from Crowdin 2021-06-07 00:38:26 +10:00
Oliver
c02ed78eb5 Fix: New translations django.po from Crowdin 2021-06-07 00:38:25 +10:00
Matthias
a2a2c61e31 refactor and fix rendering on error 2021-06-06 16:36:01 +02:00
Matthias
7439f72ab1 hide error messagre on error 2021-06-06 16:33:19 +02:00
Matthias
5e6919f14e hide error message 2021-06-06 16:32:46 +02:00
github-actions[bot]
d756289efe updated translation base 2021-06-06 14:31:22 +00:00
Oliver
534fd491c1 Merge pull request #1637 from SchrodingersGat/lib-update 
Update django-import-export to 2.5.0
 2021-06-07 00:30:03 +10:00
github-actions[bot]
4f18db181d updated translation base 2021-06-06 14:14:32 +00:00
Oliver
d2e35426c2 Merge pull request #1636 from SchrodingersGat/l10-merge 
L10 merge
 2021-06-07 00:13:18 +10:00
Oliver
172700da10 Update django-import-export to 2.5.0 
- Fixes an export error introduced after updating to latest django
 2021-06-07 00:12:52 +10:00
Matthias
ded68bb4f6 change titel with modal submit 2021-06-06 16:09:51 +02:00
Matthias
35451248c2 reseting modal on open 2021-06-06 15:25:56 +02:00
Matthias
fcf360f2a3 clearer information text? as in #1577 2021-06-06 14:33:26 +02:00
Oliver
992cf57064 Merge remote-tracking branch 'inventree/master' 2021-06-06 22:29:15 +10:00
Oliver
5377d860f4 Merge remote-tracking branch 'inventree/master' into l10-merge 
# Conflicts:
#	InvenTree/locale/de/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/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-06 22:27:27 +10:00
Oliver
62682c686b Merge pull request #1629 from inventree/l10_crowdin 
New Crowdin updates
 2021-06-06 22:21:35 +10:00
Matthias
36ff21f11e hide supply part price on start 2021-06-06 14:21:08 +02:00
Oliver
e977be9c1b Merge pull request #1630 from inventree/dependabot/pip/django-3.2.1 
Bump django from 3.2 to 3.2.1
 2021-06-06 22:20:47 +10:00
Matthias
ced7768030 calculate button added 2021-06-06 14:20:30 +02:00
Oliver
573f601752 Merge pull request #1632 from matmair/nav-style 
same nav sidebar distance for everything
 2021-06-06 22:14:20 +10:00
Oliver
8301eb3be3 Merge pull request #1633 from matmair/money-format 
Money format
 2021-06-06 22:12:55 +10:00