inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2026-07-26 16:41:45 +00:00
Code Activity
9,979 Commits 8 Branches 164 Tags
df72cb2608f6ff62f9cb8a06c83cbf8a9363fe2a
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthias df72cb2608 merge upstream 2021-11-04 23:44:41 +01:00
Matthias e3b02e596e Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-11-03 00:25:39 +01:00
Matthias e73d3d567c fix MFA buttons 2021-11-02 07:56:59 +01:00
Matthias 58f35ebc56 use buttons isntead of links 2021-11-01 23:49:22 +01:00
Matthias 70341d6745 refactor of backup tokens 2021-11-01 23:33:29 +01:00
Matthias f8a45dcec2 back button 2021-11-01 23:23:50 +01:00
Matthias 7bcab13253 translate disable button 2021-11-01 23:19:50 +01:00
Matthias b4570f6a7e use alert 2021-11-01 23:11:48 +01:00
Matthias 7dbbca5b3a fix translation 2021-11-01 23:11:41 +01:00
Matthias 4e9cf8492f full width 2021-11-01 23:11:14 +01:00
Matthias 024a9deab4 full width buttons 2021-11-01 23:07:39 +01:00
Matthias 0011c7ee62 crispyfy 2021-11-01 23:07:27 +01:00
Matthias 240859c38c make crispy 2021-11-01 23:03:36 +01:00
Matthias a8f5661a27 make auth a bit wider 2021-11-01 22:59:23 +01:00
Matthias 58bc677029 more contrast for the qr 2021-11-01 22:58:47 +01:00
Matthias 6404764025 crispyfy 2021-11-01 22:51:42 +01:00
Matthias 3cb2078821 fix spelling 2021-11-01 22:46:56 +01:00
Matthias fc0e80dd76 make remove button conditional 2021-11-01 22:45:56 +01:00
Matthias 392e7f6e4c there can be only one factor 2021-11-01 22:43:43 +01:00
Matthias 17e7c2ee15 disable add button if already set up 2021-11-01 22:43:28 +01:00
Matthias 61d3ea6293 refactor underscore handeling into function 2021-11-01 22:33:56 +01:00
Matthias 78d9e906da remove testing string 2021-11-01 22:28:38 +01:00
Matthias 3e3da8b2d1 fix permission parser 2021-11-01 22:23:51 +01:00
Matthias 6dead88028 fix permission parsing if underscores in perm 2021-11-01 17:06:13 +01:00
Matthias bba478dc1c Merge branch 'matmair/issue2201' of https://github.com/matmair/InvenTree into matmair/issue2201 2021-11-01 12:35:40 +01:00
Matthias 62adb95d3c Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-11-01 12:35:25 +01:00
Matthias 33d61d8cb5 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2181 2021-11-01 12:31:35 +01:00
Matthias 338e85ff52 remove breadcrub div where no breadcrumb 2021-11-01 01:09:08 +01:00
Matthias 9a346dd3e2 Revert "remove breadcrub div where no breadcrumb" 
This reverts commit 2c9b03944f.
 2021-11-01 01:07:13 +01:00
Matthias 481a1088ee fix adapters to use OTP 2021-11-01 01:05:29 +01:00
Matthias 9d68d6bdca added setting to anable MFA 2021-11-01 00:34:00 +01:00
Matthias a8e18a7972 handle modelnames / permissions with underscores 2021-11-01 00:24:57 +01:00
Matthias fc566621b7 add rulesets 2021-11-01 00:24:21 +01:00
Matthias b7d6ca12e8 PEP fixes 2021-11-01 00:16:30 +01:00
Matthias 8da2865299 setting sidebar header different color to items 2021-11-01 00:11:01 +01:00
Matthias 62aa014f6b add button for navbar toogle 2021-11-01 00:09:38 +01:00
Matthias 2c9b03944f remove breadcrub div where no breadcrumb 2021-11-01 00:08:39 +01:00
Matthias f0a558c1e2 remove unneeded spacing 2021-11-01 00:06:08 +01:00
Matthias b5fb67ee76 Merge branch 'matmair/issue2201' of https://github.com/matmair/InvenTree into matmair/issue2201 2021-10-31 23:42:40 +01:00
Matthias d8fb6d44ec adds faktors to user settings 2021-10-31 23:42:31 +01:00
Matthias 85da98a004 use auth screen to make more clear this is about security 2021-10-31 23:07:25 +01:00
Matthias 7719a07f19 remove data 2021-10-31 14:10:07 +01:00
Matthias 487bab5162 cleanup 2021-10-31 14:02:24 +01:00
Matthias 9fd66e9f22 Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue2201 2021-10-31 13:56:14 +01:00
Matthias ec17bbcb95 mkaeuser setting tighter 2021-10-31 13:54:12 +01:00
Matthias 06822303bc refactor user settings 2021-10-31 13:42:41 +01:00
Matthias dd74cf19a7 fix middleware to not interupt flow 2021-10-31 13:42:27 +01:00
Matthias eaf1a4baec enforce mfa on all frontend pages 2021-10-28 11:41:45 +02:00
Matthias 527bc4381d show messages in base 2021-10-28 11:39:28 +02:00
Matthias aa7b78f41d Adding in MFA 
Fixes #2201
 2021-10-27 21:35:00 +02:00
