DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 10:34:08 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
14948 commits 96 branches 267 tags 295 MiB
Commit graph

3610 commits

Author SHA1 Message Date
Marcus Moore a4a25ab9d0 Remove a couple fields 2023-09-27 16:35:44 -07:00
Marcus Moore 518ae28a37 Improve option display values 2023-09-27 16:20:26 -07:00
Marcus Moore 74a891afbb WIP: Render select box for field options in label engine 2023-09-27 15:58:01 -07:00
snipe 7bcb28d8fd Commented out sortable columns 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-26 15:24:20 +01:00
snipe 660abeca9e
Merge pull request #13638 from marcusmoore/bug/sc-20704 
Fixed exception being thrown when selected import was deleted
 2023-09-26 15:00:35 +01:00
snipe 619712b927 Fixed table 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-25 13:45:46 +01:00
snipe 359cd2a267 A few more config options 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-25 13:28:13 +01:00
snipe 456d55c3bd Added some mail settings to /settings for easier reference 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-21 16:14:47 +01:00
Marcus Moore b1199100a0 Display error message if import file deleted before it can be selected 2023-09-20 17:22:12 -07:00
Godfrey M b7901ae2d8 dont allow redirects, messaging applied, general webhook validation applied 2023-09-20 12:54:34 -07:00
spencerrlongg 7dab59c98d fix for no eol, fix for optional in view 2023-09-20 14:17:30 -05:00
snipe 14c0517927 Fixed #13628 - removed duplicate favicon tag 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-19 10:21:38 +01:00
snipe 2a638e66f0 Added column re-ordering 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-15 21:53:34 +01:00
snipe 3ba8b60f54 Fixed regression that disabled sticky headers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-15 20:28:28 +01:00
snipe 131ccaa5b9
Merge pull request #12869 from Godmartinz/bug/sc-23134 
Fixed footer sizing issue
 2023-09-15 14:31:07 +01:00
snipe 860e7791ff Fixed #13592 - unable to delete model from view page 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 23:35:44 +01:00
snipe bbe7d9dde2 Removed stray space 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:08:53 +01:00
snipe 932c02cc54 Typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:08:30 +01:00
snipe 84b0ff76ed Revert large warning size 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:06:19 +01:00
snipe 273740b8f5 Fixed import error warning 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:04:23 +01:00
snipe 8f4ca9da57 Simplify upload messaging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 21:20:21 +01:00
snipe 8e41fb7b36 Removed stray text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 18:48:20 +01:00
snipe d0c4910a51 Fixed checkbox formatting on quickstart 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 18:44:02 +01:00
snipe b92327eb40
Merge pull request #13520 from inietov/fixes/licenses_reassignable_feature 
Fixed Not reassignable Licenses shouldn't show 'Checkin All Seats' button [sc-23506]
 2023-09-14 12:52:13 +01:00
spencerrlongg 70a251de55 fix up gui edit 2023-09-13 13:51:14 -05:00
spencerrlongg ccf3fe40ec rm additional row 2023-09-11 17:35:13 -05:00
spencerrlongg 3a63bcab73 temporarily show on its own line 2023-09-11 17:35:13 -05:00
Godfrey M e73b16846e adds an option to bulk edit actual location for bulk edit and fixes update issue 2023-09-11 11:21:56 -07:00
Godfrey Martinez a26b96185b
Merge branch 'develop' into asset-model-notifs 2023-09-11 09:37:22 -07:00
snipe 65a76c599c Added inline=true to image preview modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 18:35:07 +01:00
snipe f53db8ba75 Fixed #13562 - allow inline view for uploaded files 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 18:28:01 +01:00
snipe b17af38d8e
Merge pull request #12901 from Godmartinz/user_total_cost 
Added users total cost of assets to user profile
 2023-09-05 13:52:34 +01:00
snipe a62e2f092b
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report 
Added last check in column and filter to custom asset report
 2023-09-05 13:22:15 +01:00
snipe c0cbdb1fc4 Fixed bug introduced in #13528 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 15:48:35 +01:00
snipe 22d136df46
Merge pull request #13528 from inietov/fixes/cloning_model_blanks_fieldset 
Fixed #12548 Cloning a model blanks fieldset of new one
 2023-08-29 19:14:38 +01:00
Ivan Nieto Vivanco 4e4ba38038 Pass the model_id variable in the controller and get it only if we are cloning the asset model 2023-08-28 16:23:26 -06:00
snipe 7787ca328c Try to prevent the browser from pre-filling the LDAP password 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 18:36:06 +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 20e9f05a64 Tighter layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-26 17:43:02 +01:00
Ivan Nieto Vivanco a12a68e4e9 Add a variable so I dont ended rewriting the original model 2023-08-24 15:28:12 -06:00
Ivan Nieto Vivanco 950536f59f Added a condition to send correct model id when cloning one 2023-08-24 15:18:51 -06:00
Godfrey M 8ebb9afedd adds min_amt to asset model edit, index, and table 2023-08-24 10:30:07 -07:00
Ivan Nieto Vivanco 7bfb5a0667 Disable the Checkin All Seats button if License is not reassignable 2023-08-23 16:36:06 -06:00
snipe 79b330f492
Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error 
Fixed Asset acceptance error when user company and asset company don't match
 2023-08-22 15:49:56 +01:00
snipe da38945a53 Small fixes to checkbox layout in general settings blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-22 14:10:39 +01:00
snipe a48762c64d
Merge pull request #13496 from snipe/features/setting_for_name_order 
Fixed #13495 added setting for name order
 2023-08-22 12:50:58 +01:00
snipe fea11ec7f1
Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields 
Bulk Editing Custom Fields
 2023-08-22 12:40:18 +01:00
Marcus Moore c332b98456 Add last checkin options to report front end 2023-08-21 13:44:49 -07:00
snipe 36a343365e Switched from fullName() to getFullNameAttribute() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:14:07 +01:00
snipe c617bf89b6 Tweak layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:13:45 +01:00
snipe ba0643f6a4 Added name display format, tweaked some 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:13:28 +01:00
snipe 74384f14e4 Use clearer translation (from original PR) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-16 01:25:13 +01:00
Ivan Nieto Vivanco 25c58a8486 Fix typo in language variable name 2023-08-15 14:17:39 -06:00
snipe 7eaf3174ab
Merge pull request #13457 from snipe/fixes/remove_autocomplete_off_on_login 
Fixed #13365 - Added LOGIN_AUTOCOMPLETE as env var
 2023-08-15 20:55:05 +01:00
snipe 0763b5135d Fixed checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:28:16 +01:00
snipe fa6c8d864e Restore label engine checkbox 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:04:19 +01:00
snipe c957f136aa More label tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:03:40 +01:00
snipe 6b02184e99 Fixed weird layout with checkbox 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 18:48:20 +01:00
snipe e41368daac
Merge pull request #12050 from cram42/develop 
New Label Engine
 2023-08-15 17:58:57 +01:00
snipe c56f664811
Merge pull request #13442 from Robert-Azelis/Robert-Azelis-patch-add_email_to_companies 
Add email to companies
 2023-08-15 13:26:20 +01:00
Ivan Nieto Vivanco d365565b6d Add message in the acceptance assets view to indicate when the user can\'t accept nor deny the asset 2023-08-14 20:51:04 -06:00
snipe 24a3e0ee83 Added LOGIN_AUTOCOMPLETE as env var 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 01:56:01 +01:00
snipe d3fbbec92c
Merge pull request #13455 from snipe/fixes/confusion_around_localization_date 
Fixed #13382 - confusion around localization date
 2023-08-14 22:50:30 +01:00
snipe 9820ab34d7 Use today’s date for date format selectlist 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-14 22:44:29 +01:00
Godfrey M c3356ab765 fixed translation choice and color choice 2023-08-14 12:20:46 -07:00
Godfrey M 6b94ef6adc fixes the statuslabeltypeforatter instead of the model 2023-08-14 12:13:01 -07:00
snipe 58286c9cab Fixed case in BS table formatter for boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-14 13:01:32 +01:00
Robert-Azelis da701677c7
Update edit.blade.php 2023-08-13 17:24:17 +02:00
snipe a6a742d8d8
Merge pull request #13407 from marcusmoore/feature/sc-23465 
Added messaging to category edit page to improve clarity around when users will be emailed
 2023-08-09 10:36:19 +01:00
