2
0
mirror of https://github.com/inventree/InvenTree.git synced 2026-05-14 21:47:37 +00:00
Commit Graph

184 Commits

Author SHA1 Message Date
Matthias Mair 1e57bdcfba Merge branch 'inventree:master' into matmair/issue2279 2022-03-16 15:15:46 +01:00
Matthias 33d9913f78 do not cover programming error 2022-03-13 21:11:22 +01:00
Matthias 1e4727d733 ignore precaution for plugin programmers srewing up in coverage 2022-03-13 19:48:49 +01:00
Matthias e68cc25294 ignore programming error in coverage 2022-03-13 19:48:04 +01:00
Matthias 4eaa655a7c ignore for coverage 2022-03-12 03:43:04 +01:00
Matthias 56ebb0fd0e ignore custom admin form 2022-03-12 03:40:50 +01:00
Matthias d8fc56cf61 ignore m2m for coverage 2022-03-12 03:40:27 +01:00
Matthias Mair 86ba69eeaf Merge branch 'inventree:master' into matmair/issue2279 2022-02-28 00:45:58 +01:00
Oliver fe4d063135 Change some prints to log messages 2022-02-25 17:19:39 +11:00
Matthias Mair 626f44d195 Merge branch 'inventree:master' into matmair/issue2279 2022-02-16 02:02:02 +01:00
Matthias 238cc9e278 disable broken test 2022-02-14 00:42:47 +01:00
Matthias 8df5a3f980 add more user api tests 2022-02-14 00:21:15 +01:00
Matthias 6848787885 remove dead code -> permission class does that already 2022-02-14 00:21:01 +01:00
Matthias a4d94f31c8 add test for non existing token 2022-02-14 00:14:11 +01:00
Matthias 9246eea38e PEP fix 2022-02-13 23:42:05 +01:00
Matthias 384d458110 user api tests 2022-02-13 23:39:10 +01:00
Matthias e262599d83 ignore unreachable things 2022-02-13 23:32:55 +01:00
Matthias ffafc20c6d do not count unreachable code 2022-02-13 23:30:27 +01:00
Matthias 898f99c931 ignore not testable condition 2022-02-13 17:42:50 +01:00
Matthias 127368d47f ignore coverage on ruleset checks 2022-02-13 05:04:51 +01:00
Matthias 9eb238c85e Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2279 2022-02-12 00:51:15 +01:00
eeintech 3b45c1406a Improved approach to permission check at runtime 2022-02-07 15:42:39 -05:00
eeintech fd63fcde43 Reverted print statement to logger 2022-02-07 15:39:06 -05:00
eeintech ef70e665bb Refactored and added permission check for children models 2022-02-07 15:37:07 -05:00
eeintech de7e152081 Experimenting with children models permissions 2022-02-02 14:01:53 -05:00
Matthias ee99052d04 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2279 2022-01-12 02:13:50 +01:00
Matthias Mair 9e21dde6de Merge branch 'inventree:master' into webhooks 2022-01-08 21:42:18 +01:00
Oliver 7cb029e7c3 Refactor: Rename "GLOBAL_SETTINGS" to "SETTINGS" 2022-01-01 22:43:35 +11:00
Matthias Mair 3ed8fc6ad4 Merge branch 'inventree:master' into webhooks 2021-12-15 00:21:03 +01:00
Matthias Mair acbee38600 Merge branch 'inventree:master' into matmair/issue2279 2021-12-15 00:20:48 +01:00
Matthias 3a3f8ba4ef Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-12-08 18:31:33 +01:00
Matthias Mair b8404c44b4 Merge branch 'inventree:master' into webhooks 2021-12-08 18:28:11 +01:00
Matthias Mair cdcac90319 Merge branch 'inventree:master' into matmair/issue2279 2021-12-08 18:27:57 +01:00
Matthias bb2ad7c2cb Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-12-04 18:04:47 +01:00
Matthias Mair 1060f60117 Merge branch 'inventree:master' into webhooks 2021-12-04 17:53:21 +01:00
Matthias Mair 2a0e07abe0 Merge branch 'inventree:master' into matmair/issue2201 2021-12-04 17:53:13 +01:00
Matthias Mair 0d9f76a019 Merge branch 'inventree:master' into matmair/issue2279 2021-12-04 17:52:58 +01:00
Oliver 087ac0bd34 Adds filter to purchase order for "assigned to me" 2021-12-04 21:15:38 +11:00
Matthias 0f0460f8ea merge 2021-12-02 17:24:07 +01:00
Matthias Mair 11e527a02a Merge branch 'inventree:master' into plugin-2037 2021-12-02 09:23:05 +01:00
Matthias Mair fcf7f615aa Merge branch 'inventree:master' into webhooks 2021-12-02 09:22:48 +01:00
Matthias 61b53a10b0 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2279 2021-12-01 23:59:22 +01:00
Oliver da6c723184 Merge branch 'master' into partial-shipment
# Conflicts:
#	InvenTree/order/serializers.py
2021-11-29 22:59:36 +11:00
Matthias 9454b51866 fix rules 2021-11-28 17:18:46 +01:00
Matthias ace4370ee9 add ruleset 2021-11-28 16:50:34 +01:00
Matthias 90b3f63851 add ruleset 2021-11-28 16:47:40 +01:00
Matthias 91bc865887 remove webhook ruleset 2021-11-19 23:19:02 +01:00
Matthias 260c51f6fc Pulls out the webhook dev for partial merge
Fixes #2036
2021-11-19 22:35:28 +01:00
Matthias 9ae8474ed9 fix test 2021-11-12 02:34:18 +01:00
Oliver d5cf2b08ac Merge remote-tracking branch 'inventree/master' into partial-shipment
# Conflicts:
#	InvenTree/InvenTree/version.py
#	InvenTree/order/models.py
2021-11-11 12:35:59 +11:00