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 |
|
|
snipe
|
9db8bd782d
|
Merging master down into develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-16 18:02:07 +00:00 |
|
|
snipe
|
1ac293a12a
|
Add a force override
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-10 13:30:03 -08:00 |
|
|
snipe
|
3e3c277a3f
|
Better phrasing
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-10 13:29:52 -08:00 |
|
|
snipe
|
93d6ce1a6a
|
Added session killer artisan command
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-10 13:20:23 -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
|
eedc14401a
|
Switch to searching on semicolon instead of &
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-09 15:55:22 -08:00 |
|
|
snipe
|
4e14d70427
|
Added jobtitle to unescaper
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-09 15:50:44 -08:00 |
|
|
snipe
|
2a71690aaf
|
Added license_name to unescaper
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-09 15:17:57 -08:00 |
|
|
snipe
|
e4da00ca82
|
Catch potential validation errors on unescape tool
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-09 15:09:49 -08:00 |
|
|
snipe
|
4fd14e5859
|
Added slightly more output because wtf?
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-09 15:05:28 -08:00 |
|
|
snipe
|
441f1fbb64
|
Remove html_entities_decode restriction
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-09 14:56:36 -08:00 |
|
|
Brady Wetherington
|
36ae6f9430
|
Yanked debugging code, tightened up comments.
|
2022-02-03 19:41:16 -08:00 |
|
|
Brady Wetherington
|
1945b97b72
|
Just trying to really tighten up on the LDAP Active Flag and how we parse it.
|
2022-02-03 19:04:56 -08:00 |
|
|
Brady Wetherington
|
392e61688d
|
Rework the LDAP sync command to better handle the active flag
|
2022-02-03 15:01:45 -08:00 |
|
|
snipe
|
ac5c6123bc
|
Fixes #10563 - LDAP active flag - hopefully?
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-02 18:07:34 -08:00 |
|
|
snipe
|
5fded57ec6
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/ProfileController.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# app/Models/License.php
# app/Providers/AppServiceProvider.php
# app/Services/LdapAd.php
# config/version.php
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/lang/ar/button.php
# resources/lang/de/admin/companies/general.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/groups/titles.php
# resources/lang/de/admin/hardware/form.php
# resources/lang/de/admin/hardware/general.php
# resources/lang/de/admin/hardware/message.php
# resources/lang/de/admin/hardware/table.php
# resources/lang/de/admin/kits/general.php
# resources/lang/de/admin/locations/table.php
# resources/lang/de/admin/reports/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/de/admin/users/general.php
# resources/lang/de/general.php
# resources/lang/de/mail.php
# resources/lang/en/admin/asset_maintenances/message.php
# resources/lang/en/admin/asset_maintenances/table.php
# resources/lang/en/admin/companies/general.php
# resources/lang/en/admin/companies/message.php
# resources/lang/en/admin/custom_fields/general.php
# resources/lang/en/admin/depreciations/general.php
# resources/lang/en/admin/groups/titles.php
# resources/lang/en/admin/hardware/form.php
# resources/lang/en/admin/hardware/general.php
# resources/lang/en/admin/hardware/table.php
# resources/lang/en/admin/kits/general.php
# resources/lang/en/admin/locations/table.php
# resources/lang/en/admin/reports/general.php
# resources/lang/en/admin/settings/general.php
# resources/lang/en/admin/settings/message.php
# resources/lang/en/admin/users/general.php
# resources/lang/en/button.php
# resources/lang/en/general.php
# resources/lang/en/help.php
# resources/lang/en/mail.php
# resources/lang/en/passwords.php
# resources/lang/hu/admin/hardware/general.php
# resources/lang/hu/admin/hardware/table.php
# resources/lang/hu/admin/locations/table.php
# resources/lang/is/admin/locations/table.php
# resources/lang/ko/admin/custom_fields/general.php
# resources/lang/ko/general.php
# resources/lang/nl/admin/hardware/general.php
# resources/lang/nl/admin/hardware/message.php
# resources/lang/nl/admin/hardware/table.php
# resources/lang/nl/admin/locations/table.php
# resources/lang/nl/admin/statuslabels/message.php
# resources/lang/nl/admin/users/general.php
# resources/lang/no/admin/companies/general.php
# resources/lang/no/admin/custom_fields/general.php
# resources/lang/no/admin/depreciations/general.php
# resources/lang/no/admin/depreciations/table.php
# resources/lang/no/admin/groups/titles.php
# resources/lang/no/admin/hardware/form.php
# resources/lang/no/admin/hardware/general.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/locations/table.php
# resources/lang/no/admin/reports/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/admin/settings/message.php
# resources/lang/no/admin/statuslabels/message.php
# resources/lang/no/admin/users/general.php
# resources/lang/no/button.php
# resources/lang/no/general.php
# resources/lang/no/mail.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/companies/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/pl/admin/depreciations/general.php
# resources/lang/pl/admin/depreciations/table.php
# resources/lang/pl/admin/groups/titles.php
# resources/lang/pl/admin/hardware/form.php
# resources/lang/pl/admin/hardware/general.php
# resources/lang/pl/admin/hardware/table.php
# resources/lang/pl/admin/kits/general.php
# resources/lang/pl/admin/locations/table.php
# resources/lang/pl/admin/reports/general.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/admin/settings/message.php
# resources/lang/pl/admin/users/general.php
# resources/lang/pl/button.php
# resources/lang/pl/general.php
# resources/lang/pt-PT/admin/companies/general.php
# resources/lang/pt-PT/admin/custom_fields/general.php
# resources/lang/pt-PT/admin/depreciations/general.php
# resources/lang/pt-PT/admin/depreciations/table.php
# resources/lang/pt-PT/admin/groups/titles.php
# resources/lang/pt-PT/admin/hardware/form.php
# resources/lang/pt-PT/admin/hardware/general.php
# resources/lang/pt-PT/general.php
# resources/lang/pt-PT/help.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/admin/companies/general.php
# resources/lang/ro/admin/custom_fields/general.php
# resources/lang/ro/admin/groups/titles.php
# resources/lang/ro/admin/hardware/form.php
# resources/lang/ro/admin/hardware/general.php
# resources/lang/ro/admin/hardware/message.php
# resources/lang/ro/admin/hardware/table.php
# resources/lang/ro/admin/locations/table.php
# resources/lang/ro/admin/settings/message.php
# resources/lang/ru/admin/companies/general.php
# resources/lang/ru/admin/custom_fields/general.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/general.php
# resources/lang/ru/validation.php
# resources/lang/sk/admin/settings/general.php
# resources/lang/sk/button.php
# resources/lang/sk/general.php
# resources/lang/tr/admin/hardware/form.php
# resources/lang/tr/admin/hardware/table.php
# resources/lang/tr/admin/kits/general.php
# resources/lang/tr/admin/locations/table.php
# resources/lang/tr/admin/reports/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/admin/settings/message.php
# resources/lang/tr/admin/statuslabels/message.php
# resources/lang/tr/admin/users/general.php
# resources/lang/tr/button.php
# resources/lang/tr/general.php
# resources/lang/zh-CN/admin/companies/general.php
# resources/lang/zh-CN/admin/custom_fields/general.php
# resources/lang/zh-CN/admin/depreciations/general.php
# resources/lang/zh-CN/admin/depreciations/table.php
# resources/lang/zh-CN/admin/groups/titles.php
# resources/lang/zh-CN/admin/hardware/form.php
# resources/lang/zh-CN/admin/hardware/general.php
# resources/lang/zh-CN/admin/hardware/message.php
# resources/lang/zh-CN/admin/hardware/table.php
# resources/lang/zh-CN/admin/kits/general.php
# resources/lang/zh-CN/admin/locations/table.php
# resources/lang/zh-CN/admin/reports/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/admin/settings/message.php
# resources/lang/zh-CN/admin/statuslabels/message.php
# resources/lang/zh-CN/admin/users/general.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-CN/general.php
# resources/lang/zh-CN/mail.php
# resources/views/depreciations/edit.blade.php
|
2022-02-01 18:53:05 -08:00 |
|
|
Brady Wetherington
|
a063806bcc
|
Permit DONT_REQ_PREAUTH AD users to log in
|
2022-01-12 12:50:39 -08:00 |
|
|
Brady Wetherington
|
c8fe929e09
|
Add new UserAccountControl to permitted UAC's for AD.
|
2022-01-12 12:07:51 -08:00 |
|
|
Brady Wetherington
|
3c7f2e89ec
|
Merge branch 'develop' into remove_old_ldap
Had to re-do the composer install because the conflicts were too complicated.
|
2022-01-03 12:56:58 -08:00 |
|
|
Brady Wetherington
|
e8f5dc85a6
|
Downgraded a FIXME to a TODO
|
2021-11-19 16:38:46 -08:00 |
|