snipe
|
8f04342fc2
|
Added console command to normalize capitalization on names
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-16 16:23:52 -07:00 |
|
snipe
|
4bf1566d2a
|
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during
Adds Boolean to Users Table for Auto Assigning Licenses
|
2023-02-21 20:10:46 -08:00 |
|
snipe
|
ea644f8d47
|
Still throwing errors, but trying to fix the docblock
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-07 11:02:20 -08:00 |
|
snipe
|
219d92dcfb
|
The sea, Brady.
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-07 11:00:30 -08:00 |
|
snipe
|
1651dbb68d
|
Use null coalescing operator
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-06 12:43:00 -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 |
|
Godfrey M
|
7ce230fadc
|
missed a few renames
|
2023-01-18 08:57:59 -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
|
8a0517fb5d
|
removes data dump
|
2022-11-15 15:59:47 -08:00 |
|
Godfrey M
|
90828e3a87
|
fixes variable name
|
2022-11-15 15:51:52 -08:00 |
|
Godfrey M
|
45636b8114
|
adds should_autoassign boolean to users table
|
2022-11-15 15:42:57 -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 |
|
snipe
|
1c1f3dc42c
|
Added password requests cleanup to scheduler
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-21 19:35:16 -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 |
|
Brady Wetherington
|
c2b5f9b372
|
Cleaned up the output and added some better checks for errors
|
2021-11-10 17:08:04 -08:00 |
|
Brady Wetherington
|
2b6614e2dd
|
Tweak Restore command to _also_ run via webserver via Artisan::call()
|
2021-11-10 12:44:19 -08:00 |
|
Brady Wetherington
|
864cc4f8d5
|
Fix FIXME's by downgrading them to TODO's :)
|
2021-11-10 11:37:10 -08:00 |
|
snipe
|
76685d7fd3
|
Clearer text in restore artisan command
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 00:07:32 -08:00 |
|
Brady Wetherington
|
4dda28de9e
|
WIP: cleaning up LDAP
|
2021-10-28 18:19:50 -07:00 |
|
snipe
|
e27065fe16
|
Merge branch 'develop-v6-integration' into develop-v6-rc1
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/ResetDemoSettings.php
# app/Helpers/Helper.php
# app/Http/Controllers/Api/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/ComponentsController.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/StatuslabelsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/DepreciationsController.php
# app/Http/Controllers/ReportsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Requests/ImageUploadRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Http/Transformers/DepreciationsTransformer.php
# app/Listeners/CheckoutableListener.php
# app/Models/Accessory.php
# app/Models/Asset.php
# app/Models/Company.php
# app/Models/Ldap.php
# app/Models/User.php
# app/Presenters/AssetPresenter.php
# app/Presenters/CategoryPresenter.php
# composer.json
# composer.lock
# config/version.php
# database/factories/AssetModelFactory.php
# database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php
# database/seeds/AssetModelSeeder.php
# package-lock.json
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-black.css
# public/css/dist/skins/skin-black.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-blue.css
# public/css/dist/skins/skin-blue.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-green.css
# public/css/dist/skins/skin-green.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-orange.css
# public/css/dist/skins/skin-orange.min.css
# public/css/dist/skins/skin-purple-dark.css
# public/css/dist/skins/skin-purple-dark.min.css
# public/css/dist/skins/skin-purple.css
# public/css/dist/skins/skin-purple.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-red.css
# public/css/dist/skins/skin-red.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/css/dist/skins/skin-yellow.css
# public/css/dist/skins/skin-yellow.min.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/js/vue.js
# resources/lang/af/validation.php
# resources/lang/ar/admin/settings/general.php
# resources/lang/ar/validation.php
# resources/lang/bg/admin/settings/general.php
# resources/lang/bg/validation.php
# resources/lang/cs/admin/settings/general.php
# resources/lang/cs/validation.php
# resources/lang/cy/help.php
# resources/lang/cy/validation.php
# resources/lang/da/admin/settings/general.php
# resources/lang/da/validation.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/validation.php
# resources/lang/el/validation.php
# resources/lang/en-GB/admin/settings/general.php
# resources/lang/en-GB/validation.php
# resources/lang/en-ID/admin/hardware/table.php
# resources/lang/en-ID/admin/settings/general.php
# resources/lang/en-ID/validation.php
# resources/lang/es-CO/admin/settings/general.php
# resources/lang/es-CO/auth/message.php
# resources/lang/es-CO/button.php
# resources/lang/es-CO/help.php
# resources/lang/es-CO/validation.php
# resources/lang/es-ES/admin/settings/general.php
# resources/lang/es-ES/auth/message.php
# resources/lang/es-ES/button.php
# resources/lang/es-ES/help.php
# resources/lang/es-ES/validation.php
# resources/lang/es-MX/admin/settings/general.php
# resources/lang/es-MX/validation.php
# resources/lang/es-VE/admin/settings/general.php
# resources/lang/es-VE/auth/message.php
# resources/lang/es-VE/button.php
# resources/lang/es-VE/help.php
# resources/lang/es-VE/validation.php
# resources/lang/et/validation.php
# resources/lang/fa/validation.php
# resources/lang/fi/admin/settings/general.php
# resources/lang/fi/validation.php
# resources/lang/fil/validation.php
# resources/lang/fr/admin/settings/general.php
# resources/lang/fr/validation.php
# resources/lang/ga-IE/validation.php
# resources/lang/he/admin/settings/general.php
# resources/lang/he/general.php
# resources/lang/he/validation.php
# resources/lang/hr/validation.php
# resources/lang/hu/validation.php
# resources/lang/id/validation.php
# resources/lang/is/admin/categories/general.php
# resources/lang/is/admin/companies/message.php
# resources/lang/is/admin/companies/table.php
# resources/lang/is/admin/components/general.php
# resources/lang/is/admin/components/table.php
# resources/lang/is/admin/consumables/table.php
# resources/lang/is/admin/depreciations/general.php
# resources/lang/is/admin/depreciations/message.php
# resources/lang/is/admin/hardware/form.php
# resources/lang/is/admin/hardware/general.php
# resources/lang/is/admin/hardware/message.php
# resources/lang/is/admin/hardware/table.php
# resources/lang/is/admin/kits/general.php
# resources/lang/is/admin/licenses/form.php
# resources/lang/is/admin/licenses/general.php
# resources/lang/is/admin/locations/table.php
# resources/lang/is/admin/manufacturers/table.php
# resources/lang/is/admin/reports/message.php
# resources/lang/is/admin/settings/general.php
# resources/lang/is/admin/settings/message.php
# resources/lang/is/admin/statuslabels/message.php
# resources/lang/is/admin/suppliers/message.php
# resources/lang/is/admin/suppliers/table.php
# resources/lang/is/admin/users/table.php
# resources/lang/is/mail.php
# resources/lang/is/validation.php
# resources/lang/it/admin/settings/general.php
# resources/lang/it/validation.php
# resources/lang/iu/validation.php
# resources/lang/ja/mail.php
# resources/lang/ja/validation.php
# resources/lang/ko/validation.php
# resources/lang/lt/validation.php
# resources/lang/lv/validation.php
# resources/lang/mi/validation.php
# resources/lang/mk/validation.php
# resources/lang/ml-IN/validation.php
# resources/lang/mn/validation.php
# resources/lang/ms/validation.php
# resources/lang/nl/admin/settings/general.php
# resources/lang/nl/validation.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/validation.php
# resources/lang/pt-BR/admin/settings/general.php
# resources/lang/pt-BR/mail.php
# resources/lang/pt-BR/validation.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/validation.php
# resources/lang/ru/validation.php
# resources/lang/sl/validation.php
# resources/lang/sr-CS/admin/settings/general.php
# resources/lang/sr-CS/validation.php
# resources/lang/sv-SE/admin/settings/general.php
# resources/lang/sv-SE/auth/message.php
# resources/lang/sv-SE/button.php
# resources/lang/sv-SE/mail.php
# resources/lang/sv-SE/validation.php
# resources/lang/ta/validation.php
# resources/lang/th/validation.php
# resources/lang/tl/validation.php
# resources/lang/tr/mail.php
# resources/lang/tr/validation.php
# resources/lang/uk/admin/accessories/table.php
# resources/lang/uk/admin/asset_maintenances/message.php
# resources/lang/uk/admin/asset_maintenances/table.php
# resources/lang/uk/validation.php
# resources/lang/ur-PK/validation.php
# resources/lang/vi/admin/settings/general.php
# resources/lang/vi/validation.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/validation.php
# resources/lang/zh-HK/validation.php
# resources/lang/zh-TW/validation.php
# resources/lang/zu/validation.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# routes/api.php
|
2021-09-21 23:46:50 -07:00 |
|
snipe
|
9b52c61d95
|
Updated banner with better warning
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 18:49:04 -07:00 |
|
snipe
|
36464bc17d
|
Fix confirmation, because apparently you can't pass that along via cli vs interactively
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 18:22:06 -07:00 |
|
snipe
|
f35208d58d
|
Clean up, find custom fields and drop those columns
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 18:03:13 -07:00 |
|
snipe
|
4d30edd535
|
Let's make sure to keep some of the stuff we need on the demo as well
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 17:29:32 -07:00 |
|
snipe
|
957f33c8cf
|
First stab at a better pave command
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-20 17:19:41 -07:00 |
|
snipe
|
02705d0d1a
|
Fixed S3 upload path
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-14 12:49:17 -07:00 |
|
Brady Wetherington
|
102591b009
|
Better debugging output, and remove non-PHP-7.3-compatible option
|
2021-06-30 14:53:08 -07:00 |
|