snipe 6a3a38b6f6 Call tooltip again on custom fields jquery 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 18:53:57 +01:00
snipe 40aca9709a Added container to the tooltip invocation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 18:52:26 +01:00
snipe 5bda73f151 Ugh - messing with the blade layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 08:18:40 +01:00
Marcus Moore d019e62d39
Remove lazy from eula field to avoid race condition 2023-08-02 18:22:40 -07:00
Ivan Nieto Vivanco 9ca163e8cf Stop asset acceptances from shown to user if full company support is enabled and companies not match 2023-08-02 19:22:35 -06:00
Marcus Moore b70a5280f9
Remove unneed jquery 2023-08-02 18:04:21 -07:00
Marcus Moore cbe5a9bc8a
Persist eula text even when field is disabled 2023-08-02 18:03:09 -07:00
Marcus Moore 2e7aa01abe
Pass checkin_email value to backend even when unchecked 2023-08-02 17:45:39 -07:00
Marcus Moore 896f038054
Set send email back to original value when eulas cleared 2023-08-02 17:03:56 -07:00
Marcus Moore 48979ce177
Disable send email when it should not be modified 2023-08-02 16:52:56 -07:00
Marcus Moore e12935f7fa
Disable eula textarea when using global eula 2023-08-02 16:18:57 -07:00
Marcus Moore 6400034435
Improve variable name 2023-08-02 16:06:59 -07:00
Marcus Moore 105c94aea9
Implement toggling message when email will be sent 2023-08-02 11:36:20 -07:00
Marcus Moore 6349d52803
WIP: migrate to livewire 2023-08-01 17:29:23 -07:00
Marcus Moore 65de9c5e07
Extract translation strings 2023-08-01 15:21:49 -07:00
Marcus Moore ebfc395e78
Improve messaging 2023-08-01 14:39:30 -07:00
Marcus Moore 5c8c2ca027
Improve variable names 2023-08-01 14:26:21 -07:00
snipe 2e1c3fb51b
Merge pull request #13295 from inietov/fixes/admins_cannot_view_encrypted_fields 
Fixed #11794 Admins Cannot View Encrypted Field
 2023-07-31 13:08:28 +01:00
Grant Le Roux b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
Godfrey M 9c6e8d57aa removes typos 2023-07-25 11:44:16 -07:00
Godfrey M 11e3487263 custom field set order starts at 1 now 2023-07-25 11:41:08 -07:00
snipe a01cb26aac
Merge pull request #12940 from akemidx/delete_asset_from_view_page 
Delete button on asset view page
 2023-07-25 12:11:35 +01:00
snipe 1a771e6ab9 Check that the model is valid before trying to chain the relationship 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-21 14:46:58 +01:00
Ivan Nieto Vivanco ecf522243b Add the new rule to proper views and also in the Asset Transformer 2023-07-19 19:52:03 -06:00
Marcus Moore 2eaab6d9fb
Change message to a callout 2023-07-17 12:23:31 -07:00
snipe c21a7db3c1 Moved warranty into manufactuer’s section 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-15 10:45:36 +01:00
snipe 3078cab7ee Added ability to show/hide custom fields in list views by default 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-14 09:09:43 +01:00
snipe 4027acee46
Merge pull request #13184 from akemidx/department_in_side_bar 
User department now visible in side pane of asset view page
 2023-07-13 21:01:48 +01:00
snipe 5aa99a15d8
Merge pull request #13288 from snipe/fixes/line_based_markdown 
Added Inline markdown method
 2023-07-13 13:16:50 +01:00
snipe 5d1f294f0e Added parseEscapedMarkedownInline to accessories API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-13 12:03:01 +01:00
akemidx 1163af3c10 change to make sure department actually exists 2023-07-12 15:57:44 -04:00
snipe c1c2c38995 Fixed #13256 - Added option to switch to localStorage instead of cookies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-12 20:06:17 +01:00
snipe 44231fa52c
Merge pull request #13225 from inietov/fixes/change_default_location_at_checkin 
Fixed #13167 Default location not being set/updated upon check-in
 2023-07-12 19:14:53 +01:00
snipe 44b8558e38
Merge pull request #13233 from Godmartinz/barcode_adjusts_if_qr_code_ 
fixed margin if qr_code present
 2023-07-12 17:11:58 +01:00
snipe a569a99e61 Used inline markdown in views 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-12 16:57:04 +01:00
Marcus Moore 3df175fb3e
Improve variable name 2023-07-11 16:36:38 -07:00
Marcus Moore 44d8b2fd5e
Handle default eula checkbox 2023-07-11 16:36:03 -07:00
Ivan Nieto Vivanco e0df8cc4aa Add admin role to show encrypted customfield values 2023-07-11 17:21:32 -06:00
Marcus Moore af681d8190
Display message and update checkbox depending on EULA status 2023-07-11 16:12:43 -07:00
snipe b5695c9ab7 Test parsedown in notes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-11 12:20:47 +01:00
snipe ba37a9db8c
Merge pull request #13277 from snipe/features/added_phone_fax_to_locations 
Added phone, fax to departments, locations, companies
 2023-07-11 11:15:13 +01:00
Ivan Nieto Vivanco ec8cb1b09e Add the withTrashed() method to requestingUser() method in CheckoutRequest model, so the view of requestable assets doesn't crash 2023-07-10 16:34:00 -06:00
snipe 14c61e4c17 Added phone, fax to departments, locations, companies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-10 19:44:21 +01:00
Marcus Moore ef160b0e15
Add span tag so label is displayed properly 2023-07-06 10:49:57 -07:00
Ivan Nieto Vivanco f4ca29b4a8 Only show radio inputs for location in checkin view 2023-07-06 11:36:55 -06:00
Ivan Nieto Vivanco 743e852998 Add radio buttons to alter asset checkin location behavior 2023-07-06 10:38:48 -06:00
Godfrey M d44e667697 fixed margin if qr_code present 2023-06-29 13:37:38 -07:00
Godfrey M df90e924b4 prevent labels from overlapping 2023-06-29 13:18:17 -07:00
akemidx d0212d4bda formatting fix 2023-06-29 15:39:19 -04:00
slong753 8cee3a8218 ok, @marcusmoore was right all along 
i just didn't get it
 2023-06-29 14:06:52 -05:00
slong753 826ea0ded8 move colon to blade based on a comment 2023-06-29 10:40:04 -05:00
snipe a3096e1b47
Merge pull request #13219 from inietov/features/cancel_request_asset 
Cancel requested assets without checkin/out [ch-17606]
 2023-06-29 16:18:13 +01:00
akemidx af03b9f140 user department clarification & translation for that phrase. will be used in a later PR 2023-06-28 17:45:13 -04:00
slong753 8923206ac8 translation string 2023-06-28 13:08:34 -05:00
slong753 3b8ab2d682 clean formatting a little 2023-06-28 13:00:59 -05:00
slong753 2d27941105 added to textarea too 2023-06-28 12:59:54 -05:00
slong753 50a518e5f3 disable input when field is unique 2023-06-28 12:57:23 -05:00
Ivan Nieto Vivanco e2c2736a9c Delete (gulp) Form for bulk edit since is not used in this view 2023-06-28 11:23:37 -06:00
Ivan Nieto Vivanco 85e717bc4e Fix cancel button style and translate title 2023-06-28 10:38:44 -06:00
snipe 161f4c8d83
Merge pull request #13045 from akemidx/feature/sc-23261 
Checkin/out info on side bar
 2023-06-28 16:41:21 +01:00
slong753 8b8e7cb5ee couple translation strings 2023-06-28 10:17:28 -05:00
Ivan Nieto Vivanco 1c29bd37a6 Added feature to cancel requests from the Requested Assets view 2023-06-27 18:11:10 -06:00
Ivan Nieto Vivanco b647a8fcd2 Change the inline form HTML label to the Form:: facade 2023-06-27 17:02:25 -06:00
Ivan Nieto Vivanco 62347a56ba Add button with cancel action in requested assets view 2023-06-27 16:41:30 -06:00
slong753 e8988bf51e add list 2023-06-26 20:22:27 -05:00
slong753 2736161909 oops, fixed translation 2023-06-26 16:37:06 -05:00
slong753 8cbff0179c translation strings 2023-06-26 16:35:53 -05:00
slong753 691faf6340 ok, this kind of works - pr needs some clean up 2023-06-26 14:56:07 -05:00
Spencer Long f646623a5e
Merge branch 'develop' into bulk_edit_custom_fields 2023-06-22 18:00:31 -05:00
snipe 4029efebfd
Merge pull request #13159 from Godmartinz/audit_image_bug 
fixed audit log image not appearing
 2023-06-22 21:11:39 +01:00
