Commit Graph

7408 Commits

Author SHA1 Message Date
Oliver
768e30b452 Fix: New translations django.po from Crowdin 2021-07-26 23:50:04 +10:00
Oliver
a1d1da2a95 Fix: New translations django.po from Crowdin 2021-07-26 23:50:02 +10:00
Oliver
2e168245dd Fix: New translations django.po from Crowdin 2021-07-26 23:50:00 +10:00
Oliver
469050a110 Fix: New translations django.po from Crowdin 2021-07-26 23:49:58 +10:00
Oliver
89949a0da7 Fix: New translations django.po from Crowdin 2021-07-26 23:49:57 +10:00
Oliver
8b3647f42b Fix: New translations django.po from Crowdin 2021-07-26 23:49:55 +10:00
github-actions[bot]
35cf0c5fb1 updated translation base 2021-07-26 13:20:19 +00:00
Oliver
125260160c
Merge pull request #1859 from matmair/homepage-settings
User settings
2021-07-26 23:19:05 +10:00
Oliver
d1e586a0a8 Fix: New translations django.po from Crowdin 2021-07-26 08:36:05 +10:00
Matthias
aabefc2815 Merge branch 'master' of https://github.com/inventree/InvenTree into homepage-settings 2021-07-25 00:09:34 +02:00
github-actions[bot]
9d06da38a7 updated translation base 2021-07-24 00:08:28 +00:00
Oliver
bcfb3ac067
Merge pull request #1860 from matmair/fix-for-1775
fix for phantom migration warning
2021-07-24 10:07:07 +10:00
Matthias
4a32bdb7ab fix for phantom migration warning
Closes #1775
2021-07-24 01:30:53 +02:00
Matthias
175b24a794 changing user settings icon 2021-07-24 00:45:37 +02:00
Matthias
a82483dbaa hiding homepage block when no setting is used 2021-07-24 00:44:16 +02:00
Matthias
431b35ed32 new tag for building lists 2021-07-24 00:42:17 +02:00
Matthias
31050f23aa adding all homepage settings 2021-07-24 00:08:46 +02:00
Matthias
32eace0c36 moving settings into own section 2021-07-23 11:05:41 +02:00
Matthias
e97ee95deb typo 2021-07-23 01:09:06 +02:00
Matthias
46b0db8263 more hompage settings 2021-07-23 01:07:28 +02:00
Matthias
e167f27258 get user settings in templates 2021-07-23 00:46:48 +02:00
Matthias
50356afd41 Merge branch 'master' of https://github.com/inventree/InvenTree into homepage-settings 2021-07-23 00:03:21 +02:00
Matthias
7abf70fdd7 style fix 2021-07-22 23:53:17 +02:00
Matthias
3b12b0231e fixing wired unique behaviour 2021-07-22 23:50:51 +02:00
Matthias
5f2bef7ee1 base implementation of user setting 2021-07-22 23:50:09 +02:00
Matthias
3f6c7df7a8 change template setting behaviour for user setting 2021-07-22 23:48:28 +02:00
Matthias
e287860e10 admin for user setting 2021-07-22 23:46:31 +02:00
Matthias
449fc329c9 usersetting edit url 2021-07-22 23:45:34 +02:00
Matthias
7ef87320a0 abstract edit 2021-07-22 23:44:25 +02:00
Matthias
6f5fc528b7 override functions 2021-07-22 23:43:51 +02:00
Matthias
8f374e255e abstract filters and refactor 2021-07-22 23:43:03 +02:00
Matthias
69ff0ac248 ruleset 2021-07-22 23:39:36 +02:00
Matthias
c0d6ef80fc unique model settings 2021-07-22 23:39:19 +02:00
Oliver
2d39a9f5ce Merge remote-tracking branch 'inventree/l10_crowdin' into l10
# Conflicts:
#	InvenTree/locale/de/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-07-22 10:20:33 +10:00
Oliver
85f0bd2988 Fix: New translations django.po from Crowdin 2021-07-22 07:30:38 +10:00
Oliver
bf2717e8fc Fix: New translations django.po from Crowdin 2021-07-21 22:53:26 +10:00
Oliver
85782053f1 Fix: New translations django.po from Crowdin 2021-07-21 22:53:25 +10:00
Oliver
aa18f6c7db Fix: New translations django.po from Crowdin 2021-07-21 22:53:23 +10:00
Oliver
72c9c94bf0 Fix: New translations django.po from Crowdin 2021-07-21 22:53:22 +10:00
Oliver
720a9ccd8b Fix: New translations django.po from Crowdin 2021-07-21 22:53:20 +10:00
Oliver
552b2d0c2e Fix: New translations django.po from Crowdin 2021-07-21 22:53:19 +10:00
Oliver
e1adf8f237 Fix: New translations django.po from Crowdin 2021-07-21 22:53:18 +10:00
Oliver
d7f63db1c3 Fix: New translations django.po from Crowdin 2021-07-21 22:53:16 +10:00
Oliver
7dca582cc1 Fix: New translations django.po from Crowdin 2021-07-21 22:53:15 +10:00
github-actions[bot]
d34bec294e updated translation base 2021-07-21 12:35:29 +00:00
Oliver
2bf7b61668
Merge pull request #1857 from SchrodingersGat/part-parameters-in-reports
Part parameters in reports
2021-07-21 22:33:39 +10:00
Oliver
964672d6cc Add parameters to template 2021-07-21 22:14:03 +10:00
Oliver
afde997cf9 Expose part parameters to Part label templates 2021-07-21 22:05:52 +10:00
Oliver
b4e7995687 Fix: New translations django.po from Crowdin 2021-07-21 21:56:47 +10:00
Oliver
fa68c4bb8c Fix: New translations django.po from Crowdin 2021-07-21 21:56:45 +10:00