Commit graph

4247 commits

Author SHA1 Message Date
snipe
4bf1566d2a
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during
Adds Boolean to Users Table for Auto Assigning Licenses
2023-02-21 20:10:46 -08:00
snipe
0c3115553e
Merge branch 'develop' into vip_tag 2023-02-21 20:03:49 -08:00
snipe
942fee4d43
Merge pull request #12447 from akemidx/user_setup_translation
FIXED: Translations on the User Creation setup page
2023-02-21 19:53:00 -08:00
akemidx
f33b6a3e26
Update user.blade.php 2023-02-17 12:52:54 -05:00
snipe
71334b5eae More tweaking for top button alignment
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 18:13:38 -08:00
snipe
f124249e1c More padding twiddles
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 18:08:11 -08:00
snipe
e451ca1a5c Stray semicolon
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 17:37:53 -08:00
snipe
3e111fca6e Cleanup some small UI bugaboos (padding, etc)
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 17:13:40 -08:00
snipe
df64e0e291
Merge pull request #12523 from Godmartinz/bug/sc-20041/slack-ui-livewire-tweaks
Fixes slack settings submit button availability
2023-02-15 16:28:57 -08:00
snipe
51c9a7d4f8
Merge pull request #12521 from akemidx/weird_checkout_text
Fixed awkward checkout text in checkedout side panel
2023-02-15 16:28:05 -08:00
akemidx
d8d713426d indent? 2023-02-15 19:24:20 -05:00
akemidx
7dd789d5c0 translate no assets at checkout 2023-02-15 19:22:13 -05:00
Godfrey M
2d8c8e8f48 removes lazy loading 2023-02-15 16:16:14 -08:00
Godfrey M
7b510d5f2b greys out submit button conditionally 2023-02-15 15:46:05 -08:00
snipe
d4634e83c9 Nicer padding, removed unused ids
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 14:45:18 -08:00
snipe
6c3ffa7918 Removed unused CSS
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 14:39:24 -08:00
snipe
2d0bd2b292 Make spinner actually spin
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 14:06:40 -08:00
akemidx
b96f2f738d fixed weird phrasing in asset checkout screen 2023-02-15 16:47:48 -05:00
snipe
ff895739f4
Merge pull request #12446 from Godmartinz/livewire_slack_inputs
Adds Livewire slack inputs
2023-02-15 13:27:07 -08:00
Godfrey M
793cf4823b missing things like mr magoo 2023-02-14 14:35:54 -08:00
Godfrey M
c0d8ff1676 simplified to an else instead of elseif 2023-02-14 14:21:24 -08:00
Godfrey M
0cd558593d adds the red x icon to a false deployable status 2023-02-14 10:34:36 -08:00
Godfrey M
d03e042eda adds a red icon next to broken- not fixable status label 2023-02-14 09:55:48 -08:00
snipe
2bbbc8158b
Merge pull request #12477 from akemidx/apple_warranty_link
Added functionality to Apple Warranty link
2023-02-13 13:02:33 -08:00
snipe
2f5b4c8e1b
Merge pull request #12498 from akemidx/layout_trans
Translations for the layout setup
2023-02-13 13:01:58 -08:00
Ivan Nieto Vivanco
f0bf16d784 Fix more uneven tags 2023-02-12 12:01:40 -06:00
Ivan Nieto Vivanco
9a68a747a0 Fix uneven tags 2023-02-12 11:59:56 -06:00
Ivan Nieto Vivanco
81cc9f3700 Adds images to emailed user inventory report 2023-02-12 08:23:50 -06:00
akemidx
5714824aa7 translations for the layout setup 2023-02-09 17:24:34 -05:00
snipe
e79818967d
Merge pull request #12490 from akemidx/manufacturer_marker
Removed "required" marker for manufacturer on asset models (since it is not actually required)
2023-02-09 12:43:14 -08: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
snipe
a4a3c03a7c
Merge pull request #12478 from inietov/fixes/added_translation_strings_inventory_report
Fixed #12064 Mail-Template missing translation strings
2023-02-08 10:02:19 -08:00
snipe
16fcc6dc44 Fixed UI bug where download button was missing for non-images
Signed-off-by: snipe <snipe@snipe.net>
2023-02-07 18:40:00 -08:00
Ivan Nieto Vivanco
49b6a1cc53 Adds translation strings to theinventory report sent to users 2023-02-07 18:29:19 -06:00
akemidx
75f3cb3079 fixing external if statement 2023-02-07 19:02:12 -05:00
akemidx
c0074baa26 functionality to Apple Warranty link 2023-02-07 17:27:39 -05:00
Marcus Moore
45e8e9bbed
Move company name to better location 2023-02-06 12:21:09 -08:00
Marcus Moore
78343ddb7c
Add asset's company name to checkout page 2023-02-06 10:58:10 -08:00
Godfrey M
74c64c1fc5 adds validation to the update hook, removes typos and deadlines 2023-02-06 09:40:57 -08:00
snipe
dc414d3552 Updated model restore route
Signed-off-by: snipe <snipe@snipe.net>
2023-02-02 23:38:59 -08:00
snipe
bbf6e5e69e
Merge pull request #12421 from akemidx/hardware_blades_translations
Fixed: translations added for the hardware blades
2023-02-02 13:02:46 -08:00
akemidx
37ce68af5b once again fixing an apostrophe 2023-02-02 15:54:05 -05:00
akemidx
29851c626f
Merge branch 'develop' into user_setup_translation 2023-02-02 14:34:09 -05:00
snipe
7344bbdd7f Added checkout/checkin note to user history
Signed-off-by: snipe <snipe@snipe.net>
2023-02-02 11:26:33 -08:00
snipe
78dca7fd32 Handle missing userfiles more gracefully
Signed-off-by: snipe <snipe@snipe.net>
2023-02-02 10:49:36 -08:00
akemidx
69c38bf686 translations on the User Creation page 2023-02-01 20:32:16 -05:00
Godfrey M
3a86547ef5 fixes messages for integration test, removes slack request file, rehouses ajax method 2023-02-01 16:51:05 -08:00
snipe
d9cdb92014
Merge branch 'develop' into vip_tag 2023-02-01 16:03:23 -08:00
snipe
2da4578aa5
Merge branch 'develop' into slack_message 2023-02-01 13:43:09 -08:00