inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-17 20:23:50 +00:00
Code Activity
11,939 Commits 9 Branches 164 Tags
e53e428a323ea50e8cf98a52934cf9f94e015c31
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias MairandGitHub eeccf8e6bf pep fix 2022-03-18 07:52:36 +01:00
Matthias MairandGitHub 0cd8aae250 raise blocker again 2022-03-18 07:50:02 +01:00
Matthias MairandGitHub a97f2be8fa remove test 2022-03-18 07:49:16 +01:00
Matthias MairandGitHub a1791645fa just raise 2022-03-18 02:19:32 +01:00
Matthias MairandGitHub 57df39086c Merge branch 'inventree:master' into fix-set_user 2022-03-16 15:16:26 +01:00
Matthias MairandGitHub e4c293f721 fix formatter 2022-03-15 13:43:41 +01:00
Matthias MairandGitHub a024df0147 Merge branch 'inventree:master' into coverage-changes 2022-03-14 23:14:14 +01:00
Matthias MairandGitHub b2676e3629 Merge branch 'inventree:master' into matmair/issue2501 2022-03-01 20:19:23 +01:00
Matthias MairandGitHub 0957feafa1 fix test 2022-03-01 20:12:38 +01:00
Matthias MairandGitHub 56e0b5f98d Add as superuser 2022-03-01 12:31:56 +01:00
Matthias MairandGitHub a500e8cf54 Fix typo 2022-03-01 12:28:31 +01:00
Matthias MairandGitHub 484a53ff8e Update apps.py 
Update env names
 2022-03-01 12:26:16 +01:00
Matthias MairandGitHub 2f4cae4c9d Update config_template.yaml 
Change name for config name
 2022-03-01 12:25:04 +01:00
Matthias MairandGitHub 5cc214dfbc Update settings.py 
Add comment to explain usage
 2022-03-01 12:23:17 +01:00
Matthias MairandGitHub bb480b1e81 Add DO to readme 2022-02-26 23:10:55 +01:00
Matthias MairandGitHub 8b8e95385b Merge branch 'inventree:master' into translation-fixes 2022-02-20 22:20:00 +01:00
Matthias MairandGitHub 0be2f8cf02 Merge branch 'inventree:master' into coverage-fixes 2022-02-15 01:48:55 +01:00
Matthias MairandGitHub 880d78f2c6 Pep 2022-02-13 06:24:05 +01:00
Matthias MairandGitHub c6da462229 Remove settings mods 2022-02-13 06:22:15 +01:00
Matthias MairandGitHub 975c81ccfe Merge branch 'inventree:master' into fix-html-tags 2022-02-12 00:32:26 +01:00
Matthias MairandGitHub 18e0a7b7e6 fix spelling 
Thanks @Stephano120
Good catch!
 2022-01-28 20:19:38 +01:00
Matthias MairandGitHub d998f8bfbe Merge branch 'inventree:master' into fix-html-tags 2022-01-24 23:39:21 +01:00
Matthias MairandGitHub af04056843 Merge branch 'inventree:master' into style-fix 2022-01-24 23:39:17 +01:00
Matthias MairandGitHub d045bffa84 Merge branch 'inventree:master' into template-reduce-duplication 2022-01-21 01:31:45 +01:00
Matthias MairandGitHub 2bc4d57ffa remove double code 2022-01-10 02:49:34 +01:00
Matthias MairandGitHub f219a10b2f small fix to language in readme 
normally the kind of API we supply is called REST
 2022-01-09 22:46:28 +01:00
Matthias MairandGitHub 9e21dde6de Merge branch 'inventree:master' into webhooks 2022-01-08 21:42:18 +01:00
Matthias MairandGitHub 8799985f75 Merge branch 'inventree:master' into stale 2022-01-07 00:08:28 +01:00
Matthias MairandGitHub 67e4fd9d34 Merge branch 'inventree:master' into webhooks 2022-01-07 00:08:11 +01:00
Matthias MairandGitHub a02ae8c20d add welcome messages 2022-01-05 23:41:04 +01:00
Matthias MairandGitHub 9b1e944509 ignore everything that got a milestone 
this helps keeping false positives lower
 2022-01-04 00:04:05 +01:00
