2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-05-10 17:28:50 +00:00

2153 Commits

Author SHA1 Message Date
Oliver
e3dfb6cbc8 Improve messaging 2021-11-02 13:08:10 +11:00
Oliver
a3889c709e More tweaks 2021-11-02 12:57:40 +11:00
Oliver
fc9ca5e481 Pretty badges for email accounts 2021-11-02 12:54:41 +11:00
Oliver
ec147ea25f Further work on email settings page 2021-11-02 12:49:44 +11:00
Oliver
d1f2d960be Refactor "user account" page 2021-11-02 12:15:46 +11:00
Oliver
489d085de8 Refactor "category" settings page 2021-11-02 11:32:57 +11:00
Oliver
66b078e4b9 Refactor part settings page 2021-11-02 11:31:24 +11:00
Oliver
2abcb114a8 Visual improvements for "currency" page 2021-11-02 11:28:46 +11:00
Matthias
58f35ebc56
use buttons isntead of links 2021-11-01 23:49:22 +01:00
Matthias
70341d6745
refactor of backup tokens 2021-11-01 23:33:29 +01:00
Matthias
f8a45dcec2
back button 2021-11-01 23:23:50 +01:00
Matthias
7bcab13253
translate disable button 2021-11-01 23:19:50 +01:00
Matthias
b4570f6a7e
use alert 2021-11-01 23:11:48 +01:00
Matthias
7dbbca5b3a
fix translation 2021-11-01 23:11:41 +01:00
Matthias
4e9cf8492f
full width 2021-11-01 23:11:14 +01:00
Matthias
024a9deab4
full width buttons 2021-11-01 23:07:39 +01:00
Matthias
0011c7ee62
crispyfy 2021-11-01 23:07:27 +01:00
Matthias
240859c38c
make crispy 2021-11-01 23:03:36 +01:00
Matthias
58bc677029
more contrast for the qr 2021-11-01 22:58:47 +01:00
Matthias
6404764025
crispyfy 2021-11-01 22:51:42 +01:00
Matthias
3cb2078821
fix spelling 2021-11-01 22:46:56 +01:00
Matthias
fc0e80dd76
make remove button conditional 2021-11-01 22:45:56 +01:00
Matthias
392e7f6e4c
there can be only one factor 2021-11-01 22:43:43 +01:00
Matthias
17e7c2ee15
disable add button if already set up 2021-11-01 22:43:28 +01:00
Oliver
6f9ac4a850 - Fixes for construct_absolute_url function
- Refactor notification email generation
- Update template file
- Add separate templates folder for email
2021-11-02 00:40:25 +11:00
Matthias
62adb95d3c
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-11-01 12:35:25 +01:00
Oliver
2662ba1202 Merge branch 'master' into stock-item-forms 2021-11-01 12:43:32 +11:00
Oliver
f607841601 Fix navbar spacing when "sticky-header" is enabled 2021-11-01 12:07:07 +11:00
Oliver
ad0277a8c3 Merge branch 'master' into stock-item-forms
# Conflicts:
#	InvenTree/stock/serializers.py
#	InvenTree/stock/templates/stock/item_base.html
2021-11-01 12:00:40 +11:00
Oliver
94a86e52f8
Merge pull request #2224 from matmair/remove-breadrcumb-space
remove breadcrub div where no breadcrumb is added
2021-11-01 11:57:21 +11:00
Matthias Mair
05a86c863f
Update page_base.html 2021-11-01 01:38:21 +01:00
Oliver
b64f0e1f54
Merge pull request #2222 from matmair/ui-navbar
UI tweaks
2021-11-01 11:30:27 +11:00
Matthias
338e85ff52
remove breadcrub div where no breadcrumb 2021-11-01 01:09:08 +01:00
Matthias
9a346dd3e2
Revert "remove breadcrub div where no breadcrumb"
This reverts commit 2c9b03944fab8590507e97eb4a584ed9018825f1.
2021-11-01 01:07:13 +01:00
Matthias Mair
d89cb0936c
Merge branch 'inventree:master' into plugin-2037 2021-11-01 01:06:26 +01:00
Matthias
9d68d6bdca
added setting to anable MFA 2021-11-01 00:34:00 +01:00
Matthias
8da2865299
setting sidebar header different color to items 2021-11-01 00:11:01 +01:00
Matthias
62aa014f6b
add button for navbar toogle 2021-11-01 00:09:38 +01:00
Matthias
2c9b03944f
remove breadcrub div where no breadcrumb 2021-11-01 00:08:39 +01:00
Matthias
d8fb6d44ec
adds faktors to user settings 2021-10-31 23:42:31 +01:00
Oliver
80e741fe1b Further improvements for filter elements 2021-11-01 09:21:42 +11:00
Matthias
85da98a004
use auth screen to make more clear this is about security 2021-10-31 23:07:25 +01:00
Matthias Mair
0d836530e4
Merge branch 'inventree:master' into plugin-2037 2021-10-31 23:04:50 +01:00
Oliver
360f0406b5 CSS updates
- Add template for filter lists
- Filter lists now layout horizontally
- Change flex-row to flex-wrap
2021-11-01 08:38:24 +11:00
Matthias
487bab5162
cleanup 2021-10-31 14:02:24 +01:00
Matthias
9fd66e9f22
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-10-31 13:56:14 +01:00
Matthias
ec17bbcb95
mkaeuser setting tighter 2021-10-31 13:54:12 +01:00
Matthias
06822303bc
refactor user settings 2021-10-31 13:42:41 +01:00
Oliver
9057462588
Merge pull request #2212 from matmair/matmair/issue2210
Fix for actions wrapping on smaller screens
2021-10-31 09:09:27 +11:00
Matthias
199254dfe9
adjust navigation integration to new style 2021-10-30 22:35:47 +02:00