Marcus Moore
3fdf4dea1b
Use factories for relationships in asset factory
2023-02-07 16:17:05 -08:00
snipe
2a8851bbd7
Merge pull request #12342 from marcusmoore/fix/dusk-test-suite
...
Fixed Dusk Test Suite
2023-02-02 09:50:34 -08:00
Marcus Moore
cd582be851
Drop tables that may exist in down methods
2023-01-23 15:42:45 -08:00
Marcus Moore
760844de6f
Add conditionals
2023-01-23 15:42:33 -08:00
Marcus Moore
e6dc61d2cf
Revert column names to legacy versions in down method
2023-01-23 15:42:05 -08:00
snipe
45019c65f1
BYOD migration
...
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:10:39 -08:00
Marcus Moore
b5ea8b8a4f
Conditionally drop table
2023-01-10 17:29:38 -08:00
Marcus Moore
aec64fa64a
Comment out migration's down method to match its up method
2023-01-10 17:25:25 -08:00
Marcus Moore
03938d0f32
Conditionally drop table
2023-01-10 17:24:38 -08:00
Marcus Moore
296c9a723d
Reverse column rename in migration's down method
2023-01-10 17:22:29 -08:00
Marcus Moore
c5b09ed955
Fix column name typo
2023-01-10 17:21:46 -08:00
Marcus Moore
4ee3cbf60e
Comment out migration's down method to match its up method
2023-01-10 17:20:20 -08:00
Marcus Moore
39ab545cf5
Update alter statement to use correct suffix for column
...
This is brittle...
2023-01-10 17:08:28 -08:00
Marcus Moore
e5cb68cc5e
Move drop column command to correct migration
2023-01-10 17:06:16 -08:00
Marcus Moore
b8b2543b0d
Reference the correct table in migration down method
2023-01-10 17:04:21 -08:00
snipe
685cc86d71
Sets the ldap_default_group field to nullable and default null
...
Signed-off-by: snipe <snipe@snipe.net>
2022-12-20 17:24:01 -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
2e228ccb0b
redid a few things. should be good now :)
2022-12-15 10:45:42 -08:00
snipe
f91e1d58ad
Migration to add the field to the custom_fields table
...
Signed-off-by: snipe <snipe@snipe.net>
2022-11-08 15:27:34 +00:00
Brady Wetherington
cd385e0865
Set scim_externalid to nullable, default null
2022-10-25 14:38:19 -07:00
Brady Wetherington
1e3281c76c
Add externalId support to SCIM integration
2022-10-25 14:19:01 -07:00
Godfrey M
f9ac447dd1
adds default group to LDAP
2022-10-18 15:18:09 -07:00
snipe
7353ecd388
Added start_date and end_date migration to users table
...
Signed-off-by: snipe <snipe@snipe.net>
2022-10-05 16:55:59 -07:00
snipe
70c766e8b3
Added setting to choose dashboard type
...
Signed-off-by: snipe <snipe@snipe.net>
2022-09-29 04:16:46 -07:00
Godfrey M
193b31e427
select options working, testing sync then done
2022-08-31 12:58:33 -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
snipe
f9956cc5df
Added DB migration
...
Signed-off-by: snipe <snipe@snipe.net>
2022-08-10 14:54:33 -07:00
snipe
e833052e8e
Check for column
...
Signed-off-by: snipe <snipe@snipe.net>
2022-07-08 16:46:00 -07:00
Brady Wetherington
61813a6f2c
This adds some indexes for performance on license_seats
2022-07-06 18:10:48 -07:00
Brady Wetherington
f515bd2dc8
Add index across username and deleted_at to improve large directory sync performance
2022-06-28 17:12:14 -07:00
snipe
ef86c0273a
Added migration to store admin ID
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 17:17:38 -07:00
snipe
bcd0671213
Migration to drop stored_eula_column
...
It’s extraneous, since we already have a file field in the action_logs, and we already store the stored_eula_file in checkout_acceptances.
Signed-off-by: snipe <snipe@snipe.net>
2022-05-19 17:55:59 -07:00
Brady Wetherington
5357b1fa10
Remove extraneous { in migration
...
It looks like we inadvertently got an extra `{` in here - I noticed it because my IDE threw a big red dot on this migration. We must've accidentally put that in when we were adding the 'id' column.
2022-05-09 11:56:05 -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
1441cf9f4f
Ports #10494 to master
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-12 21:04:57 +01:00
Brady Wetherington
6b0a1ab3fb
Backport the license index fix from Develop onto the v5 branch
2022-04-12 20:11:25 +01:00
snipe
4b255ada70
Removed first()
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-06 12:08:51 +01:00
snipe
3dd7c00a0b
Update migration back in time
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-05 20:31:17 +01:00
snipe
c12ef19fcc
Fixed #10892 - MySQL 8 compatibilty requires primary key
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-05 18:58:14 +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
snipe
b5f3a357e2
Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync
...
This looks good, thanks!
2022-03-29 12:06:01 +01:00
Godfrey Martinez
fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf
2022-03-22 10:10:56 -07:00
Godfrey M
4956eb0410
WIP: needs to be tested. adds ldap_manager field to ldap sync
2022-03-21 11:15:39 -07:00
snipe
9db8bd782d
Merging master down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 18:02:07 +00:00
Godfrey M
b2f7262cd2
adds table structure for asset history
2022-03-14 19:38:36 -07:00
Godfrey M
e1a6a2afc6
adds translation for accept_eula, a bit more logic on the Acceptance Controller that is not working yet
2022-03-10 12:15:50 -08:00
snipe
86a2312a31
Check if table exists before trying to create
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-07 20:13:10 -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
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
