lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
17874 commits 1 branch 0 tags 220 MiB
Commit graph

85 commits

Author SHA1 Message Date
Daniel O'Connor
f03da92152 Mark category name as required in modals 
Fix #16723
 2025-04-17 09:27:04 +00:00
snipe
43c15ef134
Merge branch 'develop' into feature/locations_with_companies 2025-04-08 09:18:48 +01:00
snipe
163ddc8026 Check for value override 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-12 17:28:29 +00:00
Marcus Moore
2a156776a4
Merge branch 'develop' into chore/migrate-select-helper 
# Conflicts:
#	resources/views/settings/branding.blade.php
#	resources/views/settings/general.blade.php
 2025-03-04 11:19:38 -08:00
Marcus Moore
41129829e6
Add frontend required validation 2025-02-20 12:43:51 -08:00
Marcus Moore
25215fd3c9
WIP: begin migrating notes to ui controller 2025-02-18 15:20:06 -08:00
Marcus Moore
716161e626
Migrate Form::open and Form::close in upload file modal 2025-02-12 11:42:09 -08:00
snipe
b4ea75f34f
Merge branch 'master' into chore/migrate-textarea-helper 2025-02-10 23:47:13 +00:00
Marcus Moore
00e7795414
Merge branch 'develop' into chore/migrate-select-helper 
# Conflicts:
#	resources/views/partials/forms/edit/company.blade.php
 2025-02-10 15:44:02 -08:00
snipe
b6f05bff1f
Merge branch 'develop' into feature/locations_with_companies 2025-01-17 17:18:17 +00:00
Marcus Moore
e45f563b50
Convert Form::textareas to blade component 2025-01-14 13:16:31 -08:00
Marcus Moore
1f4cc0a4b4
Convert additional Form::select to blade component 2025-01-13 15:23:43 -08:00
Marcus Moore
589ec3a564
Convert additional Form::select to blade component 2025-01-13 13:08:59 -08:00
akemidx
8adb62fd3a width fix 2024-12-10 19:17:01 -05:00
akemidx
43537d414b removed redundancy. 2024-12-10 16:42:55 -05:00
akemidx
f2fab57187 cancel button pull to left. 
added pull right to save
 2024-12-09 19:28:57 -05:00
Tobias Regnery
1318dc6111 Add a backward compatibility setting for locations with companies 
Now that locations have a company_id they get restricted to the users company with FullMultipleCompanySupport.
This breaks backward compatibility, because before everyone can handle locations without restrictions.
Add a setting right below FullMultipleCompanySupport so that everyone can switch to the desired behaviour.
The default is off and the existing behaviour is preserved.
 2024-11-04 10:03:38 +01:00
Tobias Regnery
1ccbf8942c Add ability to tie locations to companies 
Locations are the last big part of the application that can't be tied to companies.
This can be a problem with FullMultipleCompanySupport, because you can't restrict the visibility of locations to the company of the users.

In order to change this, add a company_id to the locations table and wire everything up in the views and controllers.
Aditionally add a new formatter to filter the locations to a specific company, like it is done for assets.

Locations are properly scoped to the users company if FullMultipleCompanySupport is enabled.
If a parent location of a location has a different company than the user, the location does not show up.
 2024-11-04 10:03:37 +01:00
Marcus Moore
2004e58b53
Merge branch 'develop' into updated_ad_hoc_notes 2024-09-26 12:29:28 -07:00
Godfrey M
ef82f954e5 fixed required css, and user input lengths 2024-09-25 15:47:57 -07:00
Godfrey M
b797c37acb replace duplicate code with partials 2024-09-25 12:48:05 -07:00
Godfrey M
12522a3791 fix spacing issues 2024-09-25 12:07:15 -07:00
Godfrey M
18ddffe8f9 fix partial variable intialization, fix width of input fields 2024-09-25 11:42:16 -07:00
akemidx
74efd850af redoing branch. old branch merge onflicts were waaay too gnarly 2024-09-16 19:30:26 -04:00
Godfrey M
0bc98e971f refactoring modals with partials and fixing misalignments 2024-09-12 12:26:19 -07:00
Godfrey M
367f02af86 more partials and includes 2024-09-09 16:34:04 -07:00
Godfrey M
7a1c721eca making modal partials for reuse 2024-09-09 16:22:56 -07:00
snipe
423f4f9126
Merge pull request #14667 from Godmartinz/add_location_to_create_user_via_asset 
Adds location select to the create new user via asset checkout
 2024-08-22 13:25:41 +01:00
snipe
d687b20467 Use more modern reference for input text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-27 15:05:47 +01:00
Godfrey M
75aa01791a adds location select to the create new user vice asset checkout 2024-04-30 11:54:33 -07:00
snipe
90cf612ac7 Remove city as required field on location modal 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-08 10:50:52 +01:00
snipe
0bf423cda9 Set modal focus to modal-name field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 19:16:40 +01:00
snipe
582cad2dc5 Fixed #13521 - make modal “select files” button wider 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 12:37:42 +01:00
snipe
0eadc00f4d Removed unneeded css class 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 04:37:04 -07:00
snipe
ff9af7ea74 Added genetic modal partial 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:15 -07:00
snipe
b2940f9915 Added confirm modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:29:48 -07:00
snipe
9a3e727390 Updated other form fields to use new label class, fixed HTML for accessibility 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 22:38:56 -07:00
snipe
16dcc2d3ed Fixed #12641 - add JSON to mimes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 06:57:43 -07:00
akemidx
32ed70259e sweedish chef fixes up your typos 2023-02-09 15:39:10 -05:00
akemidx
1a651b33fc manufacturer marker removal 2023-02-08 17:31:39 -05:00
Nuraeil
271c364ef8
Merge pull request #9 from snipe/develop 
Merge snipe/snipe-it:develop into nuraeil/snipe-it:added-localized-strings
 2022-01-04 10:48:51 +01:00