Matthias 7f6f22fb03 move part toggle button 
under action buttons to save vertical space when closed
 2021-10-24 00:40:23 +02:00
Matthias d97e3cd4e5 create stock on import 2021-10-24 00:19:17 +02:00
Matthias bec845003d fix defaults 2021-10-23 23:57:10 +02:00
Matthias 612832c3e7 respect defaults 2021-10-23 23:48:42 +02:00
Matthias 8e6aaa89f9 calculate true / false for fields 2021-10-23 23:40:57 +02:00
Matthias 1556663254 added fields to save step 2021-10-23 23:40:29 +02:00
Matthias 71cc155dc9 Capitalize name 2021-10-23 22:50:01 +02:00
Matthias da9d2f7467 Added missing fields 
Fixes #2181
 2021-10-23 22:49:06 +02:00
Matthias faa620b8f0 remove commit from super call 2021-10-17 18:52:59 +02:00
Matthias 103a4af9d4 fix signup with providers with extra args 2021-10-15 23:18:03 +02:00
Matthias 0657b71fe8 clearer name and PEP foxes 2021-10-14 22:19:52 +02:00
Matthias f478a6236f Merge branch 'master' of https://github.com/inventree/InvenTree into onboarding-group 2021-10-14 22:18:42 +02:00
Matthias e0887cf55f move goup forming into own function 2021-10-14 22:16:07 +02:00
Matthias 27aec4246e PEP fix 2021-10-14 21:33:54 +02:00
Matthias f95896e8ea this was not meant to be submitted 2021-10-14 21:33:35 +02:00
Matthias 3a586af556 move setting to better fit grouping 2021-10-14 21:27:41 +02:00
Matthias b26bf780c3 setting to register group on signup 2021-10-14 21:27:09 +02:00
Matthias 3435254d2a fix email config check 2021-10-14 16:34:59 +02:00
Matthias 147d2d4631 fix default setting to not change current behaviour 2021-10-13 17:40:50 +02:00
Matthias fe7ab40b48 Merge branch 'master' of https://github.com/inventree/InvenTree into fr-1421-sso 2021-10-07 18:12:25 +02:00
Matthias 68f5af26b6 dont show mail functions if not enabled 2021-10-07 18:08:55 +02:00
Matthias a45b8dcf0e check also here if mail is enabled 2021-10-07 17:50:36 +02:00
Matthias 9a310bdd5c do not send if not configured 2021-10-07 17:42:20 +02:00
Matthias 6c0c8bf1b6 PEP fix 2021-10-07 17:32:58 +02:00
Matthias c37e40d144 use tag for testing 2021-10-07 17:31:18 +02:00
Matthias c83d244663 change of strategies 2021-10-07 17:30:34 +02:00
Matthias b4d9f0ff7e fix save arguments 2021-10-07 17:11:47 +02:00
Matthias 8ef07dcf61 custom reset form 2021-10-07 15:08:08 +02:00
Matthias f89dd84daf check if mail is enabled 2021-10-07 14:24:20 +02:00
Matthias a6c6b5c248 check if registration should be open in python 2021-10-07 14:08:19 +02:00
Matthias c872412d04 rust for SSO needed 2021-10-07 00:26:37 +02:00
Matthias 847fb62ab5 js style 2021-09-13 23:25:13 +02:00
Matthias c890a4a6d0 only add button per name once 2021-09-13 23:18:44 +02:00
Matthias 6ff4b78b23 maybe now this is fixd? 2021-09-08 00:55:37 +02:00
Matthias ff98c87311 muting unneeded check 2021-09-08 00:16:51 +02:00
Matthias 30c98b828e fix checks 2021-09-07 23:59:28 +02:00
Matthias 48a4715b58 PEP fix 2021-09-07 23:59:18 +02:00
Matthias 5b7941ab17 crispyfy confirmation 2021-09-07 23:55:32 +02:00
Matthias f730702a7d add aditional provider settings 2021-09-07 23:55:11 +02:00
Matthias 0eb9d3ad5b cleanup 2021-09-07 23:08:04 +02:00
Matthias 0a8401da1d some settings in config 2021-09-07 23:07:23 +02:00
Matthias b281241607 remove unneeded override 2021-09-07 22:38:01 +02:00
Matthias dbc58b299c fix layout for password reset 2021-09-07 22:35:19 +02:00
Matthias 53de59f84b setting for two password fields on signup 2021-09-07 07:37:28 +02:00
Matthias af286766ea setting for two mail fields on signup 2021-09-07 07:17:00 +02:00
Matthias 1f03d43b92 settings for auto-fill on sso 2021-09-07 01:19:44 +02:00
Matthias e380f94e01 allauth always logout 2021-09-07 00:33:26 +02:00
Matthias 32e216599b PEP fix 2021-09-07 00:03:55 +02:00
Matthias a4209d38cc setting to make mail required on signup 2021-09-06 22:07:50 +02:00
Matthias 3963ece6d2 make notifications go away 2021-09-06 07:29:40 +02:00