Matthias MairandGitHub 993b368d3d new stale check 2022-01-03 23:59:16 +01:00
Matthias MairandGitHub b6b6e10f4d Merge branch 'inventree:master' into webhooks 2021-12-29 23:54:48 +01:00
Matthias MairandGitHub d763959269 Merge branch 'inventree:master' into api-mixin 2021-12-29 23:54:33 +01:00
Matthias MairandGitHub 3ed8fc6ad4 Merge branch 'inventree:master' into webhooks 2021-12-15 00:21:03 +01:00
Matthias MairandGitHub f6d43946b3 Merge branch 'inventree:master' into webhooks 2021-12-11 00:08:56 +01:00
Matthias MairandGitHub 89758f28b2 Merge branch 'inventree:master' into matmair/issue2201 2021-12-11 00:08:29 +01:00
Matthias MairandGitHub ac0a5d4efc Merge branch 'inventree:master' into webhooks 2021-12-09 23:56:18 +01:00
Matthias MairandGitHub 75aeab48b8 Merge branch 'inventree:master' into matmair/issue2250 2021-12-09 23:56:08 +01:00
Matthias MairandGitHub b8404c44b4 Merge branch 'inventree:master' into webhooks 2021-12-08 18:28:11 +01:00
Matthias MairandGitHub 1060f60117 Merge branch 'inventree:master' into webhooks 2021-12-04 17:53:21 +01:00
Matthias MairandGitHub 2a0e07abe0 Merge branch 'inventree:master' into matmair/issue2201 2021-12-04 17:53:13 +01:00
Matthias MairandGitHub 502d701a70 Merge branch 'inventree:master' into pipeline 2021-12-04 17:53:02 +01:00
Matthias MairandGitHub 6bc3e3ccbb Workflow remaster (#2416) 
* Workflow remaster (#28)

* set default ref

* only trigger version number if pullrequest

* try skipping just a step

* Workflow remaster (#29)

* set default ref

* only trigger version number if pullrequest

* always run style

* try skipping just a step

* try adding a step so everything continues

* Workflow remaster (#30)

* set default ref

* only trigger version number if pullrequest

* always run style

* try skipping just a step

* try adding a step so everything continues

* maybe this does not fail them

* skip ahead

* do not skip the whole job, just the steps
 2021-12-04 11:01:18 +11:00
Matthias MairandGitHub ec3b5b6cbc Merge branch 'inventree:master' into workflow-remaster 2021-12-02 17:13:49 +01:00
Matthias MairandGitHub 4904beb45a Merge branch 'inventree:master' into webhooks 2021-12-02 17:08:36 +01:00
Matthias MairandGitHub cf3d2d0df9 Merge branch 'inventree:master' into load-minified-fa 2021-12-02 09:23:13 +01:00
Matthias MairandGitHub 11e527a02a Merge branch 'inventree:master' into plugin-2037 2021-12-02 09:23:05 +01:00
Matthias MairandGitHub fcf7f615aa Merge branch 'inventree:master' into webhooks 2021-12-02 09:22:48 +01:00
Matthias MairandGitHub b687659ddd Merge branch 'inventree:master' into matmair/issue2327 2021-11-28 17:26:19 +01:00
Matthias MairandGitHub baf19c2021 Merge branch 'inventree:master' into plugin-2037 2021-11-28 17:26:09 +01:00
Matthias MairandGitHub 092f7b8e90 Merge branch 'inventree:master' into matmair/issue2201 2021-11-28 17:26:00 +01:00
Matthias MairandGitHub a066f4c940 Merge branch 'inventree:master' into webhooks 2021-11-28 17:25:53 +01:00
Matthias MairandGitHub e3dfb1295b Merge branch 'inventree:master' into matmair/issue2201 2021-11-23 18:28:41 +01:00
Matthias MairandGitHub 565fad30d7 Merge branch 'inventree:master' into webhooks 2021-11-23 18:27:09 +01:00
Matthias MairandGitHub d1e1be4253 Merge branch 'inventree:master' into plugin-2037 2021-11-08 18:41:16 +01:00
Matthias MairandGitHub 0d36cb7c0d Merge branch 'inventree:master' into plugin-2037 2021-11-06 15:44:01 +01:00
Matthias MairandGitHub 7cd04f289c Merge branch 'inventree:master' into matmair/issue2201 2021-11-06 15:43:59 +01:00
Matthias MairandGitHub f5fa64d9a9 Merge branch 'inventree:master' into plugin-2037 2021-11-04 23:42:07 +01:00
Matthias MairandGitHub 717bfde73d bug report simplification 
Hide descriptions so the reports from inexperienced users get less cluttered
 2021-11-03 23:07:25 +01:00
Matthias MairandGitHub 19afcc52e8 Update bug_report.md 
fix spelling error
 2021-11-03 23:00:52 +01:00
Matthias MairandGitHub 05a86c863f Update page_base.html 2021-11-01 01:38:21 +01:00
Matthias MairandGitHub f137d06dd5 Merge branch 'inventree:master' into matmair/issue2201 2021-11-01 01:06:29 +01:00
Matthias MairandGitHub d89cb0936c Merge branch 'inventree:master' into plugin-2037 2021-11-01 01:06:26 +01:00
Matthias MairandGitHub c775d030f9 Merge branch 'inventree:master' into matmair/issue2181 2021-11-01 01:06:18 +01:00
Matthias MairandGitHub 037f2a9438 Merge branch 'inventree:master' into matmair/issue2181 2021-10-31 23:04:55 +01:00
Matthias MairandGitHub 0d836530e4 Merge branch 'inventree:master' into plugin-2037 2021-10-31 23:04:50 +01:00
Matthias MairandGitHub c02a087044 Merge branch 'inventree:master' into matmair/issue2201 2021-10-31 23:04:40 +01:00
Matthias MairandGitHub 20a129f396 Merge branch 'inventree:master' into matmair/issue2181 2021-10-30 17:24:03 +02:00
Matthias MairandGitHub 6ce10736af Merge branch 'inventree:master' into matmair/issue2210 2021-10-30 17:23:55 +02:00
Matthias MairandGitHub 108f715ef6 Merge branch 'inventree:master' into matmair/issue2213 2021-10-30 17:23:51 +02:00
Matthias MairandGitHub ceb457a837 Update README.md 
added a button in REadme to open up a env in gitpod directly
 2021-10-30 14:16:11 +02:00
Matthias MairandGitHub 6a21541566 get inventree-data at startup (#26) 
* Gitpod (#25)

* Create .gitpod.yml

* split up command

* monolythic may be better

* set envs per export

* use dev for data

* trying the split again

* added sync command

* cleanup

* Update .gitpod.yml

settings for prebuilds

* add dataset import

* remove check - might block PRs

* switch execution flow

* do not block in execution

* for deletion in script

* Update .gitpod.yml

added in github RSA fingerprint

* Update .gitpod.yml

update key format

* Update .gitpod.yml

maybe https will work?

* Update .gitpod.yml

move dataset-update into init

* Update .gitpod.yml

a dir needs a -r flag :-)
 2021-10-30 01:27:31 +02:00
Matthias MairandGitHub cab1b0dc46 Update .gitpod.yml 
added in github RSA fingerprint
 2021-10-30 00:22:43 +02:00
Matthias MairandGitHub 6e1c42374c Merge branch 'master' into gitpod 2021-10-30 00:12:47 +02:00
Matthias MairandGitHub 2246633628 Gitpod (#24) 
* Create .gitpod.yml

* split up command

* monolythic may be better

* set envs per export

* use dev for data

* trying the split again

* added sync command

* cleanup

* Update .gitpod.yml

settings for prebuilds

* add dataset import

* remove check - might block PRs

* switch execution flow

* do not block in execution

* for deletion in script
 2021-10-30 00:03:34 +02:00
Matthias MairandGitHub 19980bda5e Merge branch 'master' into gitpod 2021-10-30 00:03:26 +02:00
Matthias MairandGitHub 83b74b2566 Gitpod (#23) 
* Create .gitpod.yml

* split up command

* monolythic may be better

* set envs per export

* use dev for data

* trying the split again

* added sync command

* cleanup

* Update .gitpod.yml

settings for prebuilds

* add dataset import

* remove check - might block PRs

* switch execution flow
 2021-10-29 18:23:27 +02:00
Matthias MairandGitHub fee22be0e0 Merge branch 'master' into gitpod 2021-10-29 18:23:19 +02:00
Matthias MairandGitHub 59951a12e2 Gitpod (#22) 
* Create .gitpod.yml

* split up command

* monolythic may be better

* set envs per export

* use dev for data

* trying the split again

* added sync command

* cleanup

* Update .gitpod.yml

settings for prebuilds
 2021-10-29 18:05:25 +02:00
Matthias MairandGitHub c35eeca19d Update .gitpod.yml 
settings for prebuilds
 2021-10-29 18:02:49 +02:00
Matthias MairandGitHub 6e486140c3 Merge branch 'inventree:master' into matmair/issue2181 2021-10-29 00:21:11 +02:00
Matthias MairandGitHub e8de149e2b Merge branch 'inventree:master' into plugin-2037 2021-10-29 00:21:07 +02:00
Matthias MairandGitHub 25da6be036 Create .gitpod.yml 2021-10-28 13:32:36 +02:00
Matthias MairandGitHub 31a8ee7302 Merge branch 'inventree:master' into plugin-2037 2021-10-20 23:52:51 +02:00
Matthias MairandGitHub edd2e16dfc Merge branch 'inventree:master' into fix-sso-signup 2021-10-20 23:52:47 +02:00
Matthias MairandGitHub 592c5f0d6c Delete .gitmodules 2021-10-19 21:44:42 +02:00
Matthias MairandGitHub 55ba9ad6c9 Merge branch 'inventree:master' into fix-email-settingins 2021-10-14 21:39:32 +02:00
Matthias MairandGitHub 848a72604e Merge branch 'inventree:master' into fr-1421-sso 2021-10-08 22:38:16 +02:00
Matthias MairandGitHub 2d65f6f905 Merge branch 'inventree:master' into fr-1421-sso 2021-10-06 02:01:16 +02:00
Matthias MairandGitHub 9d1c146a40 Merge branch 'inventree:master' into plugin-2037 2021-10-04 23:26:59 +02:00
Matthias MairandGitHub 56221a33bf Merge branch 'inventree:master' into fr-1421-sso 2021-10-04 23:26:07 +02:00
Matthias MairandGitHub acbea53a3d Merge branch 'inventree:master' into fr-1421-sso 2021-09-29 00:41:25 +02:00
Matthias MairandGitHub 44c5003839 Merge branch 'inventree:master' into fr-1421-sso 2021-09-24 00:32:38 +02:00
Matthias MairandGitHub acc4d8d9e8 Merge branch 'inventree:master' into plugin-2037 2021-09-24 00:32:22 +02:00
Matthias Mair 2b1279e647 now with closing tags 2021-09-01 08:14:08 +02:00
Matthias Mair 5ad2eabab1 fix html templates 2021-08-31 13:17:38 +02:00
Matthias MairandGitHub 446243f2b5 Added templates 2021-08-24 00:29:50 +02:00
Matthias MairandGitHub 4c8fdab072 fixed descriptions 2021-08-23 09:44:52 +02:00
Matthias MairandGitHub e24a158919 Merge branch 'inventree:master' into bpm-purchase-price 2021-08-20 00:42:50 +02:00