DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 22:49:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
7448 commits 101 branches 268 tags 288 MiB
Commit graph

3176 commits

Author SHA1 Message Date
Maciej Domanski 41e89123e1 revert from develop 2022-03-17 12:22:37 +01:00
Maciej Domanski 540f783ba2 phpstan-fixes 2022-03-16 15:11:40 +01:00
Ivan Nieto Vivanco cdc0805fc4 Sanitize dates input in the importer before saving 2022-03-10 12:07:07 -06:00
snipe e3d2f7cc96 Missed a few 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-08 20:05:17 -08:00
snipe d1358b6249 Removed experimental feature policies 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-08 16:58:24 -08:00
Brady Wetherington ab7bf3c5d4 Get rid of stale commented-out line 2022-03-07 20:22:23 -08:00
Brady Wetherington 0556c7653a Implement a generic timeout function, and run methods that need to run with a timeout using it. 2022-03-07 19:51:21 -08:00
Brady Wetherington b96303cb38 Clean up errors, add new required package to Dockerfile 2022-03-07 19:51:21 -08:00
Brady Wetherington 312a90ce77 Add start of Tracing to LDAP troubleshooter 2022-03-07 19:51:21 -08:00
Brady Wetherington 71b5c0e80f Add new LDAP troubleshoot ldapsearch subcommand, broaden out troubleshooting 2022-03-07 19:51:21 -08:00
Brady Wetherington 519bd00bef WIP - just need to get authed connections to work 2022-03-07 19:51:21 -08:00
Brady Wetherington ffd8f583b4 Got most of the stages working for the LDAP troubleshooter 2022-03-07 19:51:21 -08:00
Brady Wetherington 8cd5ec6799 Most of the host-port-tls discovery stuff is in-place now 2022-03-07 19:51:20 -08:00
Brady Wetherington ef0e9a3c93 WIP: Enhancing stage 2 of LDAP troubleshooter 2022-03-07 19:51:20 -08:00
Brady Wetherington 8aa975e959 First pass at Artisan-based LDAP troubleshooter 2022-03-07 19:51:20 -08:00
snipe 2d7a8b5e15
Merge pull request #10776 from snipe/added_trim_to_email_and_username 
Added trim to email and username
 2022-03-04 11:57:33 -08:00
snipe 9a358087ec Add remote user to bulk edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 06:47:23 -08:00
snipe b6a1d245e8 Added trim to CC email as well 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 06:20:34 -08:00
snipe 67134ca387 Do a trim() before inserting/updating 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 06:18:52 -08:00
snipe 0dfc27f56e Added remote to allowed_columns for sorting 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 05:44:46 -08:00
snipe 43c1949092 Add remote option to user 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 05:35:26 -08:00
snipe 67ed0d91c0 Handle file_get_contents more gracefully 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-04 02:54:37 -08:00
snipe b876d0abb0 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.env.example
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Kernel.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	app/Importer/AssetImporter.php
#	app/Models/Accessory.php
#	app/Models/Consumable.php
#	app/Presenters/AccessoryPresenter.php
#	app/Presenters/ComponentPresenter.php
#	app/Presenters/ConsumablePresenter.php
#	app/Providers/AuthServiceProvider.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/cors.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/build/app.js.LICENSE.txt
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/views/accessories/view.blade.php
#	resources/views/consumables/view.blade.php
#	resources/views/settings/saml.blade.php
#	routes/api.php
 2022-03-03 21:59:38 -08:00
snipe 29a2e80984
Merge pull request #10771 from uberbrady/retry_fix_bad_metadata_display 
Retry fix bad metadata display
 2022-03-03 20:49:30 -08:00
snipe 94dded3785 Added notes field to presenters for table view show/hide columns 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 20:30:07 -08:00
snipe ac8a7d0bc9 Made notes field fillable and searchable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 20:29:48 -08:00
snipe 6fca8350f9 Added notes field to transformers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 20:29:35 -08:00
snipe 9acb5413f6 Added notes field to controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 20:29:25 -08:00
snipe 08a2fe4edb
Merge pull request #10773 from snipe/features/adds_ldap_import_and_assets_count_to_user_api 
Features/adds ldap import and assets count to user api
 2022-03-03 19:15:14 -08:00
snipe 6abe8f296b We don’t need the users table here 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 19:12:03 -08:00
snipe a53a67be4a Added consumables, licenses, accessories count filters too 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 19:08:08 -08:00
snipe b72cac3511 Adds ldap_import and assets_count filter to user API endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 19:03:35 -08:00
snipe c940d36fff Updated maintenance gate in API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 18:49:54 -08:00
snipe cd12028845 Use “update” instead of edit in gate 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-03 18:47:20 -08:00
Brady Wetherington 3225605ef3 Handling the old weirdly-formatted data wasn't quite working. 2022-03-03 18:17:29 -08:00
Brady Wetherington 31dde20a2b Actually, re-introduce this code comment as it's still relevant and tricky 2022-03-03 15:48:04 -08:00
Brady Wetherington aa36ebc947 Merge branch 'fix_bad_metadata_display' into retry_fix_bad_metadata_display 2022-03-03 15:46:19 -08:00
Brady Wetherington 92434fa943 Revert "Revert "refactor and clean up attribute-changing logic for assets"" 
This reverts commit bdc737ce0c.
 2022-03-03 15:45:54 -08:00
Brady Wetherington 0164354463 Fix for the weird error that blew up the demo when my PR got merged 2022-03-02 15:15:16 -08:00
snipe bdc737ce0c Revert "refactor and clean up attribute-changing logic for assets" 
This reverts commit 290baf1c8d.

Signed-off-by: snipe <snipe@snipe.net>
 2022-03-02 14:45:14 -08:00
snipe 733b3a7550
Merge pull request #10682 from uberbrady/fix_bad_metadata_display 
Fixed weird JSON-handling on log_meta updates
 2022-03-02 14:36:38 -08:00
snipe 3339a691e1
Merge pull request #10721 from snipe/features/adds_users_consumables_endpoint 
Added consumables endpoint to user API
 2022-03-02 14:33:45 -08:00
snipe 2eef43e8bf
Applies develop fix to master for location drop downs 2022-03-01 12:43:35 -08:00
Andrew Roth 2e60420aeb Fix for location and model drop down with granular permissions. 2022-02-28 17:38:38 -05:00
Ivan Nieto Vivanco 64fa7e23fc Separate notes on assets and asset models 2022-02-24 16:05:03 -06:00
Ivan Nieto Vivanco 577dc6b02c Separate notes on assets and asset models 2022-02-24 15:50:59 -06:00
snipe 2906a89442 Make the 429 error less stupid 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-24 13:10:34 -08:00
snipe 50f55b4308 Fixes broken API throttling 
Signed-off-by: snipe <snipe@snipe.net>
 2022-02-24 13:10:10 -08:00
snipe a8028e7dd0
Merge pull request #10727 from uberbrady/master 
Fix for negative CORS/SAML interaction
 2022-02-23 11:17:17 -08:00
Brady Wetherington 15abc84ab0 Migrate to Fruitcake/laravel-cors which has path-exclusion built-in 2022-02-23 11:06:19 -08:00