0d049a0be7
conflict resolution
2024-04-22 20:09:40 -04:00
01c24ab4cd
translating text
2024-04-22 19:16:14 -04:00
e8d9701a26
array key existing
2024-04-17 19:16:25 -04:00
721902c2d4
committed for later
2024-03-28 16:44:44 -04:00
e6b366020a
lots of attempts and syntax, but no go
2024-03-27 19:05:59 -04:00
5ffade663a
unstash
2024-02-26 18:41:58 -05:00
9397372f87
permissions, but they are now all in their own column because reasons???
2024-02-20 18:48:17 -05:00
8bbf6da052
user block, trying to pick out ONLY permissions we wanna see
2024-02-20 18:25:41 -05:00
f7d0cecdac
permissions query starto
2024-02-12 19:01:06 -05:00
2a54797dce
permission level proof of formatting
2023-11-28 17:58:37 -05:00
9770016eec
beginning of permission groups export
2023-11-28 17:47:36 -05:00
d06cfe6502
Changed verb to “restore” from “restored”
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 20:08:41 +00:00
f7ccef16e7
Refactorer controller restore methods
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 18:02:47 +00:00
2aba8252f3
Ensure users editing themselves do not deactivate their account
2023-04-20 21:59:55 -07:00
03cc55cb6a
Set autoassign_licenses to false if unchecked
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-16 15:25:52 -07:00
70ce0d9ee6
Maintain activated state on editing a user
...
Signed-off-by: snipe <snipe@snipe.net >
2023-04-09 14:06:29 -07: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
4bf1566d2a
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during
...
Adds Boolean to Users Table for Auto Assigning Licenses
2023-02-21 20:10:46 -08:00
b8951e2b54
fixing name from vipuser to vip
2023-02-02 15:58:05 -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
596846a94a
Add VIP Checkbox
2023-01-24 15:29:27 -05:00
02dcb0fbd7
Shorten the additiona form request invocation to just ImageUploadRequest
...
We already have the `use App\Http\Requests\ImageUploadRequest` clause at the top of this file.
Signed-off-by: snipe <snipe@snipe.net >
2023-01-23 21:37:35 -08:00
cd8cb445ba
Corrected fieldname for user fieldname for avatar in Controller
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-21 18:20:53 -08:00
7ce230fadc
missed a few renames
2023-01-18 08:57:59 -08:00
45636b8114
adds should_autoassign boolean to users table
2022-11-15 15:42:57 -08:00
f7a9be92ca
Store data for start and end
...
Signed-off-by: snipe <snipe@snipe.net >
2022-10-05 16:58:26 -07:00
891b5b2882
Added routes, language
...
Signed-off-by: snipe <snipe@snipe.net >
2022-10-04 15:45:25 -07:00
5feea17f8d
Revert "Prevent to delete a user if still has consumables associated to them"
2022-08-14 13:42:14 -07:00
db53a00d3f
Prevent to delete a user if still has consumables associated to them
2022-08-11 17:01:52 -05: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
d4f7b5f80c
Fixed #11100 for individual users
...
Signed-off-by: snipe <snipe@snipe.net >
2022-05-16 12:07:18 -07: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
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
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
9f2b4c721d
Allow password reset from user profile
...
Signed-off-by: snipe <snipe@snipe.net >
2021-05-26 15:32:23 -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
b3fe47bfa7
Remove/Reorganize logic to make codacy happier.
2020-05-23 15:24:10 -04:00
