DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15063 commits 97 branches 266 tags 291 MiB
Commit graph

4626 commits

Author SHA1 Message Date
snipe 78d24eb451
Merge pull request #15069 from TelecomsSansFrontieres/fix_print-all-assets 
Fixed inconsistent attributes order in Print All Assigned report
 2024-07-11 17:30:41 +01:00
snipe 1527679f4b Handle deletions on the observer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 17:26:43 +01:00
snipe 23f1489b2b Added history tab 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:46:49 +01:00
snipe 58bc84436c Fixed incorrect jquery validation class 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:23:05 +01:00
snipe 2415408a50 Prevent ludicrious amount of min_qty 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:41 +01:00
snipe 67d6f7119d Prevent a ludicrous amount of consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:04 +01:00
snipe d9a114090b Added buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:18:33 +01:00
snipe e123eeea9e Added error message if category type is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:00:20 +01:00
snipe da2b64c96d Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:24:08 +01:00
Florent Bervas d9a53460ff Fix design inconsistency between assets and assigned assets in Print All Assigned report 2024-07-11 09:41:58 +00:00
snipe 8be44f9cf2 Check for time until depreciated 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 10:07:58 +01:00
snipe 71a5d07698 Fixes #15056 - only try to load avatars if one exists or default is set 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-10 08:56:14 +01:00
Godfrey M 624632d0ca removed push and endpush 2024-07-09 11:41:31 -07:00
snipe f4ffbcf76e Fixed wonky layout on accessory files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:38:50 +01:00
snipe 5597992d63 Fixed API key missing translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:17:46 +01:00
snipe 09cc9b92d1 Fixed #15050 - erroneous deleted remark 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 22:13:07 +01:00
snipe 9c304f238a
Merge pull request #15029 from snipe/fixes/small_docblock_fixes 
General cleanup - Docblock fixes, adding type hinting, added tests, added asset model form validator
 2024-07-08 17:43:50 +01:00
snipe 4c19b4d831 Added aria-hidden="true" to error icon for accessibility 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 17:39:38 +01:00
snipe f3bf74a540 Updated language files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 15:51:19 +01:00
snipe 86c0a3ecad Added localization for bootstrap-tables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 15:12:37 +01:00
snipe d834ef5104 Updated string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 21:52:37 +01:00
snipe ae9085b11f Modernize use statements, switch to auth() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 20:49:22 +01:00
snipe 3f20e29901 Moved gthe settings for remote loading to the branding section 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 16:55:47 +01:00
snipe 44bcc157e5 Updated icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:23:46 +01:00
snipe 278bf3da13 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:23:38 +01:00
snipe e372527d13 Added default_avatar to settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:22:36 +01:00
snipe 96be1e1275 Removed duplicate locale directive 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 02:14:10 +01:00
snipe 708d7b5fc5 Use icons for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:43:44 +01:00
snipe 62b5a159a9 Added files column 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:31:09 +01:00
snipe a6d04509a5
Merge pull request #15016 from snipe/improved_user_merge 
Fixed #15005 - Improvements  on user merge
 2024-07-03 23:19:50 +01:00
snipe 0071596274 Added upload count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:18:43 +01:00
spencerrlongg a6690493b0 resolved 2024-07-03 16:12:55 -05:00
snipe 00fc392a12 Added missing traslations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 12:41:04 +01:00
snipe f22e99aec8
Merge pull request #14983 from snipe/fixes/use_more_modern_request_syntax_in_blades 
Use more modern reference for input text
 2024-07-02 08:43:34 +01:00
Marcus Moore 3a8f825de5
Link user table counts to section in user show 2024-07-01 14:06:05 -07:00
Marcus Moore d481850d4c
Add @can around Edit Your Profile button on view assets page 2024-07-01 10:11:27 -07: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
snipe 7dbcedad40
Merge pull request #14981 from uberbrady/fix_backup_translations 
Fixed #14976, #14975, #14973 - Translation strings aren't always working
 2024-06-27 14:36:52 +01:00
snipe 54fb91c03b
Merge pull request #14831 from marcusmoore/chore/sc-23725/livewire3 
Updated Livewire to v3
 2024-06-27 13:21:52 +01:00
Brady Wetherington 6df9742664 Built a workaround for backup notification translations 2024-06-27 13:17:16 +01:00
snipe f23a221750
Merge pull request #14942 from snipe/updates/start_moving_from_collective_forms 
WIP - First start at switching to regular html labels
 2024-06-27 13:12:29 +01:00
