snipe
07dbc6842c
Are you KIDDING ME, Github??
...
This reverts commit c8e79aa5ca , reversing
changes made to e60f2b2332 .
Signed-off-by: snipe <snipe@snipe.net >
2025-08-25 15:56:28 +01:00
snipe
6503f9c667
Revert "Merge pull request #17650 from grokability/add-displayName-to-users"
...
This reverts commit 4770e469b4 , reversing
changes made to 29a18c7c8b .
Signed-off-by: snipe <snipe@snipe.net >
2025-08-21 20:23:47 +01:00
snipe
4770e469b4
Merge pull request #17650 from grokability/add-displayName-to-users
...
Add display name to users for LDAP/SCIM, added new sync fields
2025-08-21 18:22:34 +01:00
snipe
050a3afc74
Fixed #17649 - nicer layout on new location modal
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-19 13:56:21 +01:00
snipe
270401c693
Added display name to user create modal
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-19 13:12:57 +01:00
snipe
d31e7ed534
Use new route
...
Signed-off-by: snipe <snipe@snipe.net >
2025-08-07 18:24:02 +01:00
snipe
3e9098907a
Use config file for file types/mimes
...
Signed-off-by: snipe <snipe@snipe.net >
2025-07-03 20:11:31 +01:00
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