7313bca403
Checkin without deleting
...
Signed-off-by: snipe <snipe@snipe.net >
2022-07-20 17:57:19 -07:00
5efe45226d
Fixes Email List of All Assigned being "successful" when the user has no email
...
Added check in view to disable button if there is no email
Added translation for title on disabled button and for email check in controller
Fixed missing trans for user not found message
2022-07-11 20:02:10 -05:00
656efc5f92
Fixed missing trans()
...
Signed-off-by: snipe <snipe@snipe.net >
2022-06-30 14:20:15 -07:00
cd9d2d0cec
adds docblock
2022-06-29 13:01:29 -07:00
e471aa8639
adds button to email user list of assets from profile
2022-06-29 11:15:15 -07:00
c9b81d65f1
Save the user id who is creating the user
...
Signed-off-by: snipe <snipe@snipe.net >
2022-06-23 17:19:08 -07:00
d60af478ad
Added website field that was missing from update and store method.
2022-06-17 08:09:39 -05:00
f609146c29
Corrected field name
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-18 15:37:10 -07:00
891009dc67
Nicer formatting for buttons in bulk user edit
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-18 15:35:57 -07:00
d4f7b5f80c
Fixed #11100 for individual users
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-16 12:07:18 -07:00
b05d85ab0a
Fix bulk-user reset-password links
2022-05-16 10:38: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
e1927aa154
Update Assets locations when user's location changes whey they got bulk-edited
2022-04-06 19:23:49 -05:00
6529a75683
Update Assets locations when user's location changes whey they got bulk-edited
2022-04-06 19:12:02 -05:00
2d7a8b5e15
Merge pull request #10776 from snipe/added_trim_to_email_and_username
...
Added trim to email and username
2022-03-04 11:57:33 -08:00
9a358087ec
Add remote user to bulk edit
...
Signed-off-by: snipe <snipe@snipe.net >
2022-03-04 06:47:23 -08:00
67134ca387
Do a trim() before inserting/updating
...
Signed-off-by: snipe <snipe@snipe.net >
2022-03-04 06:18:52 -08:00
43c1949092
Add remote option to user
...
Signed-off-by: snipe <snipe@snipe.net >
2022-03-04 05:35:26 -08:00
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
eac8e0bdba
Add a casting to a truthy/falsy that needs to be integer
2022-02-02 13:54:57 -06:00
d9624b59b4
Merge pull request #10264 from nuraeil/added-localized-strings
...
Added #10242 : Improved localized strings
2022-01-10 14:48:52 -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
a419a690d4
Add a variable to better control the selected user's ids
2021-12-11 18:01:38 -06:00
4dda28de9e
WIP: cleaning up LDAP
2021-10-28 18:19:50 -07:00
9eaf89aaa7
Add a variable to better control the selected user's ids
2021-10-21 13:28:58 -05:00
aa8f1378c9
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# README.md
# app/Http/Controllers/Accessories/AccessoriesController.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Assets/BulkAssetsController.php
# app/Http/Controllers/Components/ComponentsController.php
# app/Http/Controllers/Consumables/ConsumablesController.php
# app/Http/Controllers/Licenses/LicenseFilesController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/UserFilesController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Http/Transformers/LicensesTransformer.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# config/app.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/en/admin/users/message.php
# resources/lang/is/button.php
# resources/lang/ja/admin/kits/general.php
# resources/lang/ro/admin/users/general.php
# resources/lang/zh-HK/admin/depreciations/general.php
# resources/lang/zh-HK/admin/models/general.php
# resources/views/hardware/qr-view.blade.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/users/view.blade.php
# routes/web.php
# routes/web/hardware.php
# routes/web/models.php
# routes/web/users.php
2021-10-20 17:26:41 -07:00
ccd430ce07
Switched back down to debug level
...
Signed-off-by: snipe <snipe@snipe.net >
2021-10-06 12:38:21 -07:00
f306401e7e
Fixed SVG XSS vuln
...
Signed-off-by: snipe <snipe@snipe.net >
2021-10-06 12:26:45 -07: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
9f944ad497
Added the 'required' attribute to the input file n the upload file form modal. Added a validation for the UserFilesController if the user doesn't select any file to upload [ch16471].
2021-05-27 15:48:13 -05:00
9f2b4c721d
Allow password reset from user profile
...
Signed-off-by: snipe <snipe@snipe.net >
2021-05-26 15:32:23 -07:00
c7626f8387
Add new StorageHelper and use it where it makes sense ( #9276 )
2021-03-15 12:26:39 -07:00
d64b35c348
Added a condition to ensure that only assets checked out to an user that is being deleted are updating their status ( #9233 )
2021-03-01 13:07:23 -08:00
70e6a6ced6
Fix issue where users with edit permission cannot invoke LDAP sync ( #9058 )
...
* Fix issue where users with edit permission cannot invoke LDAP sync
* Make User::class consistent with usage elsewhere in the same directory
2021-01-27 15:36:43 -08:00
6e83679528
Instead of return a JSON response, redirect back to the previous screen ( #9055 )
2021-01-27 12:01:42 -08:00
10648de9af
Bulk Checkin and Delete also edit users [ch15107]
2020-09-04 16:02:25 -07:00
8ec99ff433
Merge pull request #8374 from snipe/fixes/moar_flysystem
...
WIP - More Flysystem fixes
2020-08-31 09:45:27 -07:00
c23e28d0df
Merge pull request #8372 from snipe/fix_adldap_sync
...
Fix adldap sync
2020-08-26 13:34:07 -07:00
d25a05d748
Misc Flysystem/image upload request fixes
2020-08-26 11:53:36 -07:00
f385f3e928
Fixed user image upload
...
TODO: We should probably rename the avatar field on the user’s table, to make it more consistent with the other model images
2020-08-26 02:30:23 -07:00
e5dd6035b9
Fixed the other upload handleUploads signatures
2020-08-24 18:32:40 -07:00
262a964760
[WIP] fix ldap-sync for v5 with AdLdap2
2020-08-14 14:45:05 -07:00
8ccc1c6515
Fixed weird merge in Bulk Users Controller
...
Signed-off-by: snipe <snipe@snipe.net >
2020-05-27 22:46:42 -07:00
b3fe47bfa7
Remove/Reorganize logic to make codacy happier.
2020-05-23 15:24:10 -04:00
136df9418f
Deadcode--
2020-05-23 15:24:10 -04:00
c7b300a50d
Updated LDAP sync controller to use new Adldap2 connections
...
Signed-off-by: snipe <snipe@snipe.net >
2020-04-23 22:45:44 -07:00
039f5da0e1
Add image upload to user edit [ch10508] ( #7877 )
...
* Use correct Request include
* Updated to use additional form request
* Added SVG sanitizer
* Added response method to form request
* Allow ImageUploadRequest to accept fieldname params, added SVG sanitization, fixed delete
* Fixed upload path for avatars
* Added fieldname variable to blade partial for image upload
* Added enctype="multipart/form-data" to form to allow uploads
* Added image field
* Updated Request::old() to use $request->old()
* Fixed derp in edit blade referring to $item when it should be $user
* Added svg+xml to image rule
2020-03-05 18:00:24 -08:00
94ce8cad64
Make sure $user->item exists before trying to count on it
2019-12-11 14:43:46 -08:00
c31e150935
Use $request->input over Request::get()
2019-12-11 11:09:54 -08:00
