Commit Graph
100 Commits
Author SHA1 Message Date
Oliver 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
Oliver 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
Oliver 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
Oliver 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
Oliver 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
Oliver 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
Oliver 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
Oliver 293bf41048 Update README.md 2017-04-11 17:36:51 +10:00
Oliver 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
Oliver 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
Oliver 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
Oliver 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
Oliver 074ac210b5 Merge pull request #19 from zakx/feature/tooling-improvements
Tooling improvements
2017-04-11 09:33:04 +10:00
Oliver bb680c3427 Update roadmap.md 2017-04-02 23:46:00 +10:00
Oliver 473bd441df Create roadmap.md 2017-04-02 23:06:43 +10:00
Oliver 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
Oliver aa7ba9ddf3 Update README.md 2017-04-01 13:19:37 +11:00
Oliver 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
Oliver 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
Oliver ef54870f7c Merge pull request #16 from SchrodingersGat/master
Added gitattributes file
2017-03-30 08:38:24 +11:00
Oliver 1d57e4c5bb Rename LICENSE2 to LICENSE 2017-03-29 23:53:52 +11:00
Oliver 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
Oliver 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
Oliver 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
Oliver fa82494667 Merge pull request #13 from SchrodingersGat/master
Updates
2017-03-29 19:39:17 +11:00
Oliver 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
Oliver 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
Oliver 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
Oliver 9b0b5d9be1 Added installation directions 2017-03-29 11:58:34 +11:00
Oliver 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
Oliver 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
Oliver 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
Oliver e28461dee8 Merge pull request #6 from SchrodingersGat/master
travis update
2017-03-29 00:17:07 +11:00
Oliver Walters 277b4360e3 pip intall restframework 2017-03-29 00:14:27 +11:00
Oliver Walters ff2f2d2326 Requires python 3.4 2017-03-29 00:11:08 +11:00
Oliver Walters b232649b63 Added 'check' command 2017-03-29 00:07:08 +11:00
Oliver Walters beddb94683 fixed path to manage.db 2017-03-29 00:01:58 +11:00
Oliver Walters f14ae18080 - moved database
- added django db test
2017-03-28 23:59:57 +11:00
Oliver Walters 8e77410074 no message 2017-03-28 23:55:31 +11:00
Oliver Walters 5947d17e28 travis update 2017-03-28 23:52:44 +11:00
Oliver f6b3dde1bb Merge pull request #5 from SchrodingersGat/master
PEP test
2017-03-28 23:47:50 +11:00
Oliver Walters 4912d5507b peppercord 2017-03-28 23:46:17 +11:00
Oliver Walters 1a875811b7 not a pep 2017-03-28 23:44:32 +11:00
Oliver 79b7c7d754 Update README.md 2017-03-28 23:42:40 +11:00
Oliver 187de59e3b Added build-status picture 2017-03-28 23:42:31 +11:00
Oliver Walters 433dc7b3e3 Pep goes the weasel 2017-03-28 23:41:05 +11:00
Oliver Walters 7ce5a9a7e5 Papa Pep 2017-03-28 23:38:12 +11:00
Oliver Walters b5dc22f33a peppa pig 2017-03-28 23:31:41 +11:00
Oliver Walters 14f60e1292 Pepsi 2017-03-28 23:29:00 +11:00
Oliver Walters c111aaf9b2 peps 2017-03-28 23:25:38 +11:00
Oliver Walters a5009147c3 pepe is a racist meme 2017-03-28 23:21:26 +11:00
Oliver Walters 9aebdab1c2 pepper 2017-03-28 23:17:56 +11:00
Oliver Walters 18c39e7680 added newline 2017-03-28 23:16:47 +11:00
Oliver Walters a793b344e8 PEP test 2017-03-28 23:14:36 +11:00
Oliver 2d9206478e Merge pull request #4 from SchrodingersGat/master
Added more models
2017-03-28 23:14:25 +11:00
Oliver Walters 9f34f9353e Ignore blank whitespace line 2017-03-28 23:12:36 +11:00
Oliver Walters 8781b572c0 bug fix for part serializer 2017-03-28 23:10:43 +11:00
Oliver Walters 09cb067627 PEP fixes 2017-03-28 23:09:51 +11:00
Oliver Walters f4ef9d938e fixed python version 2017-03-28 23:05:09 +11:00
Oliver Walters b108c71eef limited to one python version 2017-03-28 23:03:06 +11:00