Oliver
|
85adf842f6
|
Change bullhorn icon to bell icon
|
2021-11-03 16:59:59 +11:00 |
|
Oliver
|
63ec5770f4
|
Merge remote-tracking branch 'inventree/master' into subscription-refactor
|
2021-11-03 16:55:54 +11:00 |
|
Oliver
|
e5435df2ba
|
Merge remote-tracking branch 'inventree/master' into stock-item-forms
|
2021-11-03 15:46:30 +11:00 |
|
Oliver
|
74521b7628
|
Merge pull request #2239 from SchrodingersGat/more-part-details
Add more information to the "part details" tab
|
2021-11-03 14:18:43 +11:00 |
|
Oliver
|
31ea71d391
|
Display part category
|
2021-11-03 14:00:13 +11:00 |
|
Oliver
|
7d20003137
|
Merge pull request #2238 from SchrodingersGat/table-fix
Table fix
|
2021-11-03 13:57:54 +11:00 |
|
Oliver
|
d435689562
|
Add more information to the "part details" tab
|
2021-11-03 13:57:50 +11:00 |
|
Oliver
|
ecccae1081
|
Merge remote-tracking branch 'inventree/master' into stock-item-forms
|
2021-11-03 13:34:45 +11:00 |
|
Oliver
|
08ffa102c6
|
Fixes for part category table
(cherry picked from commit f7ef309995f8a52c213748f4a9226724e288c936)
|
2021-11-03 13:34:01 +11:00 |
|
Oliver
|
c4ea3ecf6f
|
Bug fix for stock location table
(cherry picked from commit 44794d7b78520023e3b70da61dc13938bfd4bd14)
|
2021-11-03 13:33:57 +11:00 |
|
Oliver
|
08719d4d1b
|
Merge pull request #2236 from SchrodingersGat/badge-fix
Fix CSS for user badges
|
2021-11-03 12:41:10 +11:00 |
|
Oliver
|
d0e80b7638
|
Merge pull request #2235 from SchrodingersGat/duplicate-bom-import-fix
Template fix for BOM upload
|
2021-11-03 12:41:03 +11:00 |
|
Oliver
|
b1c23e30f5
|
Fix CSS for user badges
|
2021-11-03 11:59:20 +11:00 |
|
Oliver
|
c636f13ba8
|
Template fix for BOM upload
|
2021-11-03 11:44:42 +11:00 |
|
Oliver
|
1d42d33c8e
|
style fixes
|
2021-11-03 11:33:44 +11:00 |
|
Oliver
|
be7b224f14
|
Adds API endpoint for serialization of stock items
|
2021-11-03 10:12:42 +11:00 |
|
Oliver
|
2b69d9c2af
|
Correctly serialize stock when creating via the API
|
2021-11-03 07:41:47 +11:00 |
|
Oliver
|
ad4c4f2a6d
|
Stock item duplication now works with the API forms
|
2021-11-03 07:28:21 +11:00 |
|
Oliver
|
aaf27d4098
|
Adds new buttons to create a new stock item
|
2021-11-03 07:27:58 +11:00 |
|
Oliver
|
d8e3c40f78
|
Implementing more complex behaviour for StockItem creation form
|
2021-11-02 23:04:10 +11:00 |
|
Oliver
|
ef305032c9
|
Create new stock location via API forms
|
2021-11-02 20:04:54 +11:00 |
|
Oliver
|
0d9c08b49c
|
StockLocationEdit
|
2021-11-02 19:58:25 +11:00 |
|
Oliver
|
4c8bc9580c
|
stock-item-edit is looking OK now
|
2021-11-02 19:51:46 +11:00 |
|
Oliver
|
d357e982f5
|
Revert stock-item detail template to mater
|
2021-11-02 19:43:17 +11:00 |
|
Oliver
|
c3c4aca829
|
Fix action buttons for stock-item detail page
|
2021-11-02 19:29:26 +11:00 |
|
Oliver
|
8725837460
|
Merge remote-tracking branch 'inventree/master' into stock-item-forms
|
2021-11-02 19:25:11 +11: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 |
|
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
|
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 |
|