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
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
snipe
9adcf58ae5
Added notes migration
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:30:58 -08:00
snipe
dd5f812d88
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Console/Commands/FixDoubleEscape.php
# app/Console/Commands/LdapSync.php
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/CategoriesController.php
# app/Http/Controllers/Api/CompaniesController.php
# app/Http/Controllers/Api/DepartmentsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/ManufacturersController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/SuppliersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Models/Loggable.php
# app/Providers/AuthServiceProvider.php
# config/version.php
# database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
# database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
# package-lock.json
# package.json
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
# resources/views/hardware/view.blade.php
2022-02-20 13:29:12 -08:00
snipe
41778980bc
Add migration for is_unique
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-16 13:45:59 -08:00
snipe
de6f922e54
Fixed migration
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-10 22:44:46 -08:00
snipe
f5ffda8053
Ahem.
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-10 22:43:51 -08:00
Brady Wetherington
8650faf0d8
D'oh! Migration fails on empty settings table :(
2022-02-03 20:04:33 -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
db82e06665
Fixed migration with invalid LDAP prepopulation value
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-02 18:22:51 -08:00
snipe
23a2700178
Merge pull request #10491 from snipe/fixes/migration_licenses_table_issue
...
Fixed - v6 migration licenses table issue
2022-01-10 15:51:18 -08:00
Brad
81084fa717
Fixed #7824
...
Previously there was a 999 max seats on Licenses as anything above that seemed to cause slowdowns and failure.
This commit allievates those pain points
- removed freeSeats as a hydrated Eloquent model on JSON requests for the licenses index
- removed 'licenseSeats.user', 'licenseSeats.asset' from the 'with' clause as it's not needed in the view (Datatabales takes care of that)
- removed the 999 max seats limit from the License Model,
- reworked how new license seats are created when increasing seats or creating licenses
- Added an index the license_seats table to help speed up lookups
2022-01-10 14:03:28 -05:00
snipe
8719b3d3e9
Only try to create the licenses table if it doesn't exist
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-07 15:43:34 -08:00
snipe
359b22e17a
Applies #10470 to develop
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-27 13:22:47 -08:00
snipe
8588e9ebf1
Fixed #10469 - increased size of supplier address field
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-27 12:28:02 -08:00
Joe Ferguson
8c49f78218
Rename license migration to resolve fatal error running migrations during setup
2021-09-27 12:53:17 -05:00
snipe
2a6b59f0f8
Removed extra paramater from hasTable
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-27 09:48:03 -07:00
snipe
4c3f59c5fd
Remove first migration for licenses
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-26 15:51:17 -07:00
snipe
6f96b25440
Attempt fix at Laravel "magic" class in migrations resulting in table already exists
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-26 15:48:43 -07:00
snipe
d88c0ae5ec
Merge pull request #10103 from snipe/fixes/make_boolean_fields_nullable
...
Fixed issue when creating a status label via API - default_label and show_in_nav being not nullable
2021-09-26 13:41:52 -07:00
snipe
71644696d1
Removed duplicate migration
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-22 17:21:48 -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
d24822e342
Retroactively fix any existing settings for that table
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 15:47:29 -07:00
snipe
c59c7337a5
Forgot the ->change() method
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 15:42:25 -07:00
snipe
b331bb33d9
Code fixes and a new migration
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-20 15:37:24 -07:00
snipe
4abb9baa95
Merge remote-tracking branch 'origin/develop'
2021-08-24 15:29:41 -07:00
Brady Wetherington
ae65e2a0a0
Adding explicit default(null), and removing the nullable() attribute on the down() migration
2021-08-24 14:15:55 -07:00
Brady Wetherington
2d578a9864
Make the LDAP Client-side certificate fields Nullable
2021-08-24 12:52:03 -07:00
snipe
70f6753f50
Merge pull request #9979 from uberbrady/add_client_side_ldap_certs
...
Add client side ldap certs
2021-08-23 16:30:46 -07:00
snipe
b5bb74b8ca
Merge remote-tracking branch 'origin/develop'
2021-08-17 22:01:23 -07:00
snipe
cce808c784
Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]
...
Duplicates d4e46ee41f
2021-08-17 21:59:33 -07:00
Brady Wetherington
4d4badf830
Got the client-side LDAP setup working well enough for sync!
2021-08-17 14:43:36 -07:00
Godfrey M
cef0e424e1
adds a Floor value for depreciation models
2021-08-16 18:14:10 -07:00
snipe
29c584289f
Merge remote-tracking branch 'origin/develop'
2021-08-14 14:09:31 -07:00
Godfrey M
01037cf9cb
initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358]
2021-08-10 18:26:43 -07:00
snipe
3e102bf57b
Be more specific in accessory query
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-19 16:49:13 -07:00
snipe
0153c6ae96
Do not try to add the notes column if it already exists on accessories_users
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-19 16:20:22 -07:00
Laravel Shift
802dc9240d
Shift bindings
...
PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.
2021-06-10 20:16:56 +00:00
Laravel Shift
934afa036f
Adopt Laravel coding style
...
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.
You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.
[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
2021-06-10 20:15:52 +00:00
snipe
54cb6c050a
Merge pull request #9679 from tulsaschoolsdata/serial-number-indexes
...
Fixed #8486 : Add index for asset serial number
2021-06-09 17:36:06 -07:00
Travis Miller
103c4325ce
Fixed #9682 : Add indexes for company_id
2021-06-09 14:29:00 -05:00
Travis Miller
ebe7c2da87
Fixed #8486 : Add index for asset serial number
2021-06-09 14:12:35 -05:00
snipe
e1c6d4ced7
Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Requests/SettingsSamlRequest.php
2021-04-14 15:15:07 -07:00
snipe
39b0f464d2
Adds ID columns to tables that don’t have them - reproduces #9363
...
This reproduces #9363 without the PK in custom fields
Signed-off-by: snipe <snipe@snipe.net>
2021-04-14 15:07:11 -07:00
Godfrey Martinez
246cc0eaa8
Feature/ch16172/adding other fields to ldap sync settings ( #9416 )
...
* new branch, added manager as an additional field. Currently having DB issues
* WIP DB Issue with eloquent
* added department to LDAP sync
* removed unused variables
2021-04-14 10:17:57 -07:00
Brady Wetherington
792a31cc7f
Merge branch 'develop'
2021-04-06 20:10:22 -07:00
Godfrey Martinez
5ea759f615
Fixed #7211 , #9197 , #7864 , [ch15504] - Added additional LDAP fields to sync ( #9318 )
...
* LDAP and Active Directory has plenty of other [ch15504]
* removed department id from ldap sync
* removed department id from ldap sync
* Update 2021_03_18_184102_adds_several_ldap_fields.php
2021-04-05 19:26:04 -07:00
NMC
3e934a1b96
Add a way for a user to override the site skin setting + fix mislabeled comment. ( #6891 )
...
* Add a way for a user to override the skin setting.
* Add site setting to allow user to change the skin.
* Fix skin list.
Co-authored-by: NMC <info@nmc-lab.com>
2021-03-29 19:09:23 -07:00
Kevin Köllmann
44eb67440a
Fixed #9115 : Duplicate column name 'provider' ( #9137 )
2021-02-17 12:57:08 -08:00
snipe
74488ddceb
Added provider column to oauth_clients table for passport upgrade
2021-02-05 14:27:56 -08:00
snipe
01d3606c42
Merge remote-tracking branch 'origin/develop'
2021-01-26 12:20:57 -08:00
Ian Littman
1d7d31b9ae
Optimize target type + ID index for more realistic use cases ( #8923 )
...
Per https://youtu.be/EOXgHH4-WX4?t=1378 or thereabouts
2021-01-26 12:08:25 -08:00
Brady Wetherington
2a817c2123
Add migration for ldap_server URL's to ensure they at least start with ldap:// or ldaps:// ( #8936 )
2021-01-26 12:07:32 -08:00
snipe
13ed6cde67
Migration to confirm password min complies with newer Laravel min
2020-12-21 12:39:19 -08:00
Evgeny
bbf7fbcff4
Localization digit separator feature. ( #8915 )
...
Provides an ability to localize the purchase_cost field in front-end hardware index table.
Has two digit separator formats in admin settings with comma and dot.
2020-12-15 11:49:13 -08:00
snipe
269d3fe509
Make assigned_to_id nullable
2020-12-02 10:48:34 -08:00
Brady Wetherington
fa24799d2b
Change license serial type to TEXT for longer license files ( #8782 )
2020-11-18 14:22:51 -08:00
snipe
6ee3d0eb97
Merge pull request #8605 from snipe/fixes/legacy_location_id_equals_zero
...
Fix for legacy location_id=0 issue that can cause failure to checkout/checkin
2020-10-23 14:22:53 -07:00
snipe
7987a4eca4
Used consistent phrasing in query
2020-10-23 14:22:15 -07:00
snipe
be0e327221
Simplified the migration
2020-10-23 14:14:34 -07:00
snipe
9a1acced58
Fix for legacy location_id=0 issue
2020-10-23 14:00:04 -07:00
snipe
8827d33a43
Fixed query to copy notes
2020-10-23 00:25:20 -07:00
snipe
66ac5d05ad
Started migration to normalize note
2020-10-22 23:18:14 -07:00
snipe
36436f7929
Nope - was right the first time. Sigh.
2020-10-15 19:17:08 -07:00
snipe
569905ad06
Fixed “down” migration
2020-10-15 19:15:33 -07:00
snipe
8f0b3ace92
Manuall created oauth tables
...
We shouldn’t have to do this, but…
2020-10-15 18:20:41 -07:00
snipe
cb5104c27d
Hopefully fixes #8418 - migrations on new install go wonky because of LDAP service provider
2020-09-08 21:13:24 -07:00
Brady Wetherington
14da328dea
Remove extraneous log line
2020-08-26 13:10:47 -07:00
Brady Wetherington
6e9f36be58
Update ad_append_domain setting for backwards-compatibility with v4 and earlier
2020-08-26 13:09:32 -07:00
Michael Pietsch
4f5374b2e8
enable use custom file based saml certificate/private key
2020-08-14 12:25:00 +02:00
Johnson Yi
b2930d6069
Added #542 : add saml authentication
2020-05-06 00:06:19 +10:00
Fabian Grutschus
5becb93e6c
Added: allow appending of domain name to username when user tries to login ( #7790 )
2020-02-04 12:47:49 -08:00
snipe
296de34e8a
WIP: Upgrade develop to Laravel 6.6.1 ( #7637 )
...
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell.
* Upgraded framework to Laravel 6
### TO DO:
- Fix password restriction rules- the old library isn’t compatible with Laravel 6 :(
- Figure out why in-app API calls are returning “Unauthorized”
* More updates from Input:: to Request:: helper
* Switch to Request:: from Input
* Added passport config
* Fixed goofy password minimum in seeder
* Added laravel/helpers
* Changed ($item) to ($item->id) in forms
I have no idea why this is necessary
* Changed ($item) to ($item->id) in forms
* Updated API middleware to auth:api
* Updated with added laravel auth.php values
* FIxed *&!^$%^&$^%!!!! ajax issue
* Switch to Request::get from Input::get
* Switched to Request facade
* Added password security minimums back in
The package we were using has not been updated to Laravel v6, so I created custom validators instead
* Added language strings for error messages for password rules
* Fixed `($item)` issue in formActions for partials
2019-12-10 19:32:50 -08:00
Valentyn Tulub
6ad1f51673
Added #6489 : show asset assignments under user assignments ( #7293 )
...
* Add a setting to show assets assigned to other assets #6489
* Update user's views to show assets assigned to other assets #6489
* Add ukrainian and russian translation for the feature #6489 in settings
2019-12-06 10:57:48 -08:00
Martin Berg
3dcef9aac9
Add support for custom remote user header ( #7370 )
2019-09-03 11:07:26 -07:00