akemidx 4b8a08edc1 typo 2023-06-20 19:32:16 -04:00
akemidx 1a407dc05b user department now in side view of asset view page 2023-06-20 19:17:14 -04:00
snipe 7a425f8a49
Merge pull request #13093 from NojoudAlshehri/features/added_asset_tag_colum_in_requestable_assets 
feature: Added asset_tag column in requestable assets page
 2023-06-15 19:37:18 +01:00
snipe 21a27f43a9
Merge pull request #13158 from Godmartinz/asset_maint_warranty_bug 
Added warranty confirmation to asset maintenance table
 2023-06-15 19:34:16 +01:00
snipe 004992086e
Merge pull request #13098 from ak-piracha/feature/snipe-13049-status-label-chart-color 
Fixed #13098: Status Label Chart Color, resets to default when editing a Status Label
 2023-06-15 16:55:32 +01:00
snipe 157a4341ea
Merge pull request #13041 from snipe/features/refactor_importer_for_localization 
Refactor importer for localization
 2023-06-13 18:12:07 +01:00
Godfrey M fc86530c94 uses the trueFalseFormatter now 2023-06-13 09:10:42 -07:00
Godfrey M 6dd7181d09 fixed audit log image not appearing 2023-06-12 12:10:19 -07:00
Godfrey M 69325beddb adds warranty confirmation to asset maintenance table 2023-06-12 11:03:32 -07:00
NojoudAlshehri d06bdc2db4
Fix of typo in an HTML tag 2023-06-07 13:46:17 +07:00
ak-piracha daf6bcb6d5 follow best practices when working with blade and javascript 2023-06-01 11:07:21 +09:30
ak-piracha 825a9a384d Fixed 2023-05-29 14:07:53 +09:30
NojoudAlshehri 980cb53efa
Added asset_tag column in requestable assets page 2023-05-27 07:05:59 +07:00
snipe 44cbb0c2e9
Merge branch 'develop' into asset_info_overflow 2023-05-24 16:11:34 -07:00
Ivan Nieto Vivanco 6df9a33eab Add a condition to check if images should be shown in notification 2023-05-22 16:24:16 -06:00
ak-piracha bb013d5c3c Bulk Consumable Checkout 2023-05-21 22:49:00 +09:30
snipe b7149d8339 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-20 14:20:38 -07:00
Godfrey M addd806653 testing overflow solutions 2023-05-17 10:47:50 -07:00
akemidx deca80ba71 checkin/out info on side bar 2023-05-17 13:17:48 -04:00
snipe 7012018e22 Removed todo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 22:30:17 -07:00
snipe b9b9eb86d9
Merge pull request #13036 from snipe/features/multiselect_locations_custom_report 
Added multi-select option for location, more to custom report
 2023-05-16 16:29:13 -07:00
snipe fe92667812 Use actions text in backups table 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 16:02:48 -07:00
snipe 02cacf76c6 Additional multi-select options for custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 13:58:21 -07:00
snipe 0f3b77ee2d Added multi-select option to custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 14:45:31 -07:00
snipe a49257ad4b Wrong eval 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 13:16:59 -07:00
snipe c6eef86661 Fixed multiselect for companies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 13:15:22 -07:00
snipe 23e3d18931 Used brackets for multiselect company 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 12:35:30 -07:00
snipe 9f39d71f16
Merge pull request #12831 from Godmartinz/adds_multi_select_to_custom_report 
Added Multiselect of companies for custom reports
 2023-05-10 11:36:21 -07:00
snipe b8a59cc2d8
Merge branch 'master' into develop 2023-05-10 09:32:26 -07:00
akemidx 537aa04c9a
Merge branch 'develop' into delete_asset_from_view_page 2023-05-10 09:30:54 -04:00
snipe 27e0484072 I lied. Missed one 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 03:12:22 -07:00
snipe ec76de607b Final google login tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 03:08:29 -07:00
snipe 14da8934c5 Few more login page tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:53:11 -07:00
snipe ed370a0104 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:47:28 -07:00
snipe f3c977aa9d Nicer button 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:37:01 -07:00
snipe 788c03ef57 Hide client secret if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:22:49 -07:00
snipe 1ef4ea6381 Very ugly login shim just to test functionality 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:14:31 -07:00
snipe 37bc47290c Disabled fields in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:12:55 -07:00
snipe 4da40792ea Use google logo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 01:08:28 -07:00
snipe f57e39191d Added google settings blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:55:16 -07:00
snipe 6ab214d3a6 Added google option to settings index 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:55:04 -07:00
snipe bc9b47c46d Removed env dependency, switched to DB 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:27:47 -07:00
snipe c52b48c383 Google oauth login 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:14:28 -07:00
snipe 11cd875c6d Merge remote-tracking branch 'origin/develop' 2023-05-09 22:42:45 -07:00
snipe 0680405f4d Tightened up some layout issues, checkbox issues in LDAP settings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-09 22:34:46 -07:00
snipe cbe70c9cc1 Merge remote-tracking branch 'origin/develop' 2023-05-09 20:14:44 -07:00
snipe 6a7bab453f Made spacing more compact 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-09 20:14:00 -07:00
snipe 7412bc32e2
Merge pull request #12991 from snipe/fixes/accessories_view 
Fixed width of columns in details
 2023-05-09 20:11:36 -07:00
snipe ec4697fd3e Merge remote-tracking branch 'origin/develop' 2023-05-09 19:45:10 -07:00
snipe 999dc3c358 Added icon field back into assets page 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-09 19:43:37 -07:00
snipe a10652797f Fixed width of columns in details 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-09 19:42:32 -07:00
snipe a43dea3c04 Merge remote-tracking branch 'origin/develop' 2023-05-09 16:29:53 -07:00
snipe 2d5da67b1e
Merge pull request #12982 from akemidx/feature/sc-23214 
Buttons on the Accessory View Page
 2023-05-09 14:26:28 -07:00
slong753 1d2596fc54 wip 2023-05-09 14:58:59 -05:00
snipe 7dd41aa574 Removed whitespace 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 15:49:12 -07:00
snipe c4d40cdbd4 Merge remote-tracking branch 'origin/develop' 2023-05-08 15:11:25 -07:00
snipe 277618bf16 Added maxlenth to form fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 14:13:24 -07:00
snipe 6cb6beb6c7 Merge remote-tracking branch 'origin/develop' 2023-05-08 13:21:43 -07:00
snipe d70e14de61
Merge pull request #12972 from marcusmoore/bug/sc-23177 
Fixes user name missing in accessory acceptance notifications
 2023-05-08 13:04:37 -07:00
snipe a73205f228 Merge remote-tracking branch 'origin/develop' 2023-05-08 11:24:03 -07:00
snipe 223ff5e97e Fixed misplaced div when saml is disabled 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 11:20:26 -07:00
snipe 3d345d15ac Merge remote-tracking branch 'origin/develop' 2023-05-04 11:01:15 -07:00
snipe 60515f1262 Show signature column regardless of “require sig” state 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-04 10:56:35 -07:00
Marcus Moore 9efe13bb5e
Capitalize "declined" in acceptance in notification 2023-05-03 17:03:22 -07:00
snipe 5950ec27ab Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
 2023-05-03 13:49:36 -07:00
akemidx 526c089424 Buttons on the accessory view page 2023-05-03 16:40:06 -04:00
akemidx 67105528d1 Buttons on the accessory view page 2023-05-03 16:31:56 -04:00
akemidx 12f0c42545 buttons added 2023-05-03 16:31:56 -04:00
slong753 815c77f943 wip 2023-05-03 14:49:31 -05:00
snipe fe710efb40
Merge pull request #12874 from Godmartinz/feature/sc-23130 
Adds a checkout range for custom asset reports
 2023-05-03 11:43:44 -07:00
snipe b716f9f55e
Merge pull request #12916 from snipe/features/auto_add_to_fieldset 
Added ability to auto-add fields to new fieldsets
 2023-05-03 11:04:33 -07:00
snipe 4a643c1252
Merge pull request #12880 from Godmartinz/asset_total_cost 
Added component costs to asset view
 2023-05-03 10:49:03 -07:00
snipe 466c2fd47c
Merge pull request #12966 from Godmartinz/bug/sc-23161 
fixed color differences in dark themes
 2023-05-03 10:38:54 -07:00
