inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-04-25 04:23:33 +00:00
Code Activity
17,493 Commits 11 Branches 155 Tags
2c67454163e6f4bf240448e4a9cd560d101accb5
Commit Graph

17493 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver c6b11b5e38 New logic for completing a SalesOrderShipment 2021-11-29 23:11:21 +11:00
Oliver da6c723184 Merge branch 'master' into partial-shipment 
# Conflicts:
#	InvenTree/order/serializers.py
 2021-11-29 22:59:36 +11:00
Matthias d6dc4dd035 Merge branch 'matmair/issue2279' of https://github.com/matmair/InvenTree into matmair/issue2279 2021-11-29 08:42:57 +01:00
Matthias 07b0577b94 enable the notification panel to mark messages as read 2021-11-29 01:49:35 +01:00
Matthias 5bfe891208 add button for unread + refactor 2021-11-29 01:09:36 +01:00
Matthias d57ebde265 also add a unread endpoint 2021-11-29 01:08:54 +01:00
Matthias 06f6587050 add endpoint + buttons to mark a notification read 2021-11-29 01:08:06 +01:00
Matthias f9655f5eac fix base message serializer 2021-11-29 00:17:00 +01:00
Oliver 820ca62a98 Merge pull request #2376 from SchrodingersGat/ui-tweaks 
Small UI tweaks for "sessions" view
 2021-11-29 08:11:08 +11:00
Oliver 7b339b35cc Small UI tweaks for "sessions" view 2021-11-29 07:46:37 +11:00
Oliver cbc3089525 Merge pull request #2371 from matmair/matmair/issue2327 
[FR] User sessions
 2021-11-29 07:32:18 +11:00
Matthias Mair b687659ddd Merge branch 'inventree:master' into matmair/issue2327 2021-11-28 17:26:19 +01:00
Matthias Mair e34de8204a Merge branch 'inventree:master' into matmair/issue2279 2021-11-28 17:26:15 +01:00
Matthias Mair baf19c2021 Merge branch 'inventree:master' into plugin-2037 2021-11-28 17:26:09 +01:00
Matthias Mair 092f7b8e90 Merge branch 'inventree:master' into matmair/issue2201 2021-11-28 17:26:00 +01:00
Matthias Mair a066f4c940 Merge branch 'inventree:master' into webhooks 2021-11-28 17:25:53 +01:00
Matthias a06d91d9a3 fix reference name 2021-11-28 17:21:54 +01:00
Matthias 9454b51866 fix rules 2021-11-28 17:18:46 +01:00
Matthias 5f685f3c2a fix db sessions in import / export 2021-11-28 16:54:11 +01:00
Matthias 2747d0d609 PEP fix 2021-11-28 16:52:19 +01:00
Matthias ace4370ee9 add ruleset 2021-11-28 16:50:34 +01:00
Matthias 90b3f63851 add ruleset 2021-11-28 16:47:40 +01:00
Oliver fa582dec8c Merge pull request #2373 from SchrodingersGat/attachment-links 
Attachment links
 2021-11-28 23:01:00 +11:00
Oliver 32be39774f PEP fixes 2021-11-28 22:36:47 +11:00
Oliver 78309c1915 Move validation to the model class 2021-11-28 22:29:01 +11:00
Oliver 4ee55847f1 Refactor attachment tables 2021-11-28 14:21:20 +11:00
Oliver 0949bac175 serializer fixes 2021-11-28 14:21:09 +11:00
Oliver 6582fd3d04 Add 'link' field to attachment serializer 2021-11-28 12:57:37 +11:00
Oliver e9ed7bffc9 adds a "link" field to the InvenTree attachment model 
- Allows attachments to also serve as links to external files
 2021-11-28 12:53:01 +11:00
Matthias 4125841543 fix margins 2021-11-28 02:44:05 +01:00
Matthias 539910c594 translate mesages 2021-11-28 02:39:57 +01:00
Matthias d3ea23665b dynamically load notifications 2021-11-28 02:39:36 +01:00
Matthias d7bc16209d refactor 2021-11-28 01:45:40 +01:00
Matthias 5ebf50595e cleanup 2021-11-28 01:43:27 +01:00
Matthias a57c634cfd add item link 2021-11-28 01:33:13 +01:00
Matthias 7d71a04eaa Add fields to serializer to resolve source / target refs 2021-11-28 01:17:14 +01:00
Matthias ad7e483d8a age will not be possible atm 2021-11-28 00:02:05 +01:00
Matthias 68e43d0b90 make creation field permanent 2021-11-27 23:26:08 +01:00
Matthias 6735f83683 make more compact 2021-11-27 23:15:41 +01:00
Matthias 519b5b7012 fix focusing 2021-11-27 23:14:38 +01:00
Matthias bb1c01635e fix read flag 2021-11-27 22:40:03 +01:00
Matthias e01f2e202e check if notifications are there regularly 2021-11-27 22:39:04 +01:00
Matthias 866674497a add filtering to list endpoint 2021-11-27 22:02:18 +01:00
Matthias f2d0b06881 add read to api 2021-11-27 22:02:04 +01:00
Matthias 2c9fc11349 cleaner api url definition 2021-11-27 21:41:49 +01:00
Matthias c4c43135f1 Add base UI elements 2021-11-27 21:23:56 +01:00
Matthias a9995087ac move spacing from id to class 2021-11-27 16:21:17 +01:00
Matthias dd44eb389f add a notification message model 
part of #2282
 2021-11-27 16:02:23 +01:00
Matthias 6b53fd2bd4 Base html 
[FR] Notification centre
Fixes #2279
 2021-11-27 02:22:39 +01:00
Matthias 6511a774d1 exclude sessions from imort / exports 2021-11-27 00:04:43 +01:00