snipe 43773954cd
Merge pull request #14966 from Godmartinz/css_issue 
Fixed importer table background color
 2024-06-26 13:33:14 +01:00
snipe 251f2d82b3 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-26 12:53:03 +01:00
snipe adee99db34 Fixes #14968 - translate forbidden page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-26 11:21:56 +01:00
Godfrey M eda2eb2283 fixes all dark modes 2024-06-25 10:24:35 -07:00
Godfrey M a7123a04ba fixes importer background color 2024-06-25 10:19:18 -07:00
Marcus Moore d4861a74df
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-25 10:15:50 -07:00
snipe bca6dd41d2 Added avif to translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-25 13:39:36 +01:00
snipe 4d55765e28 Added checkbox to settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:02:53 +01:00
snipe aa5fe52e89 Added gate in blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:56 +01:00
snipe ce107dd688 New strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:39 +01:00
snipe ba4c51dd68 Removed duplicate key 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:01:25 +01:00
snipe 294fb1f774
Merge pull request #14925 from snipe/fixes/added_2fa_string 
Additional translation strings
 2024-06-24 12:11:45 +01:00
snipe 5fb3cea0bb Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 11:41:20 +01:00
snipe f47bc5ea7d Updated hardware checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-23 19:40:52 +01:00
snipe 427615f627 Fiest start at switching to regular html labels 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-23 18:24:23 +01:00
snipe 9a0db72eb4 More strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:40:38 +01:00
snipe e11a42cf68 Re-use login string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:32:00 +01:00
snipe 114769c2d9 Made requestable items more generic in translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:26:45 +01:00
snipe 9594596b8a Fixed another hard-coded string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:22:27 +01:00
snipe 69cf697aa3 Added 2fa translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:20:52 +01:00
snipe 30c1e1e86a Merge remote-tracking branch 'origin/develop' 2024-06-20 14:32:46 +01:00
snipe 1113218c6c Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 14:23:15 +01:00
snipe 9e9c37c1e8 Fixed weird linebreaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 14:09:11 +01:00
snipe 6cbdbcb1f1
Merge pull request #14791 from Godmartinz/label-option-limit 
Added some  style changes in label field selector for the `DefaultLabel` template
 2024-06-20 13:51:49 +01:00
snipe c8835bf5db Merge remote-tracking branch 'origin/develop' 2024-06-20 13:40:37 +01:00
snipe bd1f43f9ee Added lastname.firstname as email format 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 13:36:48 +01:00
snipe 66ffe21ce2 Merge remote-tracking branch 'origin/develop' 2024-06-20 13:09:54 +01:00
snipe dd6d040da5 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 12:56:43 +01:00
Marcus Moore f0a11be0b8
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-18 15:10:46 -07:00
snipe d0299de898 Merge remote-tracking branch 'origin/develop' 2024-06-18 11:25:55 +01:00
snipe 941582ac2a Properly scope archived based on settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 10:27:11 +01:00
Marcus Moore a3dea99bbb
Fix category edit form component 2024-06-17 14:24:16 -07:00
Marcus Moore fc351a1896
Remove .live from oauth clients 2024-06-17 13:03:27 -07:00
Marcus Moore d9164281ab
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	resources/views/livewire/oauth-clients.blade.php
 2024-06-17 12:57:04 -07:00
snipe 430808e180 Merge remote-tracking branch 'origin/develop' 2024-06-17 15:52:13 +01:00
snipe 27063d5bae Fix weird layout in admin oauth [sc-25673] 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 15:44:07 +01:00
snipe 5be86b9dbb Merge remote-tracking branch 'origin/develop' 2024-06-17 13:43:45 +01:00
snipe 891a0a0965 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-06-17 13:05:31 +01:00
snipe 50f0797850 Added aria hidden to icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 13:05:27 +01:00
snipe d9cc3c3ec7 Removed extra divs 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 12:52:23 +01:00
snipe d87da78eb5 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Users/UsersController.php
#	config/version.php
#	public/css/build/AdminLTE.css
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all-defer.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-06-17 11:18:33 +01:00
snipe f3e82c2c80 Updated languages 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 10:59:17 +01:00
Marcus Moore c3e6e1144f
Merge branch 'develop' into chore/sc-23725/livewire3 2024-06-12 15:12:40 -07:00
snipe cacb5d62dc
Merge pull request #14800 from snipe/fixes/importer_tweaks 
Importer tweaks
 2024-06-12 12:51:11 +01:00
