inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-24 15:43:09 +00:00
Code Activity
224 Commits 7 Branches 164 Tags
4ff647f0c974bff3434cd8c0e4685d6bd66c7dd3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Walters 4ff647f0c9 Added logo 2017-04-28 09:05:01 +10:00
Oliver Walters 7478371d0c Added stockhistory 
using django-simple-history
 2017-04-21 23:47:04 +10:00
Oliver Walters 81a42c1dff Merge remote-tracking branch 'upstream/master' 2017-04-20 23:01:18 +10:00
OliverandGitHub 2666d7961b Merge pull request #45 from SchrodingersGat/master 
Added Users API
 2017-04-20 22:55:01 +10:00
Oliver Walters 76b086aab8 Style fixes 2017-04-20 22:53:28 +10:00
Oliver Walters db45e3625f Category validation errors 2017-04-20 22:45:18 +10:00
Oliver Walters 4777b02080 Added User API and serializer 2017-04-20 22:40:59 +10:00
Oliver Walters 92cbd43f0f Code cleanup 2017-04-20 22:20:41 +10:00
OliverandGitHub a9abea2c7c Merge pull request #44 from SchrodingersGat/master 
Style fix
 2017-04-20 22:10:37 +10:00
Oliver Walters 41485e0e0f Style fix 2017-04-20 22:10:13 +10:00
OliverandGitHub c716b2d6c1 Merge pull request #43 from SchrodingersGat/master 
Added StockTake endpoint
 2017-04-20 22:09:12 +10:00
Oliver Walters 2c28ef6b3c Added update endpoints for StockItem 
- Stocktake
- Take-Stock
 2017-04-20 22:08:27 +10:00
Oliver Walters 7efb4c21d3 Added ProjectRun API 2017-04-16 17:50:28 +10:00
OliverandGitHub ab2e97399a Merge pull request #42 from SchrodingersGat/master 
Improved filters
 2017-04-16 17:29:32 +10:00
Oliver Walters 6c7f5fdaf3 Added MinValue validator(s) 2017-04-16 17:05:02 +10:00
Oliver Walters 057fd1dd20 Filtering improvements 2017-04-16 14:24:15 +10:00
Oliver Walters 883efd0945 Removed 'pending' tag 2017-04-16 14:11:20 +10:00
OliverandGitHub 4b3226e117 Merge pull request #41 from SchrodingersGat/master 
Added StockTracking model
 2017-04-16 01:44:18 +10:00
Oliver Walters a65f85df87 Added StockTracking model 2017-04-16 01:43:30 +10:00
Oliver Walters d0a66390f5 db unique_together 2017-04-16 01:24:00 +10:00
Oliver Walters 4f6802b9bf Part model updates 2017-04-16 01:11:04 +10:00
Oliver Walters d3781427ad Part parameter fixes 2017-04-16 01:08:43 +10:00
OliverandGitHub 465e4cbb56 Merge pull request #40 from SchrodingersGat/master 
More API improvements
 2017-04-16 01:02:15 +10:00
Oliver Walters 7e1fbf8a04 Style fixes 2017-04-16 01:01:48 +10:00
Oliver Walters 2e133b7744 Start of exception handler 2017-04-16 00:58:40 +10:00
Oliver Walters a139a00843 Updated track API 2017-04-16 00:13:22 +10:00
Oliver Walters d75ed57d48 Updated Supplier URLs and API docs 2017-04-15 23:34:01 +10:00
Oliver Walters e8dc592ec7 Fixed Project URLs and API docs 2017-04-15 23:21:45 +10:00
Oliver Walters a20987f122 Added part filters 2017-04-15 23:14:16 +10:00
Oliver Walters 4259c6f9eb Fixed stock URLs and API docs 2017-04-15 23:14:10 +10:00
Oliver Walters 71d7895148 Improved Part API docs 2017-04-15 23:04:09 +10:00
Oliver Walters ad6038b769 Merge remote-tracking branch 'upstream/master' 2017-04-15 22:47:46 +10:00
OliverandGitHub 150e1bb34c Merge pull request #39 from SchrodingersGat/master 
Added hyperlinks and docs to API
 2017-04-15 00:56:27 +10:00