Godfrey M 7711938f4b fixes dark yellow 2023-05-01 16:27:21 -07:00
akemidx ad7a1d6c3b edits from Github comments 2023-05-01 15:50:48 -04:00
snipe 609b1646e9 Merge remote-tracking branch 'origin/develop' 2023-04-30 18:40:52 -07:00
snipe 031c9c1204 Added nobr tag to prevent external link icon and link from breaking 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-30 18:40:40 -07:00
snipe 77b51136cf Merge remote-tracking branch 'origin/develop' 2023-04-30 18:38:19 -07:00
snipe 0222a922a1 Added tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-30 18:20:23 -07:00
snipe 8ad600085a Moved external link icon into link 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-30 18:17:56 -07:00
akemidx cd389368f7 adding in script 2023-04-27 19:00:17 -04:00
akemidx d3675831bb snippet rewrite 2023-04-27 18:58:59 -04:00
akemidx 84134b45e6 form work 2023-04-27 18:58:59 -04:00
akemidx b1e68be545 delete button progress 2023-04-27 18:58:59 -04:00
akemidx d94bed3f57 push for testing 2023-04-27 18:58:59 -04:00
akemidx aabcf22b40 commiting 2023-04-27 18:58:59 -04:00
akemidx af549a0be9 Mock Up of the Buttons 2023-04-27 18:58:59 -04:00
snipe 1384ca658a Merge remote-tracking branch 'origin/develop' 2023-04-26 18:42:58 -07:00
snipe e25dc42121 Switch to externalLinkFormatter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:42:34 -07:00
snipe 99ef435d40 Fixed translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:32:38 -07:00
snipe e853f8b7fd Removed SR text for exporting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:23:21 -07:00
snipe deff312381 Remove auto-link from from manufacturer warranty 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:16:23 -07:00
snipe 7bffe30fae Merge remote-tracking branch 'origin/develop' 2023-04-26 17:55:48 -07:00
snipe 7974c172fd Switch back to “normal” url for support 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:48:38 -07:00
snipe 54a766c4f9 Added dynamic warranty URL to manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:39:15 -07:00
snipe 27de5c62c5 Merge remote-tracking branch 'origin/develop' 2023-04-26 15:15:43 -07:00
snipe 7c0ef581c5 Added help text to the now-dynamic manufacturer URLS 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 15:12:36 -07:00
snipe 0c5837e4a0
Merge pull request #12929 from snipe/fixes/use_asset_tag_if_no_asset_name_given 
Use the asset tag instead of asset name if no name is given
 2023-04-26 14:49:38 -07:00
snipe 5eac314f4d
Merge pull request #12906 from akemidx/feature/sc-20622 
Dynamic warranty link for manufacturers' support urls
 2023-04-26 14:49:22 -07:00
snipe b5b335a2ca Use the asset tag instead of asset name if no name is given 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 14:41:19 -07:00
snipe d6ea5de5b8 Merge remote-tracking branch 'origin/develop' into features/auto_add_to_fieldset 2023-04-25 22:20:50 -07:00
snipe 42f0975414 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2023-04-25 22:19:27 -07:00
snipe 31a3be4c6a Small refactor of HTML, added top submit button 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 21:51:59 -07:00
snipe 67212f9d57 Changed layout, added fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 20:59:29 -07:00
snipe 4e3ccb74bc Fixed slightly weird padding 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:59:19 -07:00
Godfrey M cb68f41d9c added ldap_location to settings 2023-04-25 11:44:04 -07:00
Godfrey M c9eb1410d7 swaps version and open source text in the footer 2023-04-25 11:03:05 -07:00
Godfrey M b8c424fca0 adds users total cost to user profile 2023-04-24 09:17:42 -07:00
snipe 0c425ed0e7 Merge remote-tracking branch 'origin/develop' 2023-04-21 05:19:19 -07:00
akemidx 16a5a883e5 new request, preparing support_url for validation 2023-04-20 16:34:25 -04:00
Godfrey M 97df39001d adds optional breakdowns for total cost 2023-04-19 17:51:37 -07:00
Godfrey M 6872f8da7b adding total cost to user view 2023-04-19 17:31:09 -07:00
Godfrey M bd212b3108 adds component costs to asset view 2023-04-19 16:35:06 -07:00
Godfrey M 0e1f50c226 adds checkout-range to jquery 2023-04-19 10:11:26 -07:00
Godfrey M d2118ba230 removed space from un deployable total in sidebar 2023-04-19 09:46:15 -07:00
Godfrey M 8a5612d1c9 fixes comment 2023-04-19 09:13:43 -07:00
Godfrey M bdd1045272 adds a checkout range for custom asset reports 2023-04-19 09:11:44 -07:00
Godfrey M 0ab400f5bc removed deadspace and pull 2023-04-18 15:23:11 -07:00
Godfrey M f15b0d8591 fix for footer 2023-04-18 15:20:38 -07:00
snipe c68563ae08 Merge remote-tracking branch 'origin/develop' 2023-04-18 13:01:37 -07:00
snipe d3bdaf7cd3 Fixed destination name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 12:59:46 -07:00
snipe 92f516484e Small tooltip improvements for undeployable items 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 12:54:06 -07:00
snipe b626e5a3bf Merge remote-tracking branch 'origin/develop' 2023-04-18 12:33:32 -07:00
snipe bfda46276a
Merge pull request #12849 from snipe/features/adds_license_checkin_checkout_to_all_in_gui 
Added license checkin/checkout to all in license GUI
 2023-04-18 12:32:30 -07:00
snipe 031586495a Small cosmetic tweaks to 2FA reset class, fixed weird layout on 2FA reset button 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 12:09:41 -07:00
snipe d871a14687 Added fa-fw for nicer display 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:49:40 -07:00
snipe 00a9591c4c Added autoassign_licenses in view, added fa-fw 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:49:29 -07:00
snipe 41358eba85 Updated label 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:29:28 -07:00
snipe 59f4fe67d6 Removed duplicate tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:28:35 -07:00
snipe 2c5c4ab974 Nicer layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 04:40:06 -07:00
snipe 95767c46ac Fixed delete modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 04:37:13 -07:00
snipe 0eadc00f4d Removed unneeded css class 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 04:37:04 -07:00
snipe 7aab4290c7 Updated tooltips with data-tooltip=true from old method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:44:50 -07:00
snipe 8a41f37054 Persists buttons through tabs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:00:06 -07:00
snipe ec0413254e Removed action menu 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:09:40 -07:00
snipe 220e20d208 Changed tooltip invocation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:02:36 -07:00
snipe d3b087b5da Clearer padding between buttons, added tooltips 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:02:19 -07:00
snipe 0dd967cf2b Merge remote-tracking branch 'origin/develop' 2023-04-17 21:05:09 -07:00
snipe 912f6c45ee Reverted #12832 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-17 21:04:47 -07:00
snipe 9a73f5eca3 Updated production assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-purple-dark.css
#	public/css/dist/skins/skin-purple-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
 2023-04-17 20:27:49 -07:00
snipe c12ac9912c
Merge pull request #12832 from Godmartinz/fix_footer_space 
Fixed footer space when customized
 2023-04-17 20:11:15 -07:00
Godfrey M aabd5e92a8 surrounding text aligns correctly 2023-04-17 12:44:06 -07:00
slong753 52dc99588e pushing for now, needs validation work 2023-04-17 13:57:48 -05:00
Godfrey M 0cca45d858 footer now uses flex 2023-04-17 11:57:35 -07:00
snipe add9e561f9 Added buttons on license page, greyed out where appriate 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:42 -07:00
snipe ff9af7ea74 Added genetic modal partial 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:15 -07:00
snipe bc7c0aa80d Fixed clone tooltip 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:00 -07:00
snipe 73188df090 Added autoassign_licenses to bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:22:37 -07:00
snipe cf7f244942 Added (clarified?) edit autoassign_licenses in user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:19:37 -07:00
snipe 06d46a4523 Indenting change for clarity 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:17:55 -07:00
snipe 8e5042418a Added buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:30:32 -07:00
snipe 0210ecde88 Include confirm modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:29:55 -07:00
snipe b2940f9915 Added confirm modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 12:29:48 -07:00
snipe 21e78bee71 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	package-lock.json
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2023-04-15 21:05:18 -07:00
snipe 589f7fa183 Larger qty box 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 21:03:09 -07:00
snipe 9ff62c966e Check for $item (matters mostly in custom report blade) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-15 21:03:00 -07:00
snipe 32030c4f71 Merge remote-tracking branch 'origin/develop' 2023-04-15 18:44:25 -07:00
Godfrey M 42f198ffed fixes footer space when customized 2023-04-13 12:24:59 -07:00
Godfrey M b16c062485 fixes partial 2023-04-13 12:05:59 -07:00
Godfrey M ab67d903b5 adds multi select to custom report for companies 2023-04-13 12:02:11 -07:00
snipe 607ab3988a Added supplier to edit/creatre blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:06:07 -07:00
snipe b6d3f2827b Switched to standardized require check 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:05:52 -07:00
snipe 65bb0486d4 Changed blade to use standard required check 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:04:29 -07:00
snipe a40bad0972 Added consumables and components columns to supplier list 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:04:13 -07:00
snipe 6eed89df91 Added components and consumables tab to suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 11:03:26 -07:00
akemidx 0a993b2aa1 added external link icon to warranty link 2023-04-12 18:52:21 -04:00
slong753 8b9aea8874 very much WIP, but dupe queries reduced 
but i think this can be cleaned up a bit more
 2023-04-12 14:46:48 -05:00
