2
0
mirror of https://github.com/inventree/InvenTree.git synced 2025-07-03 12:10:59 +00:00
Commit Graph

777 Commits

Author SHA1 Message Date
6eee332da8 Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-23 18:39:51 +01:00
565fad30d7 Merge branch 'inventree:master' into webhooks 2021-11-23 18:27:09 +01:00
d884e62be1 [FR] Confirm to W293
Fixes #2335
2021-11-23 00:28:23 +01:00
d8963fd5b1 Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-20 13:50:13 +01:00
1a6a26204e make sure protected values are never exposed 2021-11-20 00:24:17 +01:00
1798214cd2 add protected settings in model 2021-11-19 23:59:57 +01:00
eee9047818 [FR] Two-Factor Authentication
Fixes #2201
2021-11-19 23:48:12 +01:00
4baf2971da remove webhook apis 2021-11-19 22:53:22 +01:00
d4939e058c remove admin 2021-11-19 22:52:42 +01:00
d57fc5392b remove model 2021-11-19 22:52:29 +01:00
03f343a368 remve tests 2021-11-19 22:50:55 +01:00
f6ff6c3e68 remove webhook migrations 2021-11-19 22:49:24 +01:00
260c51f6fc Pulls out the webhook dev for partial merge
Fixes #2036
2021-11-19 22:35:28 +01:00
b10492f088 rename global settings objects 2021-11-14 00:24:32 +01:00
c612cfcfba mark restart required in the settings 2021-11-12 08:03:25 +01:00
e542a8f8e3 Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-12 07:51:25 +01:00
1deb0f2c1b Merge pull request #2296 from SchrodingersGat/requires-restart
Requires restart
2021-11-12 16:02:31 +11:00
a470181ac6 Style fixes 2021-11-12 15:42:53 +11:00
3be21c59ec remove default listing without a key 2021-11-11 23:07:46 +01:00
03aa9bc9b0 Tweaks for settings admin views 2021-11-11 22:39:31 +11:00
d4db750d2f Clear the SERVER_RESTART_REQUIRED flag automatically when the server reloads 2021-11-11 22:26:46 +11:00
b4faaa7a46 Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-11 12:18:13 +01:00
626637a06a Add "hidden" property to global settings
- Allows certain settings to be hidden from the javascript files
2021-11-11 22:16:46 +11:00
2f3772f3bf define "requires_restart" function for global setting 2021-11-11 22:16:28 +11:00
bae28e8207 Add setting for enabeling reports
Fixes #2278
2021-11-10 23:54:54 +01:00
d982bfe201 Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-10 00:37:49 +01:00
2835022330 merge 2021-11-10 00:30:21 +01:00
3dae0c9c1c Remove old unit test code 2021-11-10 08:48:51 +11:00
e303b5a39b Catch for null value for settings choices 2021-11-09 22:37:50 +11:00
8d7b73e2a8 Adds support for "multiple choice" field 2021-11-09 22:25:42 +11:00
721d10a9ec Allow empty URLs 2021-11-09 22:14:26 +11:00
7dce9f3f3b PEP fixes 2021-11-09 21:37:54 +11:00
476d2545ad Remove old server-side view 2021-11-09 21:33:32 +11:00
5df4374607 javascript for editing settings via API 2021-11-09 21:16:37 +11:00
324335a620 Convert to "native value" in the serializer 2021-11-09 17:43:36 +11:00
4433befbdc Add list of 'choices' (read only) to serializer
- Check that the specified value is one of the valid options (if provided)
2021-11-09 17:21:59 +11:00
07851f0b2c Include 'setting type' in API data 2021-11-09 17:07:41 +11:00
0374c27d7c Adds "detail" view for user setting
- Users can only view / edit their own settings
2021-11-09 16:14:10 +11:00
f3b4f7aa28 Add "detail" view for global settings objects
- Can view and edit (but not delete)
- User must have "staff" status to access
2021-11-09 16:07:25 +11:00
cb583eb466 Add LIST endpoint for global settngs and user settings
- Read only, cannot create new settings
- User settings filters against the user making the request
2021-11-09 15:59:09 +11:00
df72cb2608 merge upstream 2021-11-04 23:44:41 +01:00
0daba629fe Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-04 14:23:17 +01:00
71bb6fff50 Add option to hide inactive parts in search preview window 2021-11-04 22:25:35 +11:00
e12e93f19e merge migrations 2021-11-04 10:27:40 +01:00
a88f144239 merge fixes 2021-11-04 10:17:39 +01:00
eea6c8675c PEP fix 2021-11-04 10:12:30 +01:00
363f21d6d7 Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-04 10:10:58 +01:00
83d0693013 Merge branch 'master' of https://github.com/inventree/InvenTree into plugin-2037 2021-11-03 21:25:04 +01:00
3a61d11f5a Adds a scheduled task to remove old notification entries from the database 2021-11-04 01:33:26 +11:00
6c724556f1 PEP fixes 2021-11-04 01:21:08 +11:00