Oliver Walters 7d7579d3d6 Style fixes 2017-04-15 00:55:30 +10:00
Oliver Walters bf1c7125a4 Added API documentation 2017-04-15 00:15:38 +10:00
Oliver Walters f7107008f0 Part API now hyperlinked 2017-04-15 00:10:35 +10:00
Oliver Walters 9e287d85d8 Project API is hyperlinked 2017-04-15 00:00:55 +10:00
Oliver Walters a1db0c90e4 Tracking API is hyperlinked 2017-04-14 23:53:27 +10:00
Oliver Walters 7c5261bc4a Stock API now hyperlinkd 2017-04-14 23:44:24 +10:00
Oliver Walters 9e3fa00fdd Fixed makefile 
Added "makemigrations" for each app
 2017-04-14 23:30:08 +10:00
Oliver Walters e641a913f2 Supplier API now hyperlinked 2017-04-14 23:29:58 +10:00
Oliver Walters f85489bc0e Supplier API is hyperlinked 2017-04-14 22:44:20 +10:00
Oliver Walters 41eb427c02 Fix for FilterChildren function 2017-04-14 22:05:29 +10:00
Oliver Walters 2c628c8ab4 Prepend /api/ to API URL 2017-04-14 21:59:52 +10:00
Oliver Walters 858a7fe089 Tweaking URL patterns 2017-04-14 21:44:01 +10:00
OliverandGitHub 146ad5e9ae Merge pull request #38 from SchrodingersGat/master 
Added /track/ api
 2017-04-14 16:15:10 +10:00
Oliver Walters 4ac14d0df1 Merge remote-tracking branch 'upstream/master' 2017-04-14 16:14:42 +10:00
Oliver Walters e5f6de5d2b Style fixes 2017-04-14 16:12:54 +10:00
Oliver Walters 5b49cff09a Prevent duplication of unique parts 2017-04-14 16:09:05 +10:00
Oliver Walters 6f31e3447c Added /track/ API 2017-04-14 15:49:10 +10:00
Oliver Walters 37808f3834 Simplified PART and PROJECT APIs 2017-04-14 15:25:10 +10:00
OliverandGitHub a2a2c9821e Merge pull request #37 from SchrodingersGat/master 
Added Supplier API
 2017-04-14 15:17:29 +10:00
Oliver Walters fe52610fcc Style fixes 2017-04-14 15:16:57 +10:00
Oliver Walters 9064b23cd8 Added 404 2017-04-14 15:16:16 +10:00
Oliver Walters e8ec11e3cc Added supplier API 2017-04-14 14:45:17 +10:00
Oliver Walters f80918554d Removed old templates 2017-04-14 14:13:00 +10:00
Oliver Walters dec90f597d Merge remote-tracking branch 'upstream/master' 2017-04-14 13:31:59 +10:00
OliverandGitHub 72c3c5271e Merge pull request #36 from SchrodingersGat/master 
API improvements
 2017-04-14 13:31:43 +10:00
Oliver Walters f21a05dfa3 Style fixes 2017-04-14 13:31:07 +10:00
Oliver Walters 15d27cafec Further API improvements 2017-04-14 13:29:24 +10:00
Oliver Walters 22ac5f4f79 Improved FilterChildren function 2017-04-14 13:28:37 +10:00
Oliver Walters 7fe1c21ebd Updated Part API 
- categories can now be filtered by parent
- Added FilterChildren func to invenTree.models
 2017-04-14 13:09:24 +10:00
Oliver Walters c4b7b80e1a Added stock permissison 2017-04-14 12:58:43 +10:00
Oliver Walters 0441eb4c38 API improvements for Stock app 2017-04-14 12:54:34 +10:00
OliverandGitHub 92f4d47f74 Merge pull request #35 from SchrodingersGat/master 
API improvements
 2017-04-14 12:15:22 +10:00
Oliver Walters 2299cd0700 Further API improvements 2017-04-14 12:14:50 +10:00
Oliver Walters 6f9bf45e22 Added django_filter app 2017-04-14 12:11:42 +10:00
Oliver Walters 39a6bcdf3e Improved Part API 2017-04-14 11:46:18 +10:00
Oliver Walters 817a67cd41 Fix for project API 
If project is not specified in URL, take value from JSON
 2017-04-14 11:46:05 +10:00
