 snipe
|
43c15ef134
|
Merge branch 'develop' into feature/locations_with_companies
|
2025-04-08 09:18:48 +01:00 |
|
|
snipe
|
2275186222
|
Merge pull request #16652 from akemidx/feature/sc-28820
Username dropdown to show Usernames and not Emails as Examples
|
2025-04-08 06:32:19 +01:00 |
|
|
akemidx
|
443a5c2348
|
chaning username dropdown to be usernames and not emails
|
2025-04-07 19:25:32 -04:00 |
|
|
Godfrey M
|
bc3b3cf86e
|
add psuedo example location_id for preview
|
2025-04-07 12:53:17 -07:00 |
|
|
Godfrey M
|
a69133e2ae
|
adds location qr code option to labels
|
2025-04-07 12:36:05 -07:00 |
|
|
snipe
|
cb59c23f0b
|
Added pdf logo to the blade
Signed-off-by: snipe <snipe@snipe.net>
|
2025-04-02 12:13:34 +01:00 |
|
|
Marcus Moore
|
d88fe1f48a
|
Merge branch 'develop' into chore/migrate-select-helper
|
2025-03-06 13:39:05 -08:00 |
|
|
Marcus Moore
|
de7d32f632
|
Replace Form::label on ldap settings page
|
2025-03-04 16:44:26 -08:00 |
|
|
Marcus Moore
|
c798df2920
|
Replace Form::label on label settings page
|
2025-03-04 16:34:22 -08:00 |
|
|
snipe
|
a31a732d38
|
Nicer UI for invert flag
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 20:38:15 +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 |
|
|
snipe
|
ccea55308b
|
Fixed regression from #16150
Signed-off-by: snipe <snipe@snipe.net>
|
2025-03-04 15:53:30 +00:00 |
|
|
snipe
|
d556d1c6e7
|
Merge pull request #16150 from Godmartinz/add-translations-to-settings
Adds Translation strings to General and Branding Settings
|
2025-03-04 12:48:21 +00:00 |
|
|
Godfrey M
|
cc0b9f404a
|
merged develop, fix conflicts
|
2025-02-27 15:38:31 -08:00 |
|
|
James M
|
112112d258
|
Feat: #14926 LDAP Active Flag - Add config option to make False = Enable
|
2025-02-27 10:52:12 -07:00 |
|
|
snipe
|
8ac7cda4ee
|
Merge pull request #16366 from marcusmoore/chore/migrate-checkbox-helpers-pt7
Replace calls to Form::checkbox pt7
|
2025-02-27 15:01:31 +00:00 |
|
|
Marcus Moore
|
a0dc056da8
|
Replace Form::checkbox on label settings page
|
2025-02-26 16:33:07 -08:00 |
|
|
Marcus Moore
|
27aeb518ff
|
Replace Form::checkbox on general settings page
|
2025-02-26 16:18:00 -08:00 |
|
|
Marcus Moore
|
245a16c377
|
Replace Form::checkbox on branding settings page
|
2025-02-26 15:37:07 -08:00 |
|
|
Marcus Moore
|
de3c1d159f
|
Replace Form::checkbox on branding settings page
|
2025-02-26 15:35:17 -08:00 |
|
|
snipe
|
ea0f105180
|
Merge pull request #16347 from marcusmoore/chore/migrate-checkbox-helpers-pt4
Replace calls to Form::checkbox pt4
|
2025-02-26 07:05:38 +00:00 |
|
|
snipe
|
5b6da0c1e8
|
Merge pull request #16348 from marcusmoore/chore/migrate-checkbox-helpers-pt5
Replace calls to Form::checkbox pt5
|
2025-02-26 07:05:22 +00:00 |
|
|
Marcus Moore
|
e01226a174
|
Replace Form::checkbox on saml settings page
|
2025-02-25 17:31:05 -08:00 |
|
|
Marcus Moore
|
f9ccf32af4
|
Replace Form::checkbox on ldap settings page
|
2025-02-25 17:22:44 -08:00 |
|
|
Marcus Moore
|
2c5170a218
|
Replace Form::checkbox on security settings page
|
2025-02-25 17:09:25 -08:00 |
|
|
Marcus Moore
|
d88c79366c
|
Replace Form::checkbox on google settings page
|
2025-02-25 14:27:07 -08:00 |
|
|
Marcus Moore
|
de330a47cd
|
Replace Form::checkbox on asset tag settings page
|
2025-02-25 14:25:02 -08:00 |
|
|
Marcus Moore
|
ecd7dc2094
|
Replace Form::checkbox on alert settings page
|
2025-02-25 14:23:26 -08:00 |
|
|
snipe
|
071b4d1e67
|
Merge pull request #16245 from marcusmoore/chore/migrate-form-open-pt5
Replace Form::open and Form::close pt5
|
2025-02-18 21:23:15 +00:00 |
|
|
snipe
|
1fe170e6a1
|
Merge pull request #16040 from Godmartinz/template_validate_error
Adds a null check to label templates, adds return types for validation methods
|
2025-02-18 21:00:10 +00:00 |
|
|
snipe
|
612a708c8d
|
Merge pull request #16246 from marcusmoore/chore/migrate-form-open-pt6
Replace Form::open and Form::close pt6
|
2025-02-18 20:43:38 +00:00 |
|
|
snipe
|
580a4c476e
|
Merge pull request #16244 from marcusmoore/chore/migrate-form-open-pt4
Replace Form::open and Form::close pt4
|
2025-02-18 20:42:44 +00:00 |
|
|
snipe
|
c0f0f43dd7
|
Merge pull request #16188 from Godmartinz/translations-for-labels-n-ldap
Adds translations to LDAP and Label settings pages
|
2025-02-18 19:56:14 +00:00 |
|
|
snipe
|
ac907add83
|
Merge pull request #16082 from marcusmoore/chore/sc-28173
Replace calls to Form::text
|
2025-02-18 14:58:40 +00:00 |
|
|
Marcus Moore
|
cc4d8f2a5b
|
Migrate Form::close on security settings page
|
2025-02-12 13:47:15 -08:00 |
|
|
Marcus Moore
|
c0a3284fad
|
Migrate Form::open and Form::close on saml settings
|
2025-02-12 13:46:42 -08:00 |
|
|
Marcus Moore
|
caff608e3c
|
Migrate Form::open and Form::close on purge deleted records page
|
2025-02-12 13:41:44 -08:00 |
|
|
Marcus Moore
|
c48fa7c2cb
|
Migrate Form::open and Form::close on localization page
|
2025-02-12 13:39:04 -08:00 |
|
|
Marcus Moore
|
14b25949b8
|
Migrate Form::close on ldap settings page
|
2025-02-12 13:36:48 -08:00 |
|
|
Marcus Moore
|
2df995c2c7
|
Remove unneeded Form::open on label settings page
|
2025-02-12 13:29:02 -08:00 |
|
|
Marcus Moore
|
ad182a96fa
|
Migrate Form::open and Form::close on label settings
|
2025-02-12 13:28:40 -08:00 |
|
|
Marcus Moore
|
a728f38bd1
|
Migrate Form::open and Form::close on google settings page
|
2025-02-12 13:21:07 -08:00 |
|
|
Marcus Moore
|
894754e8dc
|
Migrate Form::close on general settings page
|
2025-02-12 13:18:55 -08:00 |
|
|
Marcus Moore
|
d141675478
|
Migrate Form::open and Form::close on branding settings pagee
|
2025-02-12 13:17:59 -08:00 |
|
|
Marcus Moore
|
8bdd80e236
|
Migrate Form::open and Form::close on backups page
|
2025-02-12 13:12:45 -08:00 |
|
|
Marcus Moore
|
c422737525
|
Migrate Form::open and Form::close on asset tag settings page
|
2025-02-12 13:11:06 -08:00 |
|
|
Marcus Moore
|
fc55786ca2
|
Migrate Form::close on notification settings page
|
2025-02-12 12:50:37 -08:00 |
|
|
Marcus Moore
|
0797c4ac97
|
Merge branch 'develop' into chore/sc-28173
# Conflicts:
# resources/views/settings/saml.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
|
2025-02-10 15:57:41 -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 |
|