snipe 7e3d66ec53
Merge branch 'develop' into fixes/companyable_trait_on_users 2024-06-12 11:27:26 +01:00
snipe 1ca9bb5aa8
Merge pull request #14698 from Scarzy/features/asset_file_upload_from_api 
Added #9413: Asset file upload from API
 2024-06-12 11:18:06 +01:00
snipe f8ab9f62f6
Merge pull request #14842 from Godmartinz/adjust-preview-window 
Fixed label preview window position
 2024-06-07 18:09:56 +01:00
Godfrey M 77e6058e4c remembers chosen label 2024-06-06 13:55:15 -07:00
Godfrey M 4a60026162 moves preview down by field definitions 2024-06-06 13:42:06 -07:00
Godfrey M 3621292a0e removes unnecessary height 2024-06-06 13:28:05 -07:00
Godfrey M 6df1c36011 oops 2024-06-06 13:24:02 -07:00
Godfrey M 44dae22a3c adjust label preview window 2024-06-06 13:18:19 -07:00
snipe 871255f28c Fixed #14812 - added consumables to individual inventory report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 20:40:45 +01:00
Marcus Moore 60c7efae3c
Remove commented code 2024-06-05 11:48:10 -07:00
Marcus Moore 48fc6ca60e
Remove commented code 2024-06-05 11:46:57 -07:00
snipe e054fc1ef1 Removed noisy import debugging, made nicer output 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe f4d530b4b1 Removed filename column since it’s never worked 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe 9d56617caf Moved expected checkin date on view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe 832ceeba56 Fixed missing endpush 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 09:57:10 +01:00
snipe fa083098fc
Merge pull request #14819 from snipe/localization/new_strings_2024_06_03 
Updated strings
 2024-06-05 09:46:41 +01:00
Marcus Moore b2a0e7958b
Inject alpine on label engine page 2024-06-04 17:03:36 -07:00
Marcus Moore ef91c8123e
Remove unneeded re-render of select2 2024-06-04 15:49:57 -07:00
Marcus Moore 296cf3e34b
Update OauthClients component 2024-06-04 15:37:41 -07:00
Godfrey M 6202f6157a fix select2 behavior 2024-06-04 08:41:00 -07:00
snipe 85cb7c92e7 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-03 20:44:40 +01:00
snipe 877adb082c Fixed translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-03 16:40:52 +01:00
snipe cff382605c Fixed some missing strings and checks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 04:01:04 +01:00
snipe 694e3b7f3a Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 00:42:16 +01:00
snipe a15ed6eaee Wrap disabled <a> links in a span for tooltips 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 19:29:29 +01:00
snipe 3005565bba Slight tweak to language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 19:29:12 +01:00
snipe 1d97d95c10 UI and styling tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:48:34 +01:00
snipe 4a1b1675cb Use storage helper 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:48:09 +01:00
snipe 8c5249ba4b Disable buttons on view page if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:47:53 +01:00
snipe b936591240 Warn and disable on checkout if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:47:34 +01:00
snipe 76e664d647 Warn and disable the checkout button if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:47:18 +01:00
snipe 0253c2a756 Lauout tweaks, warn and disable button if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:46:57 +01:00
snipe d27613f55c Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:46:41 +01:00
Marcus Moore 1736bf5510
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	app/Livewire/LoginForm.php
#	package.json
#	resources/views/livewire/login-form.blade.php
 2024-05-30 16:56:50 -07:00
Marcus Moore 1a1b891309
Remove unused Login Livewire component 2024-05-30 16:49:05 -07:00
Marcus Moore 2eaac3d381
Fix select2 re-renders 2024-05-30 16:20:04 -07:00
Marcus Moore f03249898a
Update id syntax in custom fields component 2024-05-30 16:12:52 -07:00
Godfrey M 0ee441a976 adds hidden as well 2024-05-30 11:19:06 -07:00
Godfrey M cf8de3baa9 fix checkin option from appearing 2024-05-30 11:11:35 -07:00
snipe aadee068b3
Merge pull request #14740 from Godmartinz/redirect_back_to_asset 
Added Redirect options to asset check in/out
 2024-05-30 14:14:04 +01:00
snipe a46e2ebfd8 Small tweaks to user export, user view translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 13:59:00 +01:00
snipe f710b1aac3
Merge pull request #14614 from akemidx/feature/sc-19796 
ADDED: Export User Permissions (Superuser & Admin)
 2024-05-30 13:41:26 +01:00
