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

326 commits

Author SHA1 Message Date
snipe 3d219f578e The sea, Brady. 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe 6dc89fc2b0 Use null coalescing operator 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
snipe 0cfeab8c50 Added an exit for the LDAP disabled sync short-circuit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-01 16:46:58 -08:00
snipe 67e6089805 Short circuit the LDAP sync is LDAP is disabled 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-01 16:36:30 -08:00
Brady Wetherington a4173e3881 Permit not-delegated+dont-expire-password+normal-accounts to login 2023-01-31 16:49:41 -08:00
Brady Wetherington ab12ad1140 Resolves Rollbar error 16746 - missing array key 'extension' 2023-01-24 18:19:26 -08:00
Brady Wetherington 2170343958 Fixed #12004: Snipe-IT restore didn't work on Windows 2023-01-10 13:06:47 -08:00
Brady Wetherington cbffd105a2 Fix LDAP default group feature 2023-01-09 15:23:19 -08:00
snipe 6e42bce409 Removed $start variable from calback 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:04:06 -08:00
snipe 1a3c947b14 Chunk sync script 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 17:57:52 -08:00
snipe 227fef76ee
Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group 
Adds a permission group selection for directory sync
 2022-12-15 11:06:53 -08:00
Godfrey M 9fefdea9de fixes checkout to all description 2022-11-15 12:50:46 -08:00
snipe 3b16157d6b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-21 17:43:53 -07:00
Brady Wetherington bc78d341a0 Caches manager lookups in LDAP for performance boost 2022-10-20 16:52:40 -07:00
Brady Wetherington 12d86bd6e2 Erroneous line-break removal - re-add 2022-10-19 19:01:52 -07:00
Brady Wetherington c4f11de90d Remove incorrect comment. 2022-10-19 18:49:19 -07:00
Brady Wetherington 8fb61cf5f8 Try to better handle LDAP Manager settings that don't line up with what we expect 2022-10-19 18:36:16 -07:00
Godfrey M f9ac447dd1 adds default group to LDAP 2022-10-18 15:18:09 -07:00
Godfrey M 9b448227f7 tinkering to no avail 2022-09-13 11:40:10 -07:00
Godfrey M 28bc97f29f one line away from this being over with 2022-09-12 11:40:16 -07:00
Godfrey M 70ac8af9c4 . 2022-08-31 09:53:20 -07:00
Godfrey M 0c362e8b57 gets the groups selector to appear but options are blank 2022-08-29 12:09:56 -07:00
Godfrey M fc6fefdb4e adds migration, variables, checkbox,working on groups 2022-08-25 15:19:38 -07:00
Warren White 4b9a91f55b Fixed #10565, #11086: correctly looks up Manager DN from AD Manager attribute and sets manager id 2022-08-19 09:09:03 -07:00
Brady Wetherington b6adfa294c Fixed the active flag to be as it was in later v5 releases 
Originally implemented here:

https://github.com/snipe/snipe-it/pull/10610/files
 2022-08-10 12:55:30 -07:00
snipe 90fe7af863 Small refactor 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 23:18:16 -07:00
snipe 67ad24af08 Return token ID in cli 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 23:13:25 -07:00
snipe a711e608c9 Changed siganture to be clearer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 22:26:37 -07:00
snipe 2f7c04362e Make -kkey-only a flag 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 22:20:55 -07:00
snipe 9b6fd7e19a Set $accessTokenName 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 22:11:46 -07:00
snipe e7de7d1716 Show user info as well 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 22:06:46 -07:00
snipe 112f147596 Console script to generate API tokens 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 22:04:39 -07:00
snipe d8d12d4590
Merge pull request #11408 from uberbrady/add_filter_option_to_ldap_sync 
Add a new `--filter` option to Artisan ldap-sync command
 2022-06-28 09:50:48 -07:00
Brady Wetherington be3388d647 Add a new --filter option to Artisan ldap-sync command 2022-06-27 19:49:59 -07:00
snipe 131edb611e Refine output and checks 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-27 13:54:21 -07:00
Brady Wetherington 1e685ca835 Fixed SC-19104 - fixes to ldap:troubleshoot artisan command 2022-06-14 12:18:42 -07:00
snipe 4669bb54fe Small fixes for asset tag regeneration script 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 17:14:22 -07:00
snipe 71828d5461 One more trim…. sigh.. 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 03:53:42 -07:00
snipe d9817ec696 Added a trim 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 03:51:53 -07:00
snipe 33ded3f18a More debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 03:48:09 -07:00
snipe 004d567253 Added some debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 03:31:00 -07:00
Brady Wetherington d391980b06 Do some better erroring if you can't launch the mysql binary 2022-05-17 17:01:23 -07:00
snipe 1c32dcae9f Add login note to demo resetter 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-15 10:20:03 -07:00
Brady Wetherington f608e4586c Only set manager ID when the lookup succeeds. 2022-05-15 09:25:28 -07:00
snipe 5c78a15835 Removed dupe lines from merge conflict 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-03 12:56:29 -07:00
snipe 9aac1cbba4 Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Console/Commands/MoveUploadsToNewDisk.php
#	app/Http/Controllers/ActionlogController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/StatuslabelsController.php
#	app/Http/Controllers/Assets/AssetCheckinController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/BulkUsersController.php
#	app/Http/Requests/AssetCheckoutRequest.php
#	app/Importer/LicenseImporter.php
#	app/Models/Actionlog.php
#	app/Models/License.php
#	app/Models/User.php
#	app/Observers/AssetObserver.php
#	composer.lock
#	config/version.php
#	database/factories/LicenseFactory.php
#	database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
#	database/migrations/2018_10_18_191228_add_kits_licenses_table.php
#	database/migrations/2018_10_19_153910_add_kits_table.php
#	database/migrations/2018_10_19_154013_add_kits_models_table.php
#	database/migrations/2019_02_07_185953_add_kits_consumables_table.php
#	database/migrations/2019_02_07_190030_add_kits_accessories_table.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/ar/general.php
#	resources/lang/ar/passwords.php
#	resources/lang/cs/general.php
#	resources/lang/cs/passwords.php
#	resources/lang/de/admin/custom_fields/general.php
#	resources/lang/de/admin/settings/general.php
#	resources/lang/de/admin/settings/message.php
#	resources/lang/fr/admin/custom_fields/general.php
#	resources/lang/fr/admin/hardware/general.php
#	resources/lang/fr/admin/locations/table.php
#	resources/lang/fr/admin/settings/message.php
#	resources/lang/hu/admin/custom_fields/general.php
#	resources/lang/hu/admin/settings/general.php
#	resources/lang/hu/general.php
#	resources/lang/it/admin/settings/general.php
#	resources/lang/nl/admin/custom_fields/general.php
#	resources/lang/nl/admin/settings/general.php
#	resources/lang/nl/general.php
#	resources/lang/pl/admin/custom_fields/general.php
#	resources/lang/sv-SE/passwords.php
#	resources/lang/tr/general.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/reports/activity.blade.php
#	resources/views/users/print.blade.php
 2022-04-28 17:49:06 +01:00
snipe a937bd34f6 Merge master back down into develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 16:28:43 +01:00
Yevhenii Huzii 863ea62551
Fix problem with static paths 2022-03-27 23:12:38 +03:00
Godfrey M c1f8252388 adds manager field to LDAP sync 2022-03-24 11:24:39 -07:00
snipe 0f95802699 Fixed mis-automerge 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-16 18:05:47 +00:00