DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
10722 commits 101 branches 268 tags 320 MiB
Commit graph

10722 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M fe60309dfd adds padding to multi select2 inputs 2023-05-17 10:19:25 -07:00
Godfrey M 448472b6d3 testing input paddings 2023-05-17 09:45:45 -07:00
snipe 13c6a7f89b
Merge pull request #13039 from snipe/features/add_eol_date_to_importer 
Added EOL date to importer
 2023-05-16 20:12:10 -07:00
snipe 3296716dfa Added EOL date to importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 19:06:35 -07:00
snipe c4876865cf Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 17:36:58 -07:00
snipe 3cbb4620c3
Merge pull request #13008 from Godmartinz/importer_happy_changes 
Added standardized colors to the importer
 2023-05-16 17:26:32 -07:00
snipe 5a1e6c8e29
Merge pull request #13003 from marcusmoore/chipper-config-updates 
Disable browser tests in ChipperCI
 2023-05-16 17:26:09 -07:00
snipe f1575d2020
Merge pull request #13024 from Godmartinz/adds_localization_to_checkout_notif 
adds translation to checkout notification
 2023-05-16 17:25:50 -07:00
snipe 71234228b4
Merge pull request #13025 from Godmartinz/archived_clears_assigned_to 
removes assigned_to if archived
 2023-05-16 17:25:24 -07:00
snipe 4ca914d773
Merge pull request #13038 from uberbrady/fix_asset_checkout_on_update 
Importer fix for non-Location imports
 2023-05-16 16:41:27 -07:00
Brady Wetherington 2eb34d423f Importer fix for non-Location imports 2023-05-16 16:33:07 -07:00
snipe b9b9eb86d9
Merge pull request #13036 from snipe/features/multiselect_locations_custom_report 
Added multi-select option for location, more to custom report
 2023-05-16 16:29:13 -07:00
snipe 9e4e9cc708
Merge pull request #13037 from snipe/fixes/actions_text 
Uses actions text in backups table
 2023-05-16 16:06:05 -07:00
snipe fe92667812 Use actions text in backups table 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 16:02:48 -07:00
snipe 02cacf76c6 Additional multi-select options for custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 13:58:21 -07:00
Godfrey M 8e3cbdad90 removes assigned_to if archived 2023-05-15 11:52:57 -07:00
Godfrey M 46d6783fc5 adds translation to checkout notification 2023-05-15 09:01:30 -07:00
Godfrey M 763176c86b standardizes the importer colors no matter the theme 2023-05-10 14:52:08 -07:00
snipe 0f3b77ee2d Added multi-select option to custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 14:45:31 -07:00
snipe 869d195b35
Merge pull request #13007 from snipe/fixes/multiselect_company 
Fixed multiselect for companies
 2023-05-10 13:17:36 -07:00
snipe a49257ad4b Wrong eval 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 13:16:59 -07:00
snipe c6eef86661 Fixed multiselect for companies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 13:15:22 -07:00
snipe 71c7c82398
Merge pull request #13006 from snipe/fixes/12831_array_for_company_id 
Fixes PR #12831 use array bracket for multi select company
 2023-05-10 12:36:59 -07:00
snipe 23e3d18931 Used brackets for multiselect company 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 12:35:30 -07:00
snipe 5f6e528560 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2023-05-10 11:36:28 -07:00
snipe 9f39d71f16
Merge pull request #12831 from Godmartinz/adds_multi_select_to_custom_report 
Added Multiselect of companies for custom reports
 2023-05-10 11:36:21 -07:00
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
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