snipe 9a37273750 Merge remote-tracking branch 'origin/develop' 2023-04-12 08:28:50 -07:00
snipe 74babfa081 Added maxlength="10" 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 08:26:36 -07:00
snipe aac76d40fe Merge remote-tracking branch 'origin/develop' 2023-04-12 06:37:01 -07:00
snipe 0f3702b0fc Fixed incorrect translation string for bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 06:35:28 -07:00
snipe 0e93a9229d Merge remote-tracking branch 'origin/develop' 2023-04-12 06:32:06 -07:00
snipe 89b031d64d Removed iCheck code from merge users script 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-12 06:30:52 -07:00
snipe 28e0891645 Merge remote-tracking branch 'origin/develop' 2023-04-11 23:36:59 -07:00
snipe afd01869a5 Check for Carbon exception 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-11 23:35:41 -07:00
akemidx 2453913080 dynamic link w/ dynamic image 2023-04-11 14:53:44 -04:00
akemidx 71ff987e3c dynamic link w/ dynamic image 2023-04-11 14:32:11 -04:00
akemidx 968701b971 starting to implant the str lower solution 2023-04-10 17:28:19 -04:00
snipe 22336da362 Merge remote-tracking branch 'origin/develop' 2023-04-09 14:08:03 -07:00
snipe 70ce0d9ee6 Maintain activated state on editing a user 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-09 14:06:29 -07:00
snipe b3fab6d47d Merge remote-tracking branch 'origin/develop' 2023-04-07 10:47:48 -07:00
snipe 19d5d34ffb Echo out the array values in withInput() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-07 10:16:35 -07:00
snipe b09b562f3a Merge remote-tracking branch 'origin/develop' 2023-04-07 09:46:02 -07:00
snipe 42eef7eb3f
Merge pull request #12803 from snipe/fixes/small_component_fixes 
Small component UI/validation/API fixes
 2023-04-07 09:45:36 -07:00
snipe 42a60a9ccb Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-04-07 08:22:24 -07:00
Jens Maes c42078ea4a Update bpay.blade.php 
Removed FARTS from the file. This was shown in production on the master branch.
 2023-04-07 10:15:34 +02:00
snipe 43ad0f58b5 SLightly cleaner layout - still needs work 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 22:03:15 -07:00
snipe a8ca3ad2a9 Merge remote-tracking branch 'origin/develop' 2023-04-06 18:49:51 -07:00
snipe 74b471bbad Check for more specifics in env vars 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 16:24:46 -07:00
snipe 6ff3745adf Added BM JS 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 16:19:33 -07:00
snipe c683233aa3 Updated production assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2023-04-06 15:00:38 -07:00
snipe bd4757ad7a
Merge pull request #12779 from snipe/features/replace_icheck_with_only_css 
Move from iCheck to pure CSS for radio and checkboxes
 2023-04-06 14:58:33 -07:00
snipe 3d29748f7d Merge remote-tracking branch 'origin/develop' 2023-04-06 13:11:45 -07:00
snipe 2a9f816bfe Prevent wrapping on buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 09:04:56 -07:00
snipe 506021dbe3 Remove iCheck calls, fixed some bootstrap HTML 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 09:03:41 -07:00
snipe f90a6fed91 Downgraded error logging to debug 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 09:02:15 -07:00
snipe 161999fbca Fixed #12772 - use the APP_URL config more consistently 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-05 16:05:40 -07:00
snipe 5e6a6a81d5 Fixed #12776 - larger EOL text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-05 16:00:02 -07:00
snipe 4b4d4e98b6 Use enclosing span for HTML text in grid 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-05 14:10:57 -07:00
slong753 830e3e5594 cleanup 2023-04-05 15:27:28 -05:00
slong753 d56a4e7173 cleanup+formatting 2023-04-05 15:16:46 -05:00
snipe 9af2d0a6de
Merge branch 'develop' into features/replace_icheck_with_only_css 2023-04-05 13:04:12 -07:00
slong753 3929526a57 ok, this works but needs to be tested more 2023-04-04 18:57:51 -05:00
snipe 55857c910a Color picker UI fix 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-04 00:33:05 -07:00
snipe 5919f3843d Small fixes to the color picker (sorry) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-04 00:27:05 -07:00
snipe 6164e8b3fa Changed colors for disabled, removed dupe checkmark 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 23:53:57 -07:00
snipe 0e68b8e9f2 Small fixes for profile edits 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 23:06:09 -07:00
snipe 5df34d0058 Diable SAML submit if in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 22:40:25 -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 aca64dc088 Updated check groups for permissions to skip iCheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 22:38:24 -07:00
snipe 1af7cdb715 Wrapped the image delete into the existing image upload partial 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 22:35:55 -07:00
snipe 2c47b63e91 Small tweaks to overrides 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 19:37:07 -07:00
snipe a7787a6cdc Fixed string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 19:20:58 -07:00
snipe 62c99d4e2e Added check all to user delete 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 19:19:28 -07:00
snipe 858f1c2d12 Updated audit with icheck, removed popover text - need a better solution with layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 19:19:12 -07:00
snipe 76b9608de3 Typo fix 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 19:18:40 -07:00
snipe a861672146 Standardized model bulk blades a little more 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 18:54:46 -07:00
snipe 146976975c Removed <wire:ignore> in model edit for default custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:38:34 -07:00
snipe 58b3369234 Requestable partial - removing icheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:38:12 -07:00
snipe 21448f6adf Model edit - removing icheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:38:02 -07:00
snipe 899b936152 Models bulk edit - removing icheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:37:49 -07:00
snipe 866ba36090 Hardware editing un-icheckification 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:37:34 -07:00
snipe 60d60be0ac Small style specification for notes partial field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:37:16 -07:00
snipe 5ed9385685 Clearer tab name for user info 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:09:25 -07:00
snipe 2c5ddca695 More jquery and form fixes for users 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:08:21 -07:00
slong753 29e3d202fe checking something, quick push 2023-04-03 17:54:31 -05:00
snipe 790f9c2fc4 Updated 2FA to non-icheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 15:38:52 -07:00
snipe b4df9eb586 More checkbox tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 15:33:21 -07:00
snipe 0d050e4016 Updated user edit page with with non-icheck toggles 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 14:55:12 -07:00
snipe 5c89439ba3 Updated login page to use non-icheck 
TODO: override that style for the labels
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 12:18:18 -07:00
snipe 85c0ddf475 Tweaked the col-md to use offset 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 12:17:49 -07:00
snipe 5078b51d4d Removed temp disabled attributes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 11:39:02 -07:00
snipe e066f033c8 First attempt at moving us away from iCheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 10:54:01 -07:00
snipe fcda478712 Merge remote-tracking branch 'origin/develop' 2023-03-30 14:51:23 -07:00
snipe 986c73982e Check if status is set 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-30 14:50:56 -07:00
snipe 080a4c823b Merge remote-tracking branch 'origin/develop' 2023-03-30 14:49:19 -07:00
snipe 1fc0a0f94d Quick fix for bulk restore menu 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-30 14:44:38 -07:00
snipe 048be49c14 Merge remote-tracking branch 'origin/develop' 2023-03-30 14:37:47 -07:00
snipe dfa9c07217
Merge pull request #12760 from akemidx/apple_warranty_link_fix2 
Updating Apple warranty link to match current Apple webpage
 2023-03-30 12:47:09 -07:00
akemidx 0c38257f80 fixing one liner 2023-03-30 15:40:23 -04:00
snipe 9ca5285781
Merge pull request #12762 from spencerrlongg/feature/sc-20304 
Bulk Restore from Deleted
 2023-03-30 12:37:50 -07:00
