DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
16749 commits 59 branches 275 tags 321 MiB
Commit graph

439 commits

Author SHA1 Message Date
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 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
snipe 27752f595c
Merge pull request #16194 from marcusmoore/chore/migrate-label-helpers-pt4 
Replace calls to Form::label pt4
 2025-02-06 10:16:33 +00:00
snipe c17598d4b4
Merge pull request #16195 from marcusmoore/chore/migrate-label-helpers-pt5 
Replace calls to Form::label pt5
 2025-02-06 10:16:17 +00:00
Marcus Moore 32e1d4b2ef
Migrate form labels on security settings page 2025-02-05 14:39:16 -08:00
Marcus Moore f8d5af836f
Migrate form labels on saml settings page 2025-02-05 14:35:53 -08:00
Marcus Moore 19ceb3f5b7
Migrate form label on purge page 2025-02-05 14:29:49 -08:00
Marcus Moore f346c55cf1
Migrate form labels on localization settings page 2025-02-05 14:29:49 -08:00
Marcus Moore e797705dad
Migrate form labels on google settings page 2025-02-05 14:29:49 -08:00
Marcus Moore a331e14ef2
Migrate form labels on general settings page 2025-02-05 14:19:34 -08:00
Marcus Moore d6b4c27302
Migrate form label on branding settings page 2025-02-05 14:14:50 -08:00
Marcus Moore f8d7291923
Migrate form labels on asset tag settings page 2025-02-05 14:11:36 -08:00
Marcus Moore b59674ab77
Migrate form labels on settings alert page 2025-02-05 13:48:50 -08:00
Godfrey M c3310a0772 adds translations to LDAP settings page 2025-02-05 10:38:16 -08:00
Marcus Moore 00cdb13803
Convert remaining Form:hidden in labels view 2025-01-27 11:23:01 -08:00
Marcus Moore ef6d747b37
Convert some Form:hidden in labels view 2025-01-27 11:15:09 -08:00
Marcus Moore e26abb8684
Replace Form::hidden with @csrf 2025-01-27 11:07:19 -08:00
Marcus Moore 82801242d3
Merge branch 'develop' into chore/sc-28173 
# Conflicts:
#	resources/views/settings/alerts.blade.php
 2025-01-22 14:54:53 -08:00
Marcus Moore c3d17c5727
Remove value for readonly 2025-01-22 09:27:40 -08:00
Marcus Moore b003890dd2
Migrate password helpers 2025-01-21 16:14:20 -08:00
Marcus Moore 68988524d6
Replace Form::text in certain views 2025-01-15 16:31:16 -08:00
Marcus Moore c278900581
Replace Form::text in certain views 2025-01-15 15:58:33 -08:00
snipe 1d0c156d2e Increased due for checkin warning 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-15 22:12:18 +00:00
snipe 7de5e2e7ef One more audot field increase 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-15 22:11:22 +00:00
snipe 8d935b34eb Fixed audit interval input width 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-15 22:07:53 +00:00
Marcus Moore 8e790fdc47
Replace Form::text in certain views 2025-01-15 13:37:00 -08:00
Marcus Moore 0ef20c524f
Replace Form::text in certain views 2025-01-15 13:01:32 -08:00
Marcus Moore bec9511df1
Add more spacing for input values to be displayed 2025-01-15 12:10:05 -08:00
Marcus Moore 017948c3bb
Replace Form::text in certain views 2025-01-15 12:07:33 -08:00
Marcus Moore e45f563b50
Convert Form::textareas to blade component 2025-01-14 13:16:31 -08:00
snipe 98b1ba1e39 Moved keywords in lang file 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-13 17:04:48 +00:00
Nebel 9f0581275b
Merge branch 'develop' into feature/custom-data-options-for-2d-barcode 2025-01-13 15:49:32 +01:00
Godfrey M 94f44d1b77 fix label type values in db and defaults. update help text 2025-01-07 10:00:52 -08:00
Godfrey M 833af55806 Merge branch 'develop' into barcode_settings_hide 2024-12-12 12:05:29 -08:00
snipe 82108f8a18
Merge pull request #15208 from akemidx/feature/sc-26415 
FEATURE: Option for Notes to be Required on Asset Checkin/Checkout
 2024-11-26 20:11:04 +00:00
NebelKreis 52e4414bc5 Feature: Added asset ID option to 2D barcode in label generation 2024-11-05 13:41:34 +01:00
NebelKreis f96b7c5056 Feature: Added data type context for select options with "URL:" and "Data:" labels, including translations 2024-11-05 13:40:33 +01:00
Godfrey M de77eda33d another line indent 2024-10-31 14:38:32 -07:00
Godfrey M ee58fcc898 moved lines in for labels 2024-10-31 14:37:08 -07:00
NebelKreis e22296fd79 Feature: Added serial number option to 2D barcode in label generation 2024-10-29 13:49:05 +01:00
NebelKreis 6c17d7d732 Fix: Corrected path in translation function 
Updated the translation function to use the correct path, ensuring that instead of displaying the translation path as plain text, the appropriate translation is now shown as intended.
 2024-10-29 11:45:29 +01:00
NebelKreis 6f3fb47e4a Feature: Added asset tag option to barcode in label generation 2024-10-28 15:39:04 +01:00
snipe 4d848e45e6 Fixed #15736 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-28 11:55:24 +00:00
akemidx 5cb940c2ee Merge branch 'refs/heads/upstream/dev' into feature/sc-26415 2024-10-16 18:32:36 -04:00
snipe b5b93fdd3a Make ldap username required 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-10 00:27:00 +01:00
snipe d9432baf7a Mlore ldap style improvements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 23:51:20 +01:00
snipe 90be2a4498 Use newer naming convention for errors 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 22:26:30 +01:00
snipe aa8048ac15 Blade changes for ldap 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 22:15:25 +01:00