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,287 Commits 6 Branches 136 Tags
cd9e9a367baf6078ce09cd4b8d8acfa6060a895f
Commit Graph

11287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver
8725837460 Merge remote-tracking branch 'inventree/master' into stock-item-forms 2021-11-02 19:25:11 +11:00
Matthias
e73d3d567c fix MFA buttons 2021-11-02 07:56:59 +01:00
Oliver
96a89558b4 Merge pull request #2231 from SchrodingersGat/outgoing-email 
Refactor email body out into a template
 2021-11-02 15:07:23 +11:00
Oliver
4bfdf21107 Change "star" icon to "bullhorn" icon 2021-11-02 15:07:20 +11:00
Oliver
1dea7861d0 Refactor email body out into a template 
- Will be useful in the future when more email functionality is implemented
 2021-11-02 14:43:57 +11:00
Oliver
9b0d8bedb5 Merge pull request #2230 from SchrodingersGat/settings-visual-refactor 
Settings visual refactor
 2021-11-02 14:20:47 +11:00
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
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