Oliver
|
79686ebb2a
|
Merge pull request #2082 from SchrodingersGat/stock-item-delete
Override the "delete" behaviour for StockItem API
(cherry picked from commit 344383d3d4)
|
2021-09-28 10:57:43 +10:00 |
|
Oliver
|
d14b763ef9
|
Merge pull request #2079 from SchrodingersGat/url-fix
URL fixes
(cherry picked from commit b623f34881)
|
2021-09-27 14:34:28 +10:00 |
|
Oliver
|
fb27eb48c4
|
Merge remote-tracking branch 'inventree/master' into 0.5.0
|
2021-09-24 12:36:49 +10:00 |
|
Oliver
|
a1d54690c2
|
Merge pull request #2075 from SchrodingersGat/default-supplier-fix
Default supplier fix
(cherry picked from commit b3c8bd7779)
|
2021-09-24 12:36:19 +10:00 |
|
Oliver
|
b3c8bd7779
|
Merge pull request #2075 from SchrodingersGat/default-supplier-fix
Default supplier fix
|
2021-09-24 12:35:28 +10:00 |
|
Oliver
|
f53aac0784
|
Remove "default_supplier" field when duplicating a part
|
2021-09-24 12:04:36 +10:00 |
|
Oliver
|
d2b9993e96
|
Fix form filters for "default_supplier"
|
2021-09-24 12:04:25 +10:00 |
|
Oliver
|
d7ac9978eb
|
Merge pull request #2071 from inventree/dependabot/pip/django-3.2.5
Build(deps): Bump django from 3.2.4 to 3.2.5
(cherry picked from commit 39cab4690d)
|
2021-09-23 21:52:02 +10:00 |
|
Oliver
|
39cab4690d
|
Merge pull request #2071 from inventree/dependabot/pip/django-3.2.5
Build(deps): Bump django from 3.2.4 to 3.2.5
|
2021-09-23 21:51:23 +10:00 |
|
dependabot[bot]
|
1d85ccd543
|
Build(deps): Bump django from 3.2.4 to 3.2.5
Bumps [django](https://github.com/django/django) from 3.2.4 to 3.2.5.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/3.2.4...3.2.5)
---
updated-dependencies:
- dependency-name: django
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2021-09-22 17:46:34 +00:00 |
|
Oliver
|
80d2fc4b9e
|
Merge pull request #2068 from rocheparadox/master
css for part to occupy full height - fix for bug Inventree#1848
(cherry picked from commit b123135df6)
|
2021-09-22 09:34:37 +10:00 |
|
Oliver
|
2e1277839e
|
Merge pull request #2067 from SchrodingersGat/warning-improvements
Improve 'health status' warnings
|
2021-09-22 09:34:23 +10:00 |
|
Oliver
|
b123135df6
|
Merge pull request #2068 from rocheparadox/master
css for part to occupy full height - fix for bug Inventree#1848
|
2021-09-22 09:06:03 +10:00 |
|
Oliver
|
3b763e95fd
|
Improve 'health status' warnings
- Don't show error message if only non-critical warnings present
(cherry picked from commit 5443beef65)
|
2021-09-21 09:27:46 +10:00 |
|
rocheparadox
|
c1a827819c
|
css for part to occupy full height - fix for bug Inventree#1848
|
2021-09-20 17:00:45 +05:30 |
|
Oliver
|
5443beef65
|
Improve 'health status' warnings
- Don't show error message if only non-critical warnings present
|
2021-09-20 17:15:31 +10:00 |
|
Oliver
|
ae3c9817be
|
Merge pull request #2062 from SchrodingersGat/app-issue-template
Add template for app issues
|
2021-09-17 22:34:45 +10:00 |
|
Oliver
|
8d6d16c07b
|
Add template for app issues
|
2021-09-17 22:13:13 +10:00 |
|
Oliver
|
7b2b01c26f
|
Merge pull request #2060 from SchrodingersGat/character-test
Adds a test for non-standard characters via API
|
2021-09-17 21:48:10 +10:00 |
|
Oliver
|
e7963f8a85
|
test fixes
|
2021-09-17 21:06:07 +10:00 |
|
Oliver
|
11cc0c7ced
|
Adds a test for non-standard characters via API
|
2021-09-17 20:53:18 +10:00 |
|
Oliver
|
d73a7176fd
|
Merge pull request #2055 from SchrodingersGat/test-template-table-fix
Fix callback for test template table
|
2021-09-14 10:58:57 +10:00 |
|
Oliver
|
44e0fd1a68
|
Fix callback for test template table
(cherry picked from commit 5bd5c61b9d)
|
2021-09-14 10:57:55 +10:00 |
|
Oliver
|
5bd5c61b9d
|
Fix callback for test template table
|
2021-09-14 10:43:40 +10:00 |
|
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
|
de565c6e67
|
Merge branch 'l10' into 0.5.0
# 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:03:45 +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
|
35dd50e94f
|
Merge branch 'stable' into 0.5.0
|
2021-09-13 10:00:28 +10:00 |
|
Oliver
|
4b9fd13622
|
Set version number to 0.5.0
|
2021-09-13 09:56:53 +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 |
|