c0fe308d7d
Fixed FD-55359 - sanitize CSS
2026-05-28 12:25:12 +01:00
b16970a61e
Merge pull request #18629 from Godmartinz/update-print-invtentory-view-with-assigned2assets
...
Update print inventory view with indirect assignments table
2026-05-11 18:27:25 +01:00
372e74aad3
Adds basename to places where we pass a filename
2026-04-22 13:35:16 +01:00
8747ff32dd
Merge branch 'develop' into update-print-invtentory-view-with-assigned2assets
...
# Conflicts:
# app/Http/Controllers/ProfileController.php
# app/Http/Controllers/Users/UsersController.php
2026-03-17 16:11:16 -07:00
9bc92f57c8
Apply pint to non-API controllers
2026-03-13 16:45:30 +00:00
ab04f3de93
use inventory scope, add quantity to print blade
2026-03-10 12:35:34 -07:00
4c16796256
reduce query count to 52
2026-03-10 10:59:59 -07:00
516771d948
update profile Controller print inventory
2026-03-10 09:50:00 -07:00
621ce1777f
Fixed #18288 : Allow users to change preferences even if profile editing is not permitted
2025-12-04 13:21:04 +00:00
d22d70dd92
Merge pull request #18257 from iryadifarhan/fix/manager-view-not-displaying-subordinates-eulas-properly
...
Fixes Manager View not displaying subordinates EULAs properly in View Assets page
2025-12-03 09:49:35 +00:00
6a99132e76
More tweaks
2025-12-02 13:29:12 +00:00
cbd6b57445
Removed skin from user profile update
2025-11-28 19:04:00 +00:00
d4561581ad
Apply fix around view-assets to pass request parameter and profile controller to address request parameter
2025-11-27 13:42:47 +07:00
47069ad3f4
Added stored eula method on profile
...
Signed-off-by: snipe <snipe@snipe.net >
2025-06-22 19:24:45 +01:00
71d8f1eb89
Merge pull request #16701 from grokability/repo-move
...
Update references to the repo to reflect move to Grokability org
2025-04-15 19:54:08 +01:00
89616727a1
Remove english as default
...
Signed-off-by: snipe <snipe@snipe.net >
2025-04-15 15:45:11 +01:00
afd9282785
Update remaining comments from snipe/snipe-it to grokability/snipe-it
2025-04-03 12:07:05 -07:00
e9ad43afbe
Better hide reset password functionality for LDAP users
...
Signed-off-by: snipe <snipe@snipe.net >
2025-01-17 18:51:08 +00:00
7461c3e0ca
Change controller to assume a collection. (This is dumb, but whatever)
...
Signed-off-by: snipe <snipe@snipe.net >
2024-10-03 16:19:27 +01:00
4356cb7b9b
Added confetti option
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-15 11:32:42 +01:00
7d220dd8c2
set default
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-07 20:58:04 +01:00
a99ec062e6
Added checkbox for preferences
...
Signed-off-by: snipe <snipe@snipe.net >
2024-08-07 20:49:07 +01:00
a1eafc108d
Moar typehinting
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 22:37:58 +01:00
ae9085b11f
Modernize use statements, switch to auth()
...
Signed-off-by: snipe <snipe@snipe.net >
2024-07-04 20:49:22 +01:00
1c14c2fdef
Added gates to controller
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-24 14:05:21 +01:00
8f8a5c639b
Updated profile translation string path
...
Signed-off-by: snipe <snipe@snipe.net >
2024-06-20 14:09:25 +01:00
df1cef59d5
Fixes path for redirect response
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 18:01:40 +01:00
fb233c0aa4
Cleaned up facade names and references
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-29 12:38:15 +01:00
f633dbba64
Merge branch 'develop' into snipeit_v7_laravel10
2024-05-20 12:55:29 +01:00
771c85e347
Translated account save message
...
Signed-off-by: snipe <snipe@snipe.net >
2024-05-20 11:19:31 +01:00
f734e196e5
Merge branch 'develop' into snipeit_v7_laravel10
2024-01-08 18:57:55 +00:00
38bd530fae
Update en defaults for controllers
...
Signed-off-by: snipe <snipe@snipe.net >
2023-12-24 19:44:20 +00:00
3f35124838
Merge pull request #13888 from spencerrlongg/chore/sc-16907
...
Convert Vue Personal Access Tokens to Livewire
2023-12-05 16:45:16 +00:00
ba127be344
Use saveQuietly to prevent double entries
...
Signed-off-by: snipe <snipe@snipe.net >
2023-11-22 23:00:30 +00:00
eaa68327f7
SINGLE QUOTES
2023-11-15 16:27:01 -06:00
fbfc817c5f
just some cleanup
2023-11-13 19:47:03 -06:00
8e4c0f60a1
return format
2023-11-08 17:36:54 -06:00
d68f1e4cfa
initial display work done
2023-11-08 16:48:20 -06:00
f9e190eb32
Updates the Gate “use” statement to be more specific
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-18 11:58:09 -07:00
f77d871dff
Use the imageHandler for profile avatar changes
...
Signed-off-by: snipe <snipe@snipe.net >
2023-01-21 18:05:20 -08:00
c1eee2cc72
Corrected string for invalid current password
...
Signed-off-by: snipe <snipe@snipe.net >
2022-10-26 12:18:29 -07:00
bcebc1e33b
Stylistic refactoring
...
Signed-off-by: snipe <snipe@snipe.net >
2022-10-04 16:37:33 -07:00
891b5b2882
Added routes, language
...
Signed-off-by: snipe <snipe@snipe.net >
2022-10-04 15:45:25 -07:00
6fde72a693
Log user out of other devices when they change their password
...
Signed-off-by: snipe <snipe@snipe.net >
2022-08-25 12:24:26 -07:00
5fded57ec6
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net >
# Conflicts:
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/ProfileController.php
# app/Importer/ItemImporter.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# app/Models/License.php
# app/Providers/AppServiceProvider.php
# app/Services/LdapAd.php
# config/version.php
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
# resources/lang/ar/button.php
# resources/lang/de/admin/companies/general.php
# resources/lang/de/admin/custom_fields/general.php
# resources/lang/de/admin/groups/titles.php
# resources/lang/de/admin/hardware/form.php
# resources/lang/de/admin/hardware/general.php
# resources/lang/de/admin/hardware/message.php
# resources/lang/de/admin/hardware/table.php
# resources/lang/de/admin/kits/general.php
# resources/lang/de/admin/locations/table.php
# resources/lang/de/admin/reports/general.php
# resources/lang/de/admin/settings/general.php
# resources/lang/de/admin/settings/message.php
# resources/lang/de/admin/users/general.php
# resources/lang/de/general.php
# resources/lang/de/mail.php
# resources/lang/en/admin/asset_maintenances/message.php
# resources/lang/en/admin/asset_maintenances/table.php
# resources/lang/en/admin/companies/general.php
# resources/lang/en/admin/companies/message.php
# resources/lang/en/admin/custom_fields/general.php
# resources/lang/en/admin/depreciations/general.php
# resources/lang/en/admin/groups/titles.php
# resources/lang/en/admin/hardware/form.php
# resources/lang/en/admin/hardware/general.php
# resources/lang/en/admin/hardware/table.php
# resources/lang/en/admin/kits/general.php
# resources/lang/en/admin/locations/table.php
# resources/lang/en/admin/reports/general.php
# resources/lang/en/admin/settings/general.php
# resources/lang/en/admin/settings/message.php
# resources/lang/en/admin/users/general.php
# resources/lang/en/button.php
# resources/lang/en/general.php
# resources/lang/en/help.php
# resources/lang/en/mail.php
# resources/lang/en/passwords.php
# resources/lang/hu/admin/hardware/general.php
# resources/lang/hu/admin/hardware/table.php
# resources/lang/hu/admin/locations/table.php
# resources/lang/is/admin/locations/table.php
# resources/lang/ko/admin/custom_fields/general.php
# resources/lang/ko/general.php
# resources/lang/nl/admin/hardware/general.php
# resources/lang/nl/admin/hardware/message.php
# resources/lang/nl/admin/hardware/table.php
# resources/lang/nl/admin/locations/table.php
# resources/lang/nl/admin/statuslabels/message.php
# resources/lang/nl/admin/users/general.php
# resources/lang/no/admin/companies/general.php
# resources/lang/no/admin/custom_fields/general.php
# resources/lang/no/admin/depreciations/general.php
# resources/lang/no/admin/depreciations/table.php
# resources/lang/no/admin/groups/titles.php
# resources/lang/no/admin/hardware/form.php
# resources/lang/no/admin/hardware/general.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/locations/table.php
# resources/lang/no/admin/reports/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/admin/settings/message.php
# resources/lang/no/admin/statuslabels/message.php
# resources/lang/no/admin/users/general.php
# resources/lang/no/button.php
# resources/lang/no/general.php
# resources/lang/no/mail.php
# resources/lang/no/validation.php
# resources/lang/pl/admin/companies/general.php
# resources/lang/pl/admin/custom_fields/general.php
# resources/lang/pl/admin/depreciations/general.php
# resources/lang/pl/admin/depreciations/table.php
# resources/lang/pl/admin/groups/titles.php
# resources/lang/pl/admin/hardware/form.php
# resources/lang/pl/admin/hardware/general.php
# resources/lang/pl/admin/hardware/table.php
# resources/lang/pl/admin/kits/general.php
# resources/lang/pl/admin/locations/table.php
# resources/lang/pl/admin/reports/general.php
# resources/lang/pl/admin/settings/general.php
# resources/lang/pl/admin/settings/message.php
# resources/lang/pl/admin/users/general.php
# resources/lang/pl/button.php
# resources/lang/pl/general.php
# resources/lang/pt-PT/admin/companies/general.php
# resources/lang/pt-PT/admin/custom_fields/general.php
# resources/lang/pt-PT/admin/depreciations/general.php
# resources/lang/pt-PT/admin/depreciations/table.php
# resources/lang/pt-PT/admin/groups/titles.php
# resources/lang/pt-PT/admin/hardware/form.php
# resources/lang/pt-PT/admin/hardware/general.php
# resources/lang/pt-PT/general.php
# resources/lang/pt-PT/help.php
# resources/lang/pt-PT/validation.php
# resources/lang/ro/admin/companies/general.php
# resources/lang/ro/admin/custom_fields/general.php
# resources/lang/ro/admin/groups/titles.php
# resources/lang/ro/admin/hardware/form.php
# resources/lang/ro/admin/hardware/general.php
# resources/lang/ro/admin/hardware/message.php
# resources/lang/ro/admin/hardware/table.php
# resources/lang/ro/admin/locations/table.php
# resources/lang/ro/admin/settings/message.php
# resources/lang/ru/admin/companies/general.php
# resources/lang/ru/admin/custom_fields/general.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/general.php
# resources/lang/ru/validation.php
# resources/lang/sk/admin/settings/general.php
# resources/lang/sk/button.php
# resources/lang/sk/general.php
# resources/lang/tr/admin/hardware/form.php
# resources/lang/tr/admin/hardware/table.php
# resources/lang/tr/admin/kits/general.php
# resources/lang/tr/admin/locations/table.php
# resources/lang/tr/admin/reports/general.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/admin/settings/message.php
# resources/lang/tr/admin/statuslabels/message.php
# resources/lang/tr/admin/users/general.php
# resources/lang/tr/button.php
# resources/lang/tr/general.php
# resources/lang/zh-CN/admin/companies/general.php
# resources/lang/zh-CN/admin/custom_fields/general.php
# resources/lang/zh-CN/admin/depreciations/general.php
# resources/lang/zh-CN/admin/depreciations/table.php
# resources/lang/zh-CN/admin/groups/titles.php
# resources/lang/zh-CN/admin/hardware/form.php
# resources/lang/zh-CN/admin/hardware/general.php
# resources/lang/zh-CN/admin/hardware/message.php
# resources/lang/zh-CN/admin/hardware/table.php
# resources/lang/zh-CN/admin/kits/general.php
# resources/lang/zh-CN/admin/locations/table.php
# resources/lang/zh-CN/admin/reports/general.php
# resources/lang/zh-CN/admin/settings/general.php
# resources/lang/zh-CN/admin/settings/message.php
# resources/lang/zh-CN/admin/statuslabels/message.php
# resources/lang/zh-CN/admin/users/general.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-CN/general.php
# resources/lang/zh-CN/mail.php
# resources/views/depreciations/edit.blade.php
2022-02-01 18:53:05 -08:00
984db1ef44
Apply personal API token fix to master
...
Signed-off-by: snipe <snipe@snipe.net >
2022-01-13 01:39:56 -08:00
512dbfee7a
Added gate to check that the user is allowed to view API keys
...
Signed-off-by: snipe <snipe@snipe.net >
2022-01-13 01:33:27 -08: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
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
b828985151
Fixed strpos to !== FALSE in ProfileController for complexity eval
2020-11-02 22:28:56 -08:00
snipe