snipe f6fe6e70b9
Merge branch 'develop' into redirect_back_to_asset 2024-05-30 13:38:11 +01:00
Marcus Moore e80b80f5d1
Remove manual livewire tags 2024-05-29 16:04:05 -07:00
Marcus Moore 9e35441281
Importer fixes 2024-05-29 15:50:42 -07:00
Godfrey M e28ad50bec fixes the color change 2024-05-29 15:34:08 -07:00
Marcus Moore 7d95e7765d
Add a few .prevents 2024-05-29 14:13:29 -07:00
Scarzy 8a2ea971e1 Add an API assets files controller 
Based heavily on the Assets assets files controller.
Added errors related to to the files management.
Added the API endpoints for file upload and show, but only upload is
currently tested/works.
 2024-05-29 22:01:48 +01:00
Marcus Moore 8d924b60d7
Replace references to @this in importer 2024-05-29 13:51:57 -07:00
Marcus Moore 34595c266d
Update script tag 2024-05-29 13:16:30 -07:00
Marcus Moore 638ae9bdd5
Use new id method 2024-05-29 13:15:59 -07:00
Godfrey M 713ce7836f add some css in label field selector 2024-05-29 13:07:33 -07:00
Marcus Moore 093c6652a8
Update select2 snippet for Livewire 3 2024-05-29 12:58:24 -07:00
Marcus Moore 43616d1874
Remove alpine reference from webpack 2024-05-29 12:30:20 -07:00
Marcus Moore 73e3ac7dd8
Migrate to $dispatch 2024-05-29 12:18:31 -07:00
Marcus Moore 45419586fe
Migrate away from wire:model.prevent 2024-05-29 12:11:33 -07:00
Marcus Moore d8a480b2a8
Migrate to wire:model.blur 2024-05-29 12:11:02 -07:00
Marcus Moore 29d87246a2
Migrate away from wire:model.defer 2024-05-29 12:10:46 -07:00
Marcus Moore 58e638d3cb
Migrate to wire:model.live 2024-05-29 12:08:25 -07:00
snipe 12e107a71b
Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout 
Bulk Consumable Checkout
 2024-05-29 19:42:25 +01:00
snipe 7bbee053c6 Updated fa icon call 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 19:19:45 +01:00
snipe 369c819a27
Merge pull request #14754 from Godmartinz/footer_user_bug 
Removed extra div from User Details.
 2024-05-29 11:29:02 +01:00
snipe a5d0a21757 Fixed string path 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 00:26:33 +01:00
snipe df882bbcbc Pass item’s currency if set by location 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 10:24:10 +01:00
snipe b3fe10baa8
Merge branch 'snipeit_v7_laravel10' into chore/sc-25656/minus_icon_for_fieldsets 2024-05-25 11:19:43 +01:00
snipe dc5e15f919 Added translation for external link 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 11:02:07 +01:00
snipe ad7b291062 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:55:48 +01:00
snipe b54c1caa74 Improved translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:43:28 +01:00
snipe c3cf123189 Better translation for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:39:47 +01:00
snipe 3a2900621c Changed icon, added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-25 10:20:52 +01:00
Godfrey M 442903ea5e trying to get link to work, fixed up markup and url 2024-05-23 16:08:18 -07:00
Godfrey M d3ab152d30 adds reminder notification constructor and updates markdown 2024-05-23 12:47:02 -07:00
Brady Wetherington 4adbd7af4c Merge branch 'develop' into snipeit_v7_laravel10 2024-05-22 21:02:11 +01:00
Godfrey M c4d96f6ea3 removed extra div 2024-05-22 12:35:32 -07:00
snipe c9f7847fb3
Merge pull request #14745 from snipe/fixes/self_api_endpoint 
Refactor group syncing on user edit API endpoint
 2024-05-22 12:43:22 +01:00