slong753 b84eaaf61a translations done 2023-03-30 13:48:05 -05:00
snipe b7c09042b0
Merge pull request #12758 from inietov/fixes/call_to_member_function_present_null 
Fixed Call to a member function present() on null [sc-20594]
 2023-03-30 11:01:38 -07:00
snipe 10c1e923dc
Merge pull request #12764 from marcusmoore/fixes/importer-fix 
Fixes potential unwanted overwrites in asset imports
 2023-03-30 09:40:58 -07:00
slong753 d5d50264c3 fix permissions stuff + optional parameter 2023-03-29 19:53:04 -05:00
Ivan Nieto Vivanco d622dbb943 Revert the php codeblock and replace it with a ternary 2023-03-29 18:37:47 -06:00
snipe da940a6bcc Merge remote-tracking branch 'origin/develop' 2023-03-29 17:19:50 -07:00
Marcus Moore 6beb3b551a
Fix typo 2023-03-29 17:01:24 -07:00
slong753 d033733fc0 oops, remove a couple things 2023-03-29 18:30:39 -05:00
slong753 e4c76f454c this is good, just needs translations done in view 2023-03-29 18:24:56 -05:00
slong753 162b70d5a9 wireframed, needs a view and should work 2023-03-29 17:34:36 -05:00
Marcus Moore 863a346d6e
Translate strings 2023-03-29 13:37:14 -07:00
Marcus Moore e05546d1fa
Display helpful messages when importing assets 2023-03-29 13:23:45 -07:00
slong753 b0fa298d8f delete a couple things 2023-03-29 15:14:48 -05:00
slong753 65bbecd145 this all works - could use some eyes 2023-03-29 14:46:31 -05:00
akemidx 6bee4c1a75 Updating Apple warranty link to match current Apple webpage 2023-03-29 15:09:14 -04:00
Marcus Moore 9cc74caa9e
Add wire:model to import form checkboxes 2023-03-29 10:58:25 -07:00
Ivan Nieto Vivanco d7c531e1c7 Checks if user variable exist before using its properties 2023-03-29 10:33:15 -06:00
slong753 032ae4348e custom fields display, need to get saving 
+some clean up
 2023-03-28 21:45:31 -05:00
slong753 804a788a27 initial fetch working 2023-03-28 20:31:24 -05:00
snipe 527c812d04 Use icon for group users header 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 16:39:41 -07:00
snipe 99a05c6401 Merge remote-tracking branch 'origin/develop' 2023-03-28 13:43:24 -07:00
Joe Ferguson 47e18db172
Fix next button string for Step 2 preflight 2023-03-28 10:30:56 -05:00
snipe 03aadc4abf Merge remote-tracking branch 'origin/develop' 2023-03-28 07:20:22 -07:00
snipe 09674c012c Use named route with params 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 07:18:45 -07:00
snipe d2daaf30eb Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-03-28 03:32:04 -07:00
Joe Ferguson cd49f65c0b
User preflight fix translation strings w/ bad path 2023-03-24 15:27:08 -05:00
snipe dcbd216e2c Merge remote-tracking branch 'origin/develop' 2023-03-24 08:29:22 -07:00
snipe 697cb4fe6d Fixed translation string for importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 08:27:53 -07:00
snipe 8a395d63a1 Merge remote-tracking branch 'origin/develop' 2023-03-24 07:23:06 -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
snipe 43c286c61f Merge remote-tracking branch 'origin/develop' 2023-03-24 06:18:10 -07:00
snipe 13ad69ee75
Merge pull request #12713 from inietov/fixes/trying_access_array_offset_null 
Fixed Trying to access array offset on value of type null [sc-20528]
 2023-03-24 04:52:56 -07:00
snipe b91e914a61 Merge remote-tracking branch 'origin/develop' 2023-03-23 10:55:58 -07:00
Marcus Moore fe6295a5e4
Update slack_* properties to webhook_* 2023-03-22 14:43:00 -07:00
Ivan Nieto Vivanco aa8dfcf89f Added a ternary to avoid null offset in array 2023-03-22 13:48:23 -06:00
snipe e8e1ada776
Merge pull request #12669 from akemidx/feature/sc-20178 
#20178: Added Dell and Lenovo to warranty link function
 2023-03-22 00:54:40 -07:00
snipe 58ea1592bb Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/views/livewire/slack-settings-form.blade.php
 2023-03-22 00:26:15 -07:00
snipe 545d023a18 Handled a few more hard-coded strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:56:07 -07:00
snipe 473211397f
Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent 
Livewire importer without subcomponent
 2023-03-21 23:07:04 -07:00
snipe e08327be95 Ability to remove user location from users 
Rework of #9677 - sorry @godmartinez - I suck :(

Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:03:57 -07:00
Brady Wetherington 6fe520a55d Hooked various the contents of the components together 2023-03-21 22:26:32 -07:00
snipe 0418d390f0 Corrected width to 100% 
I should not be allowed to touch computers

Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:25:15 -07:00
snipe b3d5bb75a3 Apply master patch to develop because I am an idiot on the wrong branch 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:23:09 -07:00
snipe 5346ebba94 Make select2 list in slack settings not searchable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:21:21 -07:00
snipe 1fa9f80c03 Correctly disable the select2 in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:18:42 -07:00
snipe e40762cf7f Small anal-retentive spacing/indenting tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 21:00:43 -07:00
snipe 2d3ddd1c7a Fixed default value for webhook_selected 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 20:56:08 -07:00
snipe 637438ccf6 Added select2 to slack settings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 20:00:11 -07:00
snipe 647f47cdfe Check for demo mode in the clear method for the controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 19:27:05 -07:00
snipe a14d1b981d Switched singleton to static helper method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 19:22:18 -07:00
snipe d883084830 Fixed some funky HTML tags 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:58:26 -07:00
snipe 658252125e Added new partial for the form inline “demo mode” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:57:27 -07:00
snipe 35bef6625a
Merge pull request #12703 from Godmartinz/webhook_clean_up 
adds clear and save button, save button updates accordingly
 2023-03-21 17:02:33 -07:00
Godfrey M 2754277068 adds csrf token and missing divs 2023-03-21 16:12:46 -07:00
snipe c229d69cec Added next audit date override in bulk asset edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 16:01:41 -07:00
Godfrey M 3c28242a2e save button updates accordingly 2023-03-21 15:53:09 -07:00
snipe ecb11c3a12 Fixed #12682 - add default location to maintenance report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 13:52:21 -07:00
snipe 4f8542b71b
Merge pull request #12680 from akemidx/clone_accessories 
Clone accessories
 2023-03-21 13:37:04 -07:00
akemidx bb7b655fd2 translating screen reader lines 2023-03-21 16:02:34 -04:00
Brady Wetherington 704a2ad858 WIP: trying to merge two LW components into one, not working yet 2023-03-18 20:31:56 -07:00
snipe e39a75f2cc Fixed min width on select2 bulk menus 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 00:14:57 -07:00
snipe ea4a37d8ef Fixed cancel button alignment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 00:14:09 -07:00
snipe 820ae09a6f Reworked the layout of the confirm merge form a little 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:42:41 -07:00
snipe 28cc8f9d69 Nicer user history display 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:41:43 -07:00
snipe c752e3bb86 Fixed divs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 02:48:41 -07:00
snipe e557f03cc2 Disable submit if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 02:43:33 -07:00
snipe c93096b767 Made the table wider, used icons to compact space 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 23:13:05 -07:00
snipe 736777e1e6 Added email and username to merge user confirmation screen 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 22:48:20 -07:00
snipe 07fbbf5f7f Added merge to user menu 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:18:54 -07:00
snipe 0dfb51f642 User merge blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:18:32 -07:00
akemidx a8e2f72e25 accessory cloning, WITHOUT copying over the image. 2023-03-15 16:55:24 -04:00
akemidx 68094b23b9 moved dell and levono icons to local machine 2023-03-15 15:02:33 -04:00
snipe fdacd5d5b5
Merge pull request #12636 from akemidx/feature/sc-20330/date-on-all-assigned-pdf 
Datestamp on "Print All Assigned" generated form
 2023-03-15 11:31:52 -07:00
akemidx f38f6f57ae fixed localization and formatting. simplified code to remove php snippet 2023-03-15 14:00:29 -04:00
snipe 322fd76353
Merge pull request #12664 from Godmartinz/The_final_lowercase 
The final lowercase in webhooks
 2023-03-14 17:09:20 -07:00
