Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,627 Commits 6 Branches 99 Tags 484 MiB
e9e734acce
Commit Graph

2627 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters
d827070585 Fix docs 2020-02-02 18:11:29 +11:00
Christian Schlüter
e379b44606
Update German translation 2020-02-02 08:10:48 +01:00
Oliver Walters
e03d8f55ea Merge remote-tracking branch 'inventree/master' 2020-02-02 18:10:05 +11:00
Oliver
d71fd1aad4
Merge pull request #628 from SchrodingersGat/backup-fix 
Slight tweak to makefile
 2020-02-02 18:09:41 +11:00
Oliver Walters
38be1fc696 Don't force backup step as part of **make update 2020-02-02 18:05:50 +11:00
Oliver Walters
40037d826d Merge remote-tracking branch 'inventree/master' 2020-02-02 12:48:04 +11:00
Oliver
a022b8223e
Update version.py 2020-02-02 12:46:42 +11:00
Oliver
23c0d68330
Merge pull request #626 from SchrodingersGat/markdown-notes 
Markdown notes
 2020-02-02 12:45:24 +11:00
Oliver Walters
1a32e441b7 Add //TODO entry in stock tabs 2020-02-02 12:42:35 +11:00
Oliver Walters
20273f1541 Add commit date information to about window 2020-02-02 12:39:35 +11:00
Oliver Walters
f88f5a39f8 Visual fix for allocation tab 2020-02-02 12:16:31 +11:00
Oliver Walters
1bdcbd1974 Markdownify the 'notes' field for StockItem 
- New tab interface for the StockItem page
- Display / editing of notes field with markdown
 2020-02-02 12:11:18 +11:00
Oliver Walters
908e2ef8bc Add glyphicon for company notes 2020-02-02 11:54:09 +11:00
Oliver Walters
b46151b406 travis fix (hopefully?) 2020-02-02 11:52:22 +11:00
Oliver Walters
0f92468462 Add icon to signify if notes exist 2020-02-02 11:48:43 +11:00
Oliver Walters
7ec194a14a Markdownify the notes field for PurchaseOrder 
- Update model field
- Create tab view for PO page
- Add 'notes' tab
 2020-02-02 11:44:44 +11:00
Oliver Walters
a7846940c4 Markdownify the notes field for Build model 2020-02-02 00:00:19 +11:00
Oliver Walters
51fab36074 Display / editing for Company notes field 
- Also includes some translation updates
 2020-02-01 23:45:28 +11:00
Oliver Walters
ca9f9e047c Make company notes field markdownable 2020-02-01 23:31:45 +11:00
Oliver Walters
1f71a93d88 Fix page formatting 2020-02-01 23:26:54 +11:00
Oliver Walters
88ec40e454 Fix success_url for notes form 2020-02-01 22:25:35 +11:00
Oliver Walters
f0933f216c PEP fixes 2020-02-01 17:29:58 +11:00
Oliver Walters
919662054c Alter markdownify settings to properly render images, headings 2020-02-01 14:49:28 +11:00
Oliver Walters
b9dda51378 Side-by-side live editing for markdown 2020-02-01 14:40:11 +11:00
Oliver Walters
3c3ae43c18 Add special view for displaying / editing notes field for part 2020-02-01 13:36:09 +11:00
Oliver Walters
c546ed5dcd Update requirements 
- Use markdownify for rendering
- Use markdownx for editing
 2020-01-31 21:42:30 +11:00
Oliver Walters
da01177d23 Blank 'notes' page for Part model 2020-01-31 20:38:29 +11:00
Oliver Walters
aa2f63830e Translation template for part attachments page 2020-01-31 20:37:54 +11:00
Oliver Walters
596d06cf1a Add a markdown editor for the 'Notes" field of Part model 
https://github.com/timmyomahony/django-pagedown
 2020-01-31 20:28:54 +11:00
Oliver Walters
8d924eb300 Merge remote-tracking branch 'inventree/master' 2020-01-19 21:39:22 +11:00
Oliver
b5f8635794
Merge pull request #618 from SchrodingersGat/security-fix 
Update django version
 2020-01-19 21:38:51 +11:00
Oliver Walters
442c6e8b27 Update django version 2020-01-19 21:33:24 +11:00
Oliver Walters
07f3cd5644 Merge remote-tracking branch 'inventree/master' 2020-01-07 21:31:28 +11:00
Oliver
8275271ea0
Merge pull request #613 from SchrodingersGat/more-unit-testing 
Some more unit tests
 2020-01-07 21:22:00 +11:00
Oliver Walters
bd653f2c49 Some more unit tests 2020-01-07 21:16:01 +11:00
Oliver Walters
f217650cec Merge remote-tracking branch 'inventree/master' 2020-01-06 21:11:00 +11:00
Oliver
561cc7a1dd
Merge pull request #609 from SchrodingersGat/order-unit-testing 
Write unit test for PurchaseOrder receive views
 2020-01-06 20:53:55 +11:00
Oliver Walters
a064ce13fc PEP fixes 2020-01-06 20:51:12 +11:00
Oliver Walters
e103bd8880 Write unit test for PurchaseOrder receive views 2020-01-06 20:50:16 +11:00
Oliver Walters
07de23f120 Merge remote-tracking branch 'inventree/master' 2020-01-06 10:11:18 +11:00
Oliver
3def3e1e89
Merge pull request #605 from SchrodingersGat/order-receive-fix 
Bug fix - receiving lines against a PO
 2020-01-06 10:09:31 +11:00
Oliver Walters
61897cb0fc Updated translation files 2020-01-06 09:24:29 +11:00
Oliver Walters
067d2be1f0 Bug fix - receiving lines against a PO caused issues due to integer/Decimal conversion 2020-01-06 09:23:13 +11:00
Oliver
3098f6045f
Merge pull request #604 from SchrodingersGat/add-quantity-field 
Add quantity field
 2020-01-06 09:02:08 +11:00
Oliver Walters
740d7678d7 Update translation files 2020-01-06 08:57:13 +11:00
Oliver Walters
b3ec748123 Display current stock item quantity in stock-adjust modal form 2020-01-06 08:52:28 +11:00
Oliver Walters
881931c6b1 Merge remote-tracking branch 'inventree/master' 2020-01-02 21:08:56 +11:00
Oliver
d2d5909701
Merge pull request #601 from SchrodingersGat/trailing-fix 
Trailing fix
 2020-01-02 20:32:16 +11:00
Oliver Walters
43d47686c5 Style fixes 2020-01-02 20:27:07 +11:00
Oliver Walters
dae74a19d3 Fix logic for decimal string helper 2020-01-02 20:25:59 +11:00