Matthias
|
3e3da8b2d1
|
fix permission parser
|
2021-11-01 22:23:51 +01:00 |
|
Matthias
|
6dead88028
|
fix permission parsing if underscores in perm
|
2021-11-01 17:06:13 +01:00 |
|
Oliver
|
c31a62cc02
|
Merge pull request #2229 from SchrodingersGat/low-stock-email-template
Low stock email updates
|
2021-11-02 01:06:51 +11: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 |
|
Oliver
|
dabaa9aea5
|
Adds a function to construct an "absolute" URL
Useful for providing an external link (e.g. in an email)
|
2021-11-01 23:44:44 +11:00 |
|
Oliver
|
9cbc2b82b5
|
Merge pull request #2208 from rocheparadox/master
Email notification for low stock
|
2021-11-01 22:45:49 +11:00 |
|
Matthias
|
bba478dc1c
|
Merge branch 'matmair/issue2201' of https://github.com/matmair/InvenTree into matmair/issue2201
|
2021-11-01 12:35:40 +01:00 |
|
Matthias
|
62adb95d3c
|
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201
|
2021-11-01 12:35:25 +01:00 |
|
Matthias
|
33d61d8cb5
|
Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2181
|
2021-11-01 12:31:35 +01:00 |
|
Oliver
|
ae2198fc0c
|
Merge pull request #2227 from SchrodingersGat/spacer-fix
Expand navbar spacer
|
2021-11-01 14:46:07 +11:00 |
|
Oliver
|
a1608396cd
|
Expand navbar spacer
|
2021-11-01 14:16:14 +11:00 |
|
rocheparadox
|
76c1e936db
|
Added post_delete hook to StockItem
moved the business logic of 'deciding if a low stock notification has to be sent' to part.tasks
|
2021-11-01 08:25:59 +05:30 |
|
Oliver
|
2662ba1202
|
Merge branch 'master' into stock-item-forms
|
2021-11-01 12:43:32 +11:00 |
|
Oliver
|
d5fb699016
|
Merge pull request #2226 from SchrodingersGat/navbar-fix
Fix navbar spacing when "sticky-header" is enabled
|
2021-11-01 12:42:29 +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 2c9b03944f.
|
2021-11-01 01:07:13 +01:00 |
|
Matthias Mair
|
f137d06dd5
|
Merge branch 'inventree:master' into matmair/issue2201
|
2021-11-01 01:06:29 +01:00 |
|
Matthias Mair
|
d89cb0936c
|
Merge branch 'inventree:master' into plugin-2037
|
2021-11-01 01:06:26 +01:00 |
|
Matthias Mair
|
c775d030f9
|
Merge branch 'inventree:master' into matmair/issue2181
|
2021-11-01 01:06:18 +01:00 |
|
Oliver
|
67debc3a7b
|
Merge pull request #2223 from matmair/ui-settings-header
setting sidebar ui tweaks
|
2021-11-01 11:06:07 +11:00 |
|
Matthias
|
481a1088ee
|
fix adapters to use OTP
|
2021-11-01 01:05:29 +01:00 |
|
Matthias
|
9d68d6bdca
|
added setting to anable MFA
|
2021-11-01 00:34:00 +01:00 |
|
Matthias
|
a8e18a7972
|
handle modelnames / permissions with underscores
|
2021-11-01 00:24:57 +01:00 |
|
Matthias
|
fc566621b7
|
add rulesets
|
2021-11-01 00:24:21 +01:00 |
|
Matthias
|
b7d6ca12e8
|
PEP fixes
|
2021-11-01 00:16:30 +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
|
f0a558c1e2
|
remove unneeded spacing
|
2021-11-01 00:06:08 +01:00 |
|
Matthias
|
b5fb67ee76
|
Merge branch 'matmair/issue2201' of https://github.com/matmair/InvenTree into matmair/issue2201
|
2021-10-31 23:42:40 +01:00 |
|
Matthias
|
d8fb6d44ec
|
adds faktors to user settings
|
2021-10-31 23:42:31 +01:00 |
|
Oliver
|
5de85d893c
|
Merge pull request #2220 from SchrodingersGat/flex-wrap
CSS updates
|
2021-11-01 09:41:37 +11:00 |
|
Oliver
|
80e741fe1b
|
Further improvements for filter elements
|
2021-11-01 09:21:42 +11:00 |
|
Oliver
|
1f537a50b2
|
Fix weird height issue for filter tag
|
2021-11-01 09:11:08 +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
|
037f2a9438
|
Merge branch 'inventree:master' into matmair/issue2181
|
2021-10-31 23:04:55 +01:00 |
|
Matthias Mair
|
0d836530e4
|
Merge branch 'inventree:master' into plugin-2037
|
2021-10-31 23:04:50 +01:00 |
|
Matthias Mair
|
c02a087044
|
Merge branch 'inventree:master' into matmair/issue2201
|
2021-10-31 23:04:40 +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 |
|
Oliver
|
fd2a26c8fa
|
Merge pull request #2219 from SchrodingersGat/submodule-fix
Remove submodule
|
2021-11-01 08:36:12 +11:00 |
|
Oliver
|
b8d6a2830e
|
Remove submodule
|
2021-11-01 08:17:29 +11:00 |
|
Matthias
|
7719a07f19
|
remove data
|
2021-10-31 14:10:07 +01: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 |
|