akemidx d50a5d1880 dell and lenovo icons/links added 2023-03-14 16:04:03 -04:00
akemidx a9782b7e00 testing links 2023-03-14 15:26:44 -04:00
akemidx 9c5ee060d3 WIP string/int error 2023-03-14 15:01:56 -04:00
snipe 5a709a83e7 Small UI tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-14 09:38:30 -07:00
Godfrey M 955d8313b2 the final lowercase 2023-03-13 17:14:02 -07:00
Godfrey M 1bd37b49e9 adds translations for webhook names 2023-03-13 16:13:02 -07:00
Godfrey M 7612c5d852 lowercases variables 2023-03-13 15:26:51 -07:00
Godfrey M 11bf3f5285 aligned inputs 2023-03-13 14:06:05 -07:00
Godfrey M b6d105c4f4 removes help text from general integrations 2023-03-13 10:49:41 -07:00
Godfrey M 27a2ed5c79 Merge branch 'develop' into generalize_webhooks 2023-03-13 10:41:08 -07:00
snipe d1d89f872a
Merge pull request #12638 from snipe/fixes/dashboard_category_count_with_show_archived 
Fixed #12635 - dashboard category should not show archived
 2023-03-10 14:19:40 -08:00
Florian 86205bc996
fix translation and adds icon on property reassignable 
Fixing #12647
 2023-03-10 10:36:42 +01:00
akemidx 4533982345 added time of day 2023-03-09 15:11:07 -05:00
snipe fe470b32fc Added icon and import type to header, more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:33:40 -08:00
snipe 474e32ea2a Added translations and formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:33:02 -08:00
snipe b9e4b2a0ba Added some translations, date formatting, and filesize human reporting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:32:45 -08:00
snipe 7f8bdbd252 Added showableAssets() relationship to Category model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 13:01:38 -08:00
snipe 00896a8615 Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 12:51:53 -08:00
akemidx 2a4d30a748 forgot to add datestamp to title of page 2023-03-08 15:09:33 -05:00
akemidx cd9f2f7fb7 datestamp for print all assigned form generation 2023-03-08 14:56:14 -05:00
Godfrey M 15c19a7ab7 silenced Discord option and validation, more translations 2023-03-08 10:35:45 -08:00
snipe 1ed7cd27b4 Lots of HTML/CSS tweaks for better UI 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 00:32:30 -08:00
snipe e143e0c5ee Make the <tr> reflect that it’s active 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 00:32:16 -08:00
snipe 42601fecbf Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased 2023-03-07 21:42:32 -08:00
Brady Wetherington 7c09de3ea8 Re-introduce the 'placeholder' option for our form-helper 2023-03-07 21:38:55 -08:00
snipe 094859cfe8 Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased 2023-03-07 21:38:04 -08:00
snipe 379c5f6790 Reworked the layout for logo upoloads 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 18:54:09 -08:00
Brady Wetherington 09c1298e03 Merge branch 'develop' into livewire_importer_2_squashed_and_rebased 
I'll be taking in the changes to the importer front-end elsewhere
 2023-03-07 18:51:05 -08:00
Brady Wetherington fe699737eb Add improved field-guessing logic; make sure 'do not map' fields work 2023-03-07 18:26:59 -08:00
snipe e60fa15414 Nicer layout, but it kinda dosn’t work :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 17:02:52 -08:00
Godfrey M 35dd0d8def adds generalized webhooks, updates settings page, translations, validation 2023-03-07 15:48:21 -08:00
snipe ea54f540de Dynamically determine target route for expected checkin emails 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 13:42:51 -08:00
akemidx ec5836dab4 cloning accessories first bit 2023-03-07 16:41:48 -05:00
Achmad Fienan Rahardianto 0b3becee7a enable sortable for ID column 2023-03-04 11:27:00 +07:00
Brady Wetherington 7edec26e73 Fixes to layout, improvements to import types, better icons for processing. 2023-03-01 17:18:36 -08:00
Godfrey M aae178a606 gets select working, placeholders update dynamically 2023-03-01 17:10:10 -08:00
snipe 778787db3c Rip out jquery for location parent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-01 15:36:01 -08:00
Godfrey M 354f04534e add multi array, migration, still having issues 2023-03-01 12:30:32 -08:00
Brady Wetherington 9b80e86306 Actually display name of company in Accessories Report 2023-03-01 11:34:30 -08:00
Brady Wetherington 54cb38603b Cleaned up the last of the FIXME's (or downgraded them to TODO's) 2023-02-28 22:34:44 -08:00
Brady Wetherington 5cf66851f7 Finalizing the Livewire Importer! Just going to do some testing now 2023-02-28 21:58:02 -08:00
Brady Wetherington 2f94bf96ff Everything's all wired up; just need to clean up all the FIXME's and stuff 2023-02-28 18:36:52 -08:00
snipe 1f7ae08d76
Merge branch 'develop' into features/make_eol_sortable 2023-02-28 18:05:09 -08:00
snipe af9f9d2523 Convert string to date object for formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 15:48:45 -08:00
akemidx 25f3e4d41a Adding ability to see boolean values when using normal export 2023-02-28 16:01:23 -05:00
Brady Wetherington 53db266b69 WIP: cleaning up extraneous gunk and trying to standardize on one single Livewire Select2 implementation 2023-02-27 14:29:02 -08:00
Brady Wetherington fb201e61f3 More wiring up Livewire to the back-end. 2023-02-27 14:29:02 -08:00
Brady Wetherington e1c8f155bb Wiring up more bits to Livewire 2023-02-27 14:29:02 -08:00
Brady Wetherington 5c97e45d00 WIP - trying to get select2 wired up for importer 2023-02-27 14:29:02 -08:00
Brady Wetherington 8009ee79db I think I have, now, full parity on the base Importer level 
Meaning that you can upload new files, delete old files, have error
messages, have status updates - and all of them seem to work.
 2023-02-27 14:29:02 -08:00
Brady Wetherington 0a085af0a0 Getting the basic wiring of the importer over into Livewire 
WIP: Wiring up more and more of the actions on the importer

Files now upload okay, a little glitchy on the display-side though

add to readmes so i dont forget
 2023-02-27 14:28:59 -08:00
Godfrey M e8fc895e51 "adds variables, but still not working" 2023-02-27 09:19:59 -08:00
snipe 5e6ebb9a65
Merge pull request #12410 from uberbrady/paginate_accessories_report 
Paginate accessories report
 2023-02-23 12:26:17 -08:00
snipe 8e72da42e8
Merge pull request #12406 from akemidx/vip_tag 
Added a checkbox to notate VIP status
 2023-02-23 12:23:29 -08:00
snipe eb6357636a
Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies 
Fix full company scoping in user selects
 2023-02-23 10:36:33 -08:00
Marcus Moore 6c8de181cf
Properly close tag in mail template 2023-02-22 17:52:47 -08:00
Marcus Moore aae2106658
Use existing language translation string 2023-02-22 12:02:14 -08:00
snipe 81cb29db5e
Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report 
Added images to emailed user inventory report [sc-19801]
 2023-02-22 10:38:07 -08:00
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
snipe 1a8fb5bcfe
Merge pull request #12423 from snipe/features/edit_fieldset_name 
Fixed #12418 - added ability to edit custom field names via GUI
 2023-02-01 13:39:39 -08:00
snipe 4a6250a08c
Merge pull request #12409 from akemidx/component_checkin_limit 
Fixed: Checkin limit string translation for components
 2023-02-01 13:37:56 -08:00
