42ba31591d
New formatter for icon
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-01 18:46:20 +01:00
951aee8292
Fixes #15239 and #17259 - better handle external avatars
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-25 13:03:51 +01:00
f865a6cb37
Added 'printIgnore' => true, to presenters to hide checkbox and action column from print view
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-17 12:35:05 +01:00
443f69bd82
Merge branch 'develop' into feature/department-manager-in-table
2025-06-14 23:48:52 +01:00
bb70250007
Added select/unselect tooltip to presenters, added translation
...
Signed-off-by: snipe <snipe@snipe.net >
2025-02-22 14:30:49 +00:00
1582d81e5b
Change user_id to created_by
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-17 22:16:41 +01:00
4debaaea39
Fixed #15504 - allow nulling/not changing locale in user bulk edit
...
Signed-off-by: snipe <snipe@snipe.net >
2024-09-16 14:31:10 +01:00
e048f0955f
More icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-19 13:27:21 +01:00
8fc5c0b5be
Use other default avatar, not in the avatars directory
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-20 07:34:40 +01:00
a2ff8f9609
Add Department Manager to single and multiple user views
2024-07-15 12:27:29 +02:00
3f20e29901
Moved gthe settings for remote loading to the branding section
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 16:55:47 +01:00
36ae162626
Changed my mind :)
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 16:48:05 +01:00
00f7cb9dbb
Reverse the order for default gravatar
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 16:46:12 +01:00
446bc81d3a
Updated presenter to use new avatar
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 13:23:31 +01:00
3a8f825de5
Link user table counts to section in user show
2024-07-01 14:06:05 -07:00
a7aa178f24
Used localized strings
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 17:56:07 +01:00
482965197d
Added users, locations to presenter, transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-07 12:07:41 +01:00
278a25c63b
Added toggle all to column selector
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 12:14:41 +00:00
417caae589
Added translation
...
Signed-off-by: snipe <snipe@snipe.net >
2024-03-20 12:07:18 +00:00
e8ad8a7448
Added email, phone icons
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-22 14:48:01 +00:00
bfd674b622
Switched to getFullNameAttribute() from fullName() in User Presenter
...
Signed-off-by: snipe <snipe@snipe.net >
2023-08-21 20:12:25 +01:00
7062583710
Check for http or https in avatar value
...
Signed-off-by: snipe <snipe@snipe.net >
2023-05-10 02:18:38 -07:00
73cf62e060
Added autoassign_licenses to presenter
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:24:00 -07:00
161999fbca
Fixed #12772 - use the APP_URL config more consistently
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-05 16:05:40 -07:00
0c3115553e
Merge branch 'develop' into vip_tag
2023-02-21 20:03:49 -08:00
590cb6a15b
Removed unneeded concat
...
Signed-off-by: snipe <snipe@snipe.net >
2023-02-06 12:40:09 -08:00
b363524305
vipuser label updated to vip
2023-01-25 15:58:44 -05:00
596846a94a
Add VIP Checkbox
2023-01-24 15:29:27 -05:00
c3e4d9d773
Make column name consistent with field name (BREAKING)
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-17 18:27:47 -08:00
bdfac1a345
Added start/end to the users API
...
Signed-off-by: snipe <snipe@snipe.net >
2022-10-05 16:58:37 -07:00
86d2c2b153
Small naming changes
...
Signed-off-by: snipe <snipe@snipe.net >
2022-06-23 19:11:59 -07:00
9c9f5be6fe
Do not show the creating admin by default in list view
...
Signed-off-by: snipe <snipe@snipe.net >
2022-06-23 17:28:34 -07:00
2e5e8f363b
Added admin to oresenter
...
Signed-off-by: snipe <snipe@snipe.net >
2022-06-23 17:18:04 -07:00
43c1949092
Add remote option to user
...
Signed-off-by: snipe <snipe@snipe.net >
2022-03-04 05:35:26 -08:00
04d649122b
Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO
2022-01-06 12:35:37 +01:00
7e41c74cc3
Updated more fa icons
...
Signed-off-by: snipe <snipe@snipe.net >
2021-09-26 01:11:08 -07:00
e03d7b7016
More fa icon updates
...
Signed-off-by: snipe <snipe@snipe.net >
2021-09-24 13:07:02 -07:00
68c751fe63
Break out name into first name and last name [ch1382]
...
Signed-off-by: snipe <snipe@snipe.net >
2021-06-28 15:55:33 -07: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
b27aeb1952
Added LDAP flag in users API for #8741
2020-12-02 11:01:05 -08:00
f475bdbb2d
Fixed #8797 - use html_entity_decode in fullName presenter for User
2020-11-25 08:54:23 -08:00
1ff7e6b834
Use Storage facade for user presenter
2020-08-26 12:17:18 -07:00
7f8c6fe282
Take gravatar email into account in presenter
2020-05-13 20:30:47 +02:00
6847a331a7
Backport the column icon fix from master
...
Signed-off-by: snipe <snipe@snipe.net >
2020-04-24 05:55:38 -07:00
87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge
...
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
2020-04-20 23:20:34 -07:00
bdddab5b8b
Added role=“option” to option items, additional icon font fixes
2020-04-02 18:17:21 -07:00
bca82684a1
Merge branch 'hotfixes/2fa_qr' into develop
...
# Conflicts:
# .all-contributorsrc
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/ImportsController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Requests/ItemImportRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# composer.json
# composer.lock
# config/app.php
# config/version.php
# docker/startup.sh
# public/css/build/all.css
# public/css/dist/all.css
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
2019-03-20 02:17:02 -07:00
0e1289f12f
Fixes #6821 - fixed 2 fa active for users list ( #6822 )
...
* Fixed #6821 - confusing UI for 2FA when 2FA is universally enforced
I also updated the language in the user’s listing table to clarify what “activated” means
* Added login enabled info to user view
* Clarified comments
* Added info about 2FA on user profile
Because why not
* Added nowrap to table, and added 2FA reset for superadmins
2019-03-18 11:59:02 -07:00
e3e0d57f56
Minor code cleanup bits and bobs ( #6805 )
...
* Add IDE Helper files
* Cleanup imports
- Alphabetises imports
- Removes unused imports
* Add Platform requirements
* Move filling asset into block where asset exists
* Remove duplicate array keys
2019-03-13 20:12:03 -07:00
465b69516d
Fixed : #6259 - Remove remote JS/CSS file loading ( #6330 )
...
* Fixed missing oauth tables during setup.
* Remove remote JS/CSS file loading
Updated gravatar to return to default image
* Updated default avatar path to user url
Removed local html5shim & response js files.
Removed copying html5shim & respond js file to public directory
2018-10-17 12:52:01 -07:00
snipe