99cecee4b5
Merge branch 'develop' into features/adds_license_checkin_checkout_to_all_in_gui
2023-04-17 14:54:30 -07:00
e0c53d8d09
Remove start/end dates form casts array
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-17 09:33:31 -07:00
6acce098c9
Added autoassign_licenses on user model
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:24:56 -07:00
e126a75f7a
pretty sure this was it
2023-03-29 21:37:26 -05:00
fe6295a5e4
Update slack_* properties to webhook_*
2023-03-22 14:43:00 -07:00
ad598425ef
Adds format to the dates cast
2023-02-28 17:24:14 -06:00
8e72da42e8
Merge pull request #12406 from akemidx/vip_tag
...
Added a checkbox to notate VIP status
2023-02-23 12:23:29 -08:00
81cb29db5e
Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report
...
Added images to emailed user inventory report [sc-19801]
2023-02-22 10:38:07 -08:00
0c3115553e
Merge branch 'develop' into vip_tag
2023-02-21 20:03:49 -08:00
d494afcf01
Add order by clause, to ensure assets and accessories are in order in the report
2023-02-21 21:24:19 -06:00
de4f7bd274
Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation
...
Enforce Y-m-d as date format for date fields
2023-02-15 12:54:22 -08:00
d52d32fed9
Fixed visibility for constants and methods
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:44:02 -08:00
2da4578aa5
Merge branch 'develop' into slack_message
2023-02-01 13:43:09 -08:00
90c1bfe03d
fixing pr
2023-02-01 16:12:39 -05:00
4e5b8fa213
fixing pr
2023-02-01 16:05:50 -05:00
df31a76906
fixed apostraphe
2023-01-26 15:02:39 -05:00
53d8008a5f
Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag
2023-01-25 17:14:29 -05:00
b363524305
vipuser label updated to vip
2023-01-25 15:58:44 -05:00
4c3354b778
Merge branch 'develop' into vip_tag
2023-01-24 20:29:43 -08:00
3c4f254583
Enforce Y-m-d as date format for date fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-24 13:38:53 -08:00
596846a94a
Add VIP Checkbox
2023-01-24 15:29:27 -05:00
48c85966d7
Added gravatar and avatar as fillable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-21 18:07:17 -08:00
f08babfa8a
Just moved some stuff around - no actual meaningful code changes
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-17 17:22:03 -08:00
f3e57d7dc0
fixing PR
2022-12-13 16:00:59 -05:00
07ae91b00f
Created method in users.php for adding up all assigned to user and providing an integer value. this then used to grey out buttons on user view if user has nothing assigned.
2022-12-12 15:47:53 -05:00
4e5c878b73
Needed to fix the way we write externalId from SCIM
2022-10-31 19:15:08 -07:00
cf62761d18
Added date casting and fillable to models
...
Signed-off-by: snipe <snipe@snipe.net >
2022-10-05 16:57:59 -07:00
acd666fdf5
Added notes to user consumables tab
...
Signed-off-by: snipe <snipe@snipe.net >
2022-08-10 15:34:07 -07:00
86d2c2b153
Small naming changes
...
Signed-off-by: snipe <snipe@snipe.net >
2022-06-23 19:11:59 -07:00
0bc3ca5c42
Fixed comments
...
Signed-off-by: snipe <snipe@snipe.net >
2022-06-23 18:44:27 -07:00
3e559044b2
Changed method and scope names
...
Signed-off-by: snipe <snipe@snipe.net >
2022-06-23 18:41:13 -07:00
23c50ea9a5
Added admihn scopes
...
Signed-off-by: snipe <snipe@snipe.net >
2022-06-23 17:18:11 -07:00
deb2d958d8
Sets maxlength of user fields to 191
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-13 04:54:12 -07:00
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
2d213a9c77
Make the report take the dates of pivot table instead of asset log
2022-04-05 12:57:49 -05:00
08588a2e6a
Merge pull request #10901 from veenone/fix/invalid_consumable_date_in_user_view
...
Fixes #10898 (invalid consumable date time info in user view)
2022-04-05 18:30:23 +01:00
231a34ace3
FIX : #10898 (invalid consumable date time info in user view)
2022-04-05 15:31:27 +07:00
a937bd34f6
Merge master back down into develop
...
Signed-off-by: snipe <snipe@snipe.net >
2022-03-29 16:28:43 +01:00
20e65804ef
Removed comment
...
Signed-off-by: snipe <snipe@snipe.net >
2022-03-22 18:12:08 +00:00
43c1949092
Add remote option to user
...
Signed-off-by: snipe <snipe@snipe.net >
2022-03-04 05:35:26 -08:00
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
b5525e6a21
Deleted additional bindings present also in the User model
2021-09-07 00:57:12 -05:00
b62d1f49e4
Shift cleanup
2021-06-10 20:19:27 +00:00
104b441e0d
Shift to class based factories
2021-06-10 20:17:44 +00:00
9f43ce97e9
Convert deprecated $dates property to $casts
2021-06-10 20:17:18 +00:00
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
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
f01c93e162
Extend #6229 to include superuser permission check ( #6772 )
2021-04-05 20:26:06 -07:00
2c0b9f959b
Comment with possible alternatve to the custom undeleted validator
2020-11-24 12:01:09 -08:00
bbd7a752a0
Minor cleanup
2020-11-02 23:58:49 -08:00