akemidx 0ffd40a217 fixing syntax 2023-02-01 16:30:07 -05:00
akemidx 33d819fd41 fixing pr 2023-02-01 16:13:53 -05:00
akemidx 90c1bfe03d fixing pr 2023-02-01 16:12:39 -05:00
akemidx 4d9d73483f fixing pr 2023-02-01 16:09:19 -05:00
akemidx 4e5b8fa213 fixing pr 2023-02-01 16:05:50 -05:00
akemidx a8643e5d35 cleaning up/adding variable 2023-02-01 15:55:16 -05:00
Godfrey M f95a904d90 adds integration button, working on its functionality 2023-02-01 12:08:13 -08:00
snipe f7ae5db4f3
Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories 2023-01-31 19:56:43 -08:00
snipe de1141491a Replaced help text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-31 19:41:42 -08:00
Brady Wetherington 02ca5248b1 Don't append username to the user's name if it's already there 2023-01-31 17:44:09 -08:00
Godfrey M 1e0c58c3cf saves data correctly now 2023-01-31 11:32:05 -08:00
Ivan Nieto Vivanco a7a578bf51 Added head only logo to be used as default in apple-touch-icon 2023-01-31 00:13:44 -06:00
Godfrey M fc044528b8 validation is working, success message appears, database is not updating 2023-01-30 16:10:02 -08:00
akemidx 214a1af61a apostrophe updates 2023-01-30 16:54:23 -05:00
snipe a16604285c Normalize the fieldset form 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:03:07 -08:00
snipe 37f5cfa8ce Added edit button for fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:02:53 -08:00
Godfrey M a63ea560ae adds submit button, getting setAttribute error 2023-01-26 15:17:08 -08:00
akemidx 79d9cff22a translations added for the hardware blades 2023-01-26 16:26:31 -05:00
Godfrey M a69cb6204a adds rest of inputs, and corrects Data binding 2023-01-25 16:22:34 -08:00
Godfrey M 2e22eeade5 adds one input 2023-01-25 14:29:20 -08:00
akemidx 53d8008a5f Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag 2023-01-25 17:14:29 -05:00
akemidx b363524305 vipuser label updated to vip 2023-01-25 15:58:44 -05:00
snipe 4c3354b778
Merge branch 'develop' into vip_tag 2023-01-24 20:29:43 -08:00
Brady Wetherington b00333c9f5 Merge remote-tracking branch 'upstream/develop' into develop 2023-01-24 17:36:39 -08:00
Brady Wetherington c9f0f5fe8b Change Accessories report to use server-side pagination from URL 2023-01-24 17:35:44 -08:00
akemidx 3ba79600fb checkin limit for the components checkin 2023-01-24 18:17:49 -05:00
akemidx cafe8f3074 notification for slack message 2023-01-24 16:20:20 -05:00
akemidx 596846a94a Add VIP Checkbox 2023-01-24 15:29:27 -05:00
Godfrey M 0f8ee22053 Creates Slack Setting Form 2023-01-24 09:25:05 -08:00
snipe 7a9ea91be0
Merge pull request #12387 from snipe/fixes/inconsistent_UI_for_image_delete 
Updated - Refactored ImageHandler request to be more re-usable, and checkboxes with missing `minimal` class for iCheck
 2023-01-23 21:39:55 -08:00
cram42 c2c009a018
Merge branch 'develop' into develop 2023-01-24 09:53:42 +08:00
akemidx 25996cbe03 translating the quick info printed out on accept x eula blades 2023-01-23 16:18:21 -05:00
snipe 4104d7260f Include new eol date picker blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:55:31 -08:00
snipe 3587017591 Updated EOL date in view blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:55:19 -08:00
snipe 8040d08e8c Removed formatter from EOL date 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:54:37 -08:00
snipe abad579306 Added eol date picker 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:45:33 -08:00
snipe 72295c093a Add CSS to the div to correct the weird indenting - fixes #12388 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:24:23 -08:00
snipe 2dc1182582 Don’t offer the delete option if there is no avatar currently 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:20:26 -08:00
snipe 93ad0d02b9 Use fieldname for aria labels too 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 18:20:02 -08:00
snipe 3674f46ce0 Added arial labels 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 16:42:44 -08:00
snipe cfa342c81a Updated HTML for “standard” image edit/delete 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 16:23:04 -08:00
snipe 563a252d18 Updated checkboxed with missing minimal class for iCheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:57:52 -08:00
snipe 2bdf3d3f44 Missed a few strong HTML tags 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:44:10 -08:00
snipe 56090bc645 Re-ordered notes to be more consistent, fixed missing iCheck class 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:38:35 -08:00
snipe fd73bee850 Fixed hardcoded string and added new checkout count to accessory view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-21 14:38:05 -08:00
Marcus Moore 0fa956403c
Fix row divider overflow 2023-01-19 14:16:28 -08:00
Ivan Nieto Vivanco f045008237 Add index to deleteFile() call, so it knows what element delete 2023-01-19 13:04:49 -06:00
snipe fa9116b184
Merge pull request #12369 from snipe/features/add_byod_to_assets 
Added BYOD to assets
 2023-01-18 16:09:45 -08:00
Marcus Moore c089f6eff2
Reference the accessory instance instead of the model 2023-01-18 13:48:01 -08:00
Marcus Moore e506ed7950
Remove extra quote 2023-01-18 13:42:09 -08:00
Marcus Moore 07744ca7bd
Reference the consumable instance instead of the model 2023-01-18 13:41:58 -08:00
snipe 0c39c7a53d Updated blades to add byod as a “status” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:25:46 -08:00
snipe fce620b54f Added byod to blades 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:11:02 -08:00
Marcus Moore ca1198ceb2
Constrain the bottom bar to the content window 2023-01-18 12:55:20 -08:00
Marcus Moore b31e000165
Have Info and History tables in accessory show page span entire width of row 2023-01-18 12:54:52 -08:00
Godfrey M 7ce230fadc missed a few renames 2023-01-18 08:57:59 -08:00
Marcus Moore 5282ca47b3
Allow users with consumables.files ability to upload files for consumables 2023-01-17 17:16:50 -08:00
Marcus Moore 1f12137245
Close divs in correct location 2023-01-17 17:09:55 -08:00
Marcus Moore 6c89f08193
Register the accessories.files ability and allow users with the ability to upload files for accessories 2023-01-17 16:59:50 -08:00
Marcus Moore 1fef992fa8
Allow users with components.files ability to upload files for components 2023-01-17 15:58:11 -08:00
snipe f50b622eb8 Disallow editing of category type once created, added help text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 16:15:40 -08:00
snipe 62bf7b1bce Merge remote-tracking branch 'origin/develop' 2023-01-10 01:56:27 -08:00
snipe c5c37fa95f Fixed copypasta 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 01:54:26 -08:00
snipe 9dc016aecc Fixed issue where assets sidenav would collapse if custom status label is selected 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 01:31:00 -08:00
snipe e67bd5a275 Merge remote-tracking branch 'origin/develop' 2023-01-09 16:00:33 -08:00
snipe 8d35583634
Merge pull request #12324 from snipe/features/add_username_to_asset_list 
Added username to display in asset listings
 2023-01-09 16:00:01 -08:00
snipe b39a9e0fe1 Merge remote-tracking branch 'origin/develop' 2023-01-09 15:54:04 -08:00
Brady Wetherington cbffd105a2 Fix LDAP default group feature 2023-01-09 15:23:19 -08:00
snipe a57315aed5 Added username to display in asset listings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 12:58:58 -08:00
snipe 91d0c383df Production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:47:55 -08:00
snipe e05764ac34 Truncate URL with ellipsis if too long 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:42:26 -08:00
snipe 4d0fc99773 Merge remote-tracking branch 'origin/develop' 2023-01-05 14:19:51 -08:00
snipe ace73acba1
Merge pull request #12263 from Godmartinz/gh12211_label_padding_adjustment 
Fixed: page-break and padding at the end of document for labels
 2023-01-05 09:59:35 -08:00
Godfrey M 301c4fda6e fixes conflicts 2023-01-05 09:55:25 -08:00
snipe 6d3c5e0659
Merge pull request #12264 from Godmartinz/gh12253_display_notes_accessories 
Added: notes to the accessories tab for user detail view
 2022-12-21 19:04:11 -08:00
snipe a6c7471bf5 Merge remote-tracking branch 'origin/develop' 2022-12-20 15:11:36 -08:00
Brady Wetherington 75a757d6f5 There was a bug with select-all where some bits didn't quite work 2022-12-20 14:57:58 -08:00
Godfrey M e791e6592a adds notes to the accessories tab under users 2022-12-20 10:37:19 -08:00
Godfrey M 38575e93e8 fixes the rules for adding page-break and padding at the end of document 2022-12-20 09:45:41 -08:00
snipe d0c5ba70f6
Merge pull request #12242 from inietov/features/add_purchase_cost_column 
Added `purchase_cost` to user's default view [sc-19680]
 2022-12-15 12:42:29 -08:00
Ivan Nieto Vivanco d9a21cce00 Add other items' purchase_cost columns to the same permission 2022-12-15 14:12:05 -06:00
snipe 3e7975b2c3
Merge pull request #12250 from akemidx/grey_out_pw_reset_button 
Fixed: Grey out pw reset button for consistency
 2022-12-15 11:25:53 -08:00
akemidx d870bc3b02 nested if loop 2022-12-15 14:19:51 -05:00
snipe 227fef76ee
Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group 
Adds a permission group selection for directory sync
 2022-12-15 11:06:53 -08:00
Godfrey M 2e228ccb0b redid a few things. should be good now :) 2022-12-15 10:45:42 -08:00