inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-11-04 07:05:41 +00:00
Code Activity
11,272 Commits 6 Branches 136 Tags
0b9a6a11236ca23306df73818c2955016226de45
Commit Graph

11272 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a8f5661a27 make auth a bit wider 2021-11-01 22:59:23 +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
Matthias
61d3ea6293 refactor underscore handeling into function 2021-11-01 22:33:56 +01:00
Matthias
78d9e906da remove testing string 2021-11-01 22:28:38 +01:00
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