snipe
48d3bfef03
Merge pull request #10421 from Robert-Azelis/patch-5 
Create new user account from asset form - additional fields
 2021-12-20 17:05:38 -08:00
Wächtler, Yannick
279fced877 merge 2021-12-17 00:14:36 +01:00
snipe
c3d55ee27e Merge master down into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Exceptions/Handler.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Models/Setting.php
#	config/version.php
#	resources/lang/af/button.php
#	resources/lang/ar/button.php
#	resources/lang/bg/button.php
#	resources/lang/cs/button.php
#	resources/lang/cy/button.php
#	resources/lang/da/button.php
#	resources/lang/de/button.php
#	resources/lang/el/button.php
#	resources/lang/en-GB/button.php
#	resources/lang/en-ID/button.php
#	resources/lang/es-CO/admin/groups/message.php
#	resources/lang/es-MX/button.php
#	resources/lang/et/admin/custom_fields/general.php
#	resources/lang/et/admin/hardware/table.php
#	resources/lang/et/admin/kits/general.php
#	resources/lang/et/admin/manufacturers/message.php
#	resources/lang/et/admin/models/general.php
#	resources/lang/et/admin/settings/general.php
#	resources/lang/et/button.php
#	resources/lang/et/mail.php
#	resources/lang/fa/button.php
#	resources/lang/fa/help.php
#	resources/lang/fi/button.php
#	resources/lang/fil/button.php
#	resources/lang/fr/button.php
#	resources/lang/ga-IE/button.php
#	resources/lang/he/button.php
#	resources/lang/hr/button.php
#	resources/lang/hu/admin/settings/general.php
#	resources/lang/hu/auth/message.php
#	resources/lang/hu/button.php
#	resources/lang/hu/mail.php
#	resources/lang/id/admin/hardware/table.php
#	resources/lang/id/button.php
#	resources/lang/it/button.php
#	resources/lang/iu/button.php
#	resources/lang/ja/button.php
#	resources/lang/ko/button.php
#	resources/lang/lt/button.php
#	resources/lang/lv/button.php
#	resources/lang/mi/button.php
#	resources/lang/mk/button.php
#	resources/lang/ml-IN/button.php
#	resources/lang/mn/button.php
#	resources/lang/ms/admin/hardware/table.php
#	resources/lang/ms/admin/kits/general.php
#	resources/lang/ms/admin/models/general.php
#	resources/lang/ms/admin/models/message.php
#	resources/lang/ms/admin/settings/general.php
#	resources/lang/ms/button.php
#	resources/lang/nl/button.php
#	resources/lang/no/admin/hardware/table.php
#	resources/lang/no/admin/kits/general.php
#	resources/lang/no/admin/settings/general.php
#	resources/lang/no/auth/message.php
#	resources/lang/no/button.php
#	resources/lang/no/help.php
#	resources/lang/no/mail.php
#	resources/lang/pl/button.php
#	resources/lang/pt-BR/button.php
#	resources/lang/pt-PT/auth/message.php
#	resources/lang/pt-PT/button.php
#	resources/lang/pt-PT/mail.php
#	resources/lang/ro/button.php
#	resources/lang/ru/admin/settings/general.php
#	resources/lang/ru/button.php
#	resources/lang/ru/help.php
#	resources/lang/sl/admin/custom_fields/general.php
#	resources/lang/sl/admin/hardware/table.php
#	resources/lang/sl/admin/kits/general.php
#	resources/lang/sl/admin/manufacturers/message.php
#	resources/lang/sl/admin/models/general.php
#	resources/lang/sl/admin/settings/general.php
#	resources/lang/sl/admin/users/general.php
#	resources/lang/sl/auth/message.php
#	resources/lang/sl/button.php
#	resources/lang/sl/help.php
#	resources/lang/sr-CS/button.php
#	resources/lang/ta/button.php
#	resources/lang/th/button.php
#	resources/lang/th/mail.php
#	resources/lang/tl/button.php
#	resources/lang/tr/admin/settings/general.php
#	resources/lang/tr/auth/message.php
#	resources/lang/tr/button.php
#	resources/lang/uk/button.php
#	resources/lang/ur-PK/button.php
#	resources/lang/vi/button.php
#	resources/lang/zh-CN/button.php
#	resources/lang/zh-HK/button.php
#	resources/lang/zh-TW/admin/hardware/table.php
#	resources/lang/zh-TW/button.php
#	resources/lang/zu/button.php
#	resources/views/models/custom_fields_form.blade.php
#	resources/views/reports/custom.blade.php
#	resources/views/settings/slack.blade.php
 2021-12-16 14:26:24 -08:00
Robert-Azelis
01608d81ab
Update user.blade.php 
Create new user account from asset form - additional fields #10420
 2021-12-13 09:22:25 +01:00
Shao Yu-Lung
55d05eeae3 fix modal-title html tag unpaired. 2021-11-24 10:28:10 +08:00
Wächtler, Yannick
c0891e6827 Added localized strings for modals 2021-11-02 15:27:13 +01:00
snipe
f306401e7e Fixed SVG XSS vuln 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-06 12:26:45 -07:00
snipe
61f16f47a2 Use Helper alias 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-28 19:44:55 -07:00
Ivan Nieto Vivanco
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