Commit Graph
100 Commits
Author SHA1 Message Date
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
OliverandGitHub 293bf41048 Update README.md 2017-04-11 17:36:51 +10:00
OliverandGitHub 520766deac Merge pull request #24 from SchrodingersGat/master
fixes for makefile
2017-04-11 17:27:42 +10:00
Oliver 599cdc0a7b fixes for makefile 2017-04-11 17:27:14 +10:00
OliverandGitHub a9fc870a19 Merge pull request #23 from SchrodingersGat/master
Fixing python errors
2017-04-11 17:21:36 +10:00
Oliver 338dcd3b72 Fixing python errors 2017-04-11 17:21:05 +10:00
OliverandGitHub 2db39aaaa6 Merge pull request #22 from SchrodingersGat/master
Code fix and simplify API URLs
2017-04-11 09:59:42 +10:00
Oliver 1cddec1035 - Fixes for getUniqueChildren
- Flattened API structure
2017-04-11 09:58:45 +10:00
Oliver cd23afed50 Merge remote-tracking branch 'inventree/master' 2017-04-11 09:42:01 +10:00
Oliver 91d3aecd9d Merge remote-tracking branch 'inventree/master' 2017-04-11 09:41:49 +10:00
OliverandGitHub d7c67fbaa4 Merge pull request #21 from SchrodingersGat/master
Updated API URLs
2017-04-11 09:41:42 +10:00
Oliver e06121ebda Updated API URLs 2017-04-11 09:41:03 +10:00
OliverandGitHub 074ac210b5 Merge pull request #19 from zakx/feature/tooling-improvements
Tooling improvements
2017-04-11 09:33:04 +10:00
OliverandGitHub bb680c3427 Update roadmap.md 2017-04-02 23:46:00 +10:00
OliverandGitHub 473bd441df Create roadmap.md 2017-04-02 23:06:43 +10:00
OliverandGitHub c1e67f52da Merge pull request #18 from SchrodingersGat/master
Documentation for Part model fields
2017-04-01 13:32:21 +11:00
Oliver Walters 9a9a039fc9 Documentation for part fields 2017-04-01 13:31:48 +11:00
Oliver Walters 2a8bbdf3c6 Merge remote-tracking branch 'upstream/master' 2017-04-01 13:28:08 +11:00
OliverandGitHub aa7ba9ddf3 Update README.md 2017-04-01 13:19:37 +11:00
OliverandGitHub 0df5093440 Added docstring for pep checker 2017-04-01 13:17:17 +11:00
Oliver Walters 51b6e53d13 Merge remote-tracking branch 'upstream/master' 2017-03-30 19:10:48 +11:00
OliverandGitHub bb99e45676 Merge pull request #17 from SchrodingersGat/master
betterment
2017-03-30 08:53:43 +11:00
Oliver Walters 0151eb18da Improvements for unique part 2017-03-30 08:52:54 +11:00
Oliver Walters 1a8944519a Added extra fields to supplierpart 2017-03-30 08:48:52 +11:00
OliverandGitHub ef54870f7c Merge pull request #16 from SchrodingersGat/master
Added gitattributes file
2017-03-30 08:38:24 +11:00
OliverandGitHub 1d57e4c5bb Rename LICENSE2 to LICENSE 2017-03-29 23:53:52 +11:00
OliverandGitHub 79da239883 Rename LICENSE to LICENSE2 2017-03-29 23:51:12 +11:00
Oliver Walters 4046c6f0bf Added gitattributes file 2017-03-29 23:45:27 +11:00
OliverandGitHub 574e0d4f62 Merge pull request #15 from SchrodingersGat/master
updates
2017-03-29 23:39:04 +11:00
Oliver Walters 6e0a02a885 Added extra fields to stock item 2017-03-29 23:36:06 +11:00
Oliver Walters 9db1f99e26 updated supplier model 2017-03-29 23:32:21 +11:00
Oliver Walters d0489d692a PEP fixes 2017-03-29 23:21:54 +11:00
Oliver Walters 8ba4ea344e updates 2017-03-29 23:19:53 +11:00
Oliver Walters b2eca2aa48 Added ETA for part stock 2017-03-29 22:55:36 +11:00
Oliver Walters 2355adb044 Added lead-time for supplier part 2017-03-29 22:55:16 +11:00
Oliver Walters 591ae5dc5c Single price field for supplier part 2017-03-29 22:47:17 +11:00
Oliver Walters aafa8781d7 Added "ProjectRun" model 2017-03-29 22:44:59 +11:00
OliverandGitHub c779476650 Merge pull request #14 from SchrodingersGat/master
Added function to get all parents for a tree item
2017-03-29 20:23:51 +11:00
Oliver Walters 2b998a1931 Added function to get all parents for a tree item 2017-03-29 20:23:21 +11:00
OliverandGitHub fa82494667 Merge pull request #13 from SchrodingersGat/master
Updates
2017-03-29 19:39:17 +11:00
OliverandGitHub fd30d11eee Merge pull request #12 from SchrodingersGat/master
Updated part parameter
2017-03-29 15:46:19 +11:00
Oliver Walters 4fafe93d9c Updated part parameter 2017-03-29 15:45:50 +11:00
OliverandGitHub 38988927b6 Merge pull request #11 from SchrodingersGat/master
Fixed PEP issues
2017-03-29 15:12:43 +11:00
Oliver Walters 4dc0179484 Fixed PEP issues 2017-03-29 15:12:14 +11:00
OliverandGitHub 7effa93458 Merge pull request #10 from SchrodingersGat/master
Added Part Templates
2017-03-29 15:05:13 +11:00
Oliver Walters 11b790c3ec Added Part Templates 2017-03-29 15:02:59 +11:00
Oliver Walters 774bd75e49 Updated installer script 2017-03-29 14:34:41 +11:00
OliverandGitHub 9b0b5d9be1 Added installation directions 2017-03-29 11:58:34 +11:00
OliverandGitHub ba10803117 Merge pull request #9 from SchrodingersGat/master
Added installer script
2017-03-29 11:03:47 +11:00
Oliver Walters 0a37291861 Added installer script 2017-03-29 11:03:17 +11:00
Oliver Walters 68ae1110ad Updates
- Improved some models
- Added PEP check script
2017-03-29 08:37:41 +11:00
OliverandGitHub 74272d373a Merge pull request #8 from SchrodingersGat/master
oops
2017-03-29 00:30:15 +11:00
Oliver Walters 8b9002fa68 oops 2017-03-29 00:28:39 +11:00
OliverandGitHub 8b508b6aea Merge pull request #7 from SchrodingersGat/master
Added 'manufacturer' model
2017-03-29 00:24:30 +11:00
Oliver Walters ecab28de2c Added 'manufacturer' model 2017-03-29 00:23:51 +11:00
OliverandGitHub e28461dee8 Merge pull request #6 from SchrodingersGat/master
travis update
2017-03-29 00:17:07 +11:00