Godfrey M f2693ee957 conditionally fixed redirect select option 2024-05-21 14:08:35 -07:00
Godfrey M 9f02be0823 removed extra div 2024-05-21 10:15:18 -07:00
Godfrey M b5553af8ed rename variable 2024-05-21 10:11:53 -07:00
Godfrey M 4d6f4303f5 fixed partial up 2024-05-21 10:11:01 -07:00
Godfrey M 8a0afae90f fixed query, fixed no email logic, needs new markdown 2024-05-21 09:42:00 -07:00
snipe a7ccf0efff Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-21 09:56:51 +01:00
Godfrey M db9c435ae0 removed extra div tags 2024-05-20 10:48:57 -07:00
Godfrey M 280c03dcad remove license checkout changes 2024-05-20 10:25:59 -07:00
Brady Wetherington f633dbba64 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-20 12:55:29 +01:00
snipe 6a6272ace3 Translate no records found message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-20 11:19:47 +01:00
snipe bcb747f886 Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-20 11:19:37 +01:00
snipe 2182ea1ce8 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 21:57:19 +01:00
snipe 81efaa7481
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form 2024-05-16 16:13:21 +01:00
snipe de088d452f
Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance 
Adds a note text area to asset acceptances/declines
 2024-05-16 15:06:05 +01:00
snipe 30f738646e
Merge pull request #14700 from marcusmoore/chore/sc-25471 
Updated alpine to the latest version (3.13.10)
 2024-05-15 19:59:51 +01:00
snipe 71b5bf2eef Added visual on the hardware view screen 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe ab8b40745e Added next audit date to create/edit asset screen 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe 16ec47573b Added help text to bulk edit blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe 556d0b44a3 Added asset 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe 0734d5b0b6 Added help text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe f158a369a4 Added/updated string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:47 +01:00
snipe 8841e21dc9 Removed quickscan header 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:47 +01:00
snipe f5e03b264f Show additional help text if help text is given 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:47 +01:00
snipe eb09a99eb0
Merge pull request #14707 from spencerrlongg/bug/sc-24912 
Bulk Edit Tests and Tweaks
 2024-05-15 11:22:31 +01:00
Godfrey M dc418a7033 need to make variables names uniform 2024-05-14 14:09:54 -07:00
Godfrey M 15cc4345ab adds dynamic redirects to Assets 2024-05-14 13:25:52 -07:00
Marcus Moore d7f0ee49b7
Update Alpine to 3.13.10 
Includes fix to new label engine.
 2024-05-07 17:08:05 -07:00
snipe 934593e0b6 Updated icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 18:09:55 +01:00
snipe 69122034e7 Fixed icon table headers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 17:55:33 +01:00
snipe 1117f4289d Added string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 17:55:10 +01:00
snipe 49dc9767b6 Added debugging :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 15:54:43 +01:00
snipe 2b4a536f85 Added CSS for users, locations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 12:06:54 +01:00
snipe 92ae069629 Disable button in UI if user cannot be deleted 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 12:06:35 +01:00
snipe 3594ed67d1 Removed back buttons on settings index 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-06 20:48:32 +01:00
snipe c816b960b5 Fixed stray closing paren 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-06 20:34:36 +01:00
Brady Wetherington 5b02a43957 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-06 18:44:03 +01:00
Mustafa Online 55b004d53d Improve RTL support 2024-05-04 13:32:42 +02:00
Mustafa Online c1b72a8ce6 Revert "Improve RTL support" 
This reverts commit fa0bea87e6.
 2024-05-04 13:31:52 +02:00
Mustafa Online fa0bea87e6 Improve RTL support 
I'm starting to make some improvements to RTL support, more PR's to come to address other parts.
 2024-05-04 13:17:48 +02:00
Godfrey M c94a7613ca dropdown redirect options, helper function and session variable added 2024-05-02 12:16:20 -07:00
snipe f893b23129 Refactored title blade areas 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-02 12:35:52 +01:00
snipe 8c65880504 Changed badge to span in default blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-02 12:35:41 +01:00
spencerrlongg 25480293dc change keys to values, add test 2024-04-30 18:03:26 -05:00
Godfrey M 75aa01791a adds location select to the create new user vice asset checkout 2024-04-30 11:54:33 -07:00
snipe bfd0530597 Fixed notification 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 20:59:13 +01:00
snipe fc61a4b88d Fixed badge HTML 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:50:58 +01:00
snipe 860764a436 Use totals for sidebar 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:12:21 +01:00
snipe 8356b57fb4 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:01:34 +01:00
snipe 76129e9011 Use trans_choice for title 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:59:13 +01:00
snipe 9c8411c7ff Added checkin due blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:58:56 +01:00
snipe c661d732b3 Refactored sidenav links for audit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:58:44 +01:00
snipe 4b4e3badb7 Removed hardware audit overdue blade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:53:36 +01:00
snipe fe4dd23d39 Removed “all” text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 15:49:12 +01:00
snipe de6d71cc3b Use plural api endpoints in blades 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 15:47:19 +01:00
snipe bd8737d986 Changed sidenav badge class 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 15:44:21 +01:00
snipe 4b6d236eb7 Added class for sidebar menu badges 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 15:44:06 +01:00
snipe 2888dd6fd8 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:02:37 +01:00
snipe 14b6a75507 Updated routes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:01:38 +01:00
snipe bfc30794c5 Updated badge styling 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:01:22 +01:00
Brady Wetherington 3f5c5cbe82 Merge branch 'develop' into snipeit_v7_laravel10 2024-04-24 16:24:43 +01:00
snipe 2439758ef3
Merge pull request #14587 from Godmartinz/License-export-button 
Added a License Export function and button
 2024-04-24 04:42:56 +01:00