Oliver Walters b13f135d8e Project API improvements 
- Added DetailView for ProjectPart
- Improved URL structure
 2017-04-14 11:16:49 +10:00
Oliver Walters 04524d38ab Prevent duplicate ProjectParts 2017-04-14 10:54:18 +10:00
Oliver Walters 7acae4ea47 ProjectPart API fix 
When a new ProjectPart is added, the Project link is automatically set
 2017-04-14 10:54:07 +10:00
Oliver Walters 56ba30eb52 Added ability to delete project 2017-04-14 09:29:58 +10:00
Oliver Walters 2f3e29ab13 more api fixes 2017-04-14 08:52:25 +10:00
OliverandGitHub b7ab2fa59e Merge pull request #34 from SchrodingersGat/master 
Lots of API improvements
 2017-04-13 00:32:49 +10:00
Oliver Walters e0f86db664 Fixed unused import 2017-04-13 00:31:54 +10:00
Oliver Walters f7ba84495b Fix for stock serializer 2017-04-13 00:31:03 +10:00
Oliver Walters 8ab1e4a3da Improve API for Project app 2017-04-13 00:29:59 +10:00
Oliver Walters 0772b8d780 Major improvements to Parts API 
- Requires authentication (or read only)
- Separated URL patterns
- Better use of generics
- Can add/edit parts and part categories
 2017-04-13 00:27:29 +10:00
Oliver Walters 48f9914a49 Added API authentication 2017-04-13 00:24:10 +10:00
OliverandGitHub 9be6cac7ff Merge pull request #33 from SchrodingersGat/master 
Fixed requirements bug
 2017-04-12 18:43:57 +10:00
Oliver Walters 761307d3aa Fixed requirements bug 2017-04-12 18:43:14 +10:00
OliverandGitHub 92c6800717 Merge pull request #32 from SchrodingersGat/master 
Tweaks for config files
 2017-04-12 18:38:58 +10:00
Oliver Walters 96273dea55 Added extra step to make test 2017-04-12 16:31:15 +10:00
Oliver Walters a790d35e48 Added flake8 to requirements 2017-04-12 16:30:21 +10:00
Oliver Walters 16f3ca589b Merge remote-tracking branch 'origin/master' 2017-04-12 14:27:08 +10:00
OliverandGitHub 17c7d67dde Merge pull request #31 from SchrodingersGat/master 
Fixed import that was not used
 2017-04-11 23:50:55 +10:00
Oliver eb4ef9de98 Fixed import that was not used 2017-04-11 23:50:25 +10:00
OliverandGitHub 5b255e9e64 Merge pull request #30 from SchrodingersGat/master 
Fix for part category API
 2017-04-11 23:36:22 +10:00
Oliver 5853a5767c Fix for part category API 2017-04-11 23:36:01 +10:00
OliverandGitHub af79c937fd Merge pull request #29 from SchrodingersGat/master 
Updated parts API
 2017-04-11 23:33:57 +10:00
Oliver 4c07e8d8a0 Updated part API 2017-04-11 23:33:08 +10:00
Oliver 08fc21eb9b Added ability to mark project part as "output" (generated BY project) 2017-04-11 23:22:05 +10:00
OliverandGitHub 3c42f12ea0 Merge pull request #28 from SchrodingersGat/master 
Added project API
 2017-04-11 23:15:44 +10:00
Oliver 4a74cd2199 style errors 2017-04-11 23:15:17 +10:00
Oliver 0ca8a75166 Added projects API 2017-04-11 23:12:07 +10:00
OliverandGitHub 9f4b8b473b Merge pull request #26 from SchrodingersGat/master 
Updated part API
 2017-04-11 23:11:36 +10:00
Oliver 3704ad34dc Updated part API 2017-04-11 23:07:02 +10:00
OliverandGitHub 57e3fed2ea Merge pull request #25 from SchrodingersGat/master 
API for stock app
 2017-04-11 19:06:32 +10:00
Oliver 15582369d2 API for stock app 2017-04-11 18:58:44 +10:00