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
5,838 Commits 6 Branches 99 Tags 484 MiB
f1e5feaef2
Commit Graph

5838 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
zakx
38725e6ad0 Making sure travis has the build.txt requirements 2017-04-10 23:15:11 +02:00
zakx
c5b2206f94 Removing bogus dependencies 2017-04-10 23:03:12 +02:00
zakx
d27c68e4ee Updating README to reflect new tooling 2017-04-10 22:57:13 +02:00
zakx
428015ecf5 Adding reminder to remove pre-generated SECRET_KEY 
Later on, we'll need environment-based default configs anyway,
so this will probably be done together.
 2017-04-10 22:56:09 +02:00
zakx
82541b9b86 Updating travis file to use Makefile commands 2017-04-10 22:55:55 +02:00
zakx
89e4cf899e Modernized environment 2017-04-10 22:55:25 +02: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