DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-17 19:14:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11475 commits 96 branches 267 tags 296 MiB
Commit graph

11475 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 4c78b49b97 Add @vikaas-cyper as a contributor 2023-05-10 11:31:26 -07:00
snipe aca287d28c
Merge pull request #13004 from snipe/security/upgrade_webpack 
Updated webpack, new asset files
 2023-05-10 11:23:02 -07:00
snipe 1f5e4309fa Updated webpack, new asset files 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 11:20:06 -07:00
Marcus Moore a1a11d788f
Disable browser tests in ChipperCI 2023-05-10 11:06:05 -07:00
snipe b8a59cc2d8
Merge branch 'master' into develop 2023-05-10 09:32:26 -07:00
snipe 04aedce47e Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 09:29:42 -07:00
snipe d648e9a01c Added Google test user 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 09:13:34 -07:00
snipe 7c77f4a697 Extra debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 09:10:53 -07:00
akemidx 537aa04c9a
Merge branch 'develop' into delete_asset_from_view_page 2023-05-10 09:30:54 -04:00
snipe 27e0484072 I lied. Missed one 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 03:12:22 -07:00
snipe ec76de607b Final google login tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 03:08:29 -07:00
snipe 14da8934c5 Few more login page tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:53:11 -07:00
snipe ed370a0104 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:47:28 -07:00
snipe b99640ecb2 Added ends_with validation message 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:40:55 -07:00
snipe 8bad72a80f Added validation on google client ID 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:40:45 -07:00
snipe f3c977aa9d Nicer button 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:37:01 -07:00
snipe 788c03ef57 Hide client secret if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:22:49 -07:00
snipe 3c00f68bda Added translation string for google auth failure 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:18:50 -07:00
snipe 7062583710 Check for http or https in avatar value 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:18:38 -07:00
snipe 2dd32d8785 Re-add the image update 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:18:27 -07:00
snipe ff66a938c1 Clearer comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:18:15 -07:00
snipe 7f0e677908 Use normal translation style 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:18:05 -07:00
snipe e8a0c7f2ce Remove avatar update, since we don’t take URLs for that 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:59:33 -07:00
snipe e950cf4279 Switch to using username as match for google login 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:58:36 -07:00
snipe 567a800c51 Added debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:47:52 -07:00
snipe e5eb5932ca Create constructor to override expected config variables 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:37:03 -07:00
snipe a90fc1ab59
Merge pull request #12994 from snipe/features/google_socialite 
Google OAuth login
 2023-05-10 01:23:37 -07:00
snipe 3612526632 Disallow saving data if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:14:54 -07:00
snipe 1ef4ea6381 Very ugly login shim just to test functionality 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:14:31 -07:00
snipe 37bc47290c Disabled fields in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:12:55 -07:00
snipe 4da40792ea Use google logo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:08:28 -07:00
snipe 63bf93b786 Pulled redirect from settings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:56:04 -07:00
snipe f57e39191d Added google settings blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:55:16 -07:00
snipe 6ab214d3a6 Added google option to settings index 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:55:04 -07:00
snipe 3fb5188037 Removed redirect option 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:54:46 -07:00
snipe aefd330e4e Added methods for google settings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:54:28 -07:00
snipe b7e8ce3064 Changed redirect 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:54:14 -07:00
snipe b183e53c45 Added settings routes for google auth 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:34:48 -07:00
snipe 054a2ab9d4 Add validation and fillable fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:34:31 -07:00
snipe bc9b47c46d Removed env dependency, switched to DB 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:27:47 -07:00
snipe 72d1c08fbc Added migration 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:21:17 -07:00
snipe c52b48c383 Google oauth login 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:14:28 -07:00
snipe 11cd875c6d Merge remote-tracking branch 'origin/develop' 2023-05-09 22:42:45 -07:00
snipe a1ec8cf490
Merge pull request #12993 from snipe/fixes/checkbox_layout_in_ldap 
Tightened up some layout issues, checkbox issues in LDAP settings
 2023-05-09 22:37:49 -07:00
snipe 0680405f4d Tightened up some layout issues, checkbox issues in LDAP settings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-09 22:34:46 -07:00
snipe cbe70c9cc1 Merge remote-tracking branch 'origin/develop' 2023-05-09 20:14:44 -07:00
snipe 6a7bab453f Made spacing more compact 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-09 20:14:00 -07:00
snipe 7412bc32e2
Merge pull request #12991 from snipe/fixes/accessories_view 
Fixed width of columns in details
 2023-05-09 20:11:36 -07:00
snipe ec4697fd3e Merge remote-tracking branch 'origin/develop' 2023-05-09 19:45:10 -07:00
snipe 5a461d62bc
Merge pull request #12990 from snipe/fixes/12881_missing_icon 
Added icon field back into assets page
 2023-05-09 19:44:30 -07:00