akemidx ac4aa97103 develop reheading 2024-04-23 17:05:50 -04:00
snipe 685f1cbfb8
Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels 
Removed encrypted fields from label options
 2024-04-23 13:31:38 +01:00
snipe e2d1e6b0c5
Merge pull request #14608 from akemidx/bug/sc-25232 
Left Sidebar Was Not Respecting Theme
 2024-04-23 12:32:48 +01:00
snipe bdd43b7134
Merge pull request #14602 from uberbrady/fix_saving_encrypted_custom_fields 
Re-enabled updating encrypted custom fields via API [sc-41465]
 2024-04-23 10:20:55 +01:00
snipe c50d5a678a
Merge pull request #14616 from akemidx/bug/sc-25235 
REMOVED: Dark Theme Button Text Coloring
 2024-04-23 09:20:57 +01:00
Godfrey M 96b3af7cbc fixed view from sending all custom fields 2024-04-22 18:27:34 -07:00
Godfrey M 5fc6771543 adds licenses available, updated teranslations 2024-04-22 17:58:49 -07:00
akemidx 01c24ab4cd translating text 2024-04-22 19:16:14 -04:00
Marcus Moore ac8aab0043
Add default "select an option" to data source options 2024-04-22 12:22:10 -07:00
Godfrey M 14ddf36d46 removed two duplicate translations 2024-04-22 10:43:11 -07:00
Godfrey M 420225c2d5 Merge branch 'refs/heads/develop' into License-export-button 2024-04-22 10:33:30 -07:00
snipe e330e80c46 Reeduced z-index of bs table override 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-19 16:06:43 +01:00
akemidx f0836d4d3a changes for button hover, removing text color changes. also added in a border for yellow and black themes 2024-04-18 19:36:35 -04:00
akemidx 1289920217 black button border 2024-04-18 19:29:56 -04:00
snipe 6f195cb8ec
Merge pull request #14591 from snipe/bug/sc-25258/naive_fix_for_user_scoping 
First fix for user FMCS scoping
 2024-04-17 21:49:53 +01:00
snipe c21142605d Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 10:47:56 +01:00
akemidx f39ba0136c errant carraige return 2024-04-16 14:26:18 -04:00
akemidx df60045bfe sidebar hover fix 2024-04-16 14:21:47 -04:00
akemidx 5e122f780f sidebar_hover_color 2024-04-16 14:00:20 -04:00
Brady Wetherington 67a8e0b5c6 This re-enables the ability to update encrypted custom fields via the API 2024-04-15 18:46:11 +01:00
snipe b5c83721ad
Merge pull request #14577 from Godmartinz/signature_pad_upgrade 
Upgraded Signature-pad.js  && Fixed Resizing Canvas on mobile
 2024-04-11 15:35:47 +01:00
snipe 9b21fca1a0
Merge pull request #14558 from akemidx/bug/sc-25192 
Fixed: Header Dropdown Menus had no hover coloring in dark themes
 2024-04-11 15:35:33 +01:00
snipe 570944a48b Updated translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:38:52 +01:00
snipe 5829b02323 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:38:47 +01:00
Godfrey M 133fdd7a37 fix conditional 2024-04-10 12:31:04 -07:00
Godfrey M f42ae46338 exports all licenses 2024-04-10 12:14:44 -07:00
Godfrey M e2679852ce added export button, half the logic for export method 2024-04-10 11:31:30 -07:00
akemidx f0aefaac42 padding fix 2024-04-09 17:51:42 -04:00
akemidx 6d3fa12f37 white texty for dropdown lists 2024-04-09 14:52:43 -04:00