DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14860 commits 101 branches 268 tags 288 MiB
Commit graph

335 commits

Author SHA1 Message Date
Brady Wetherington f64b0d3818 Merge branch 'develop' into snipeit_v7_laravel10 2023-11-14 16:00:29 +00:00
Robert-Azelis 309f30f630
Update view.blade.php 
display marker if date of EOL is expired and show real EOL rate as diff between purchase date and eol date
 2023-10-22 18:38:59 +02:00
Godfrey M 7bda5c06de fixes the bulk edit button on Asset tab 2023-10-18 10:46:47 -07:00
snipe cd3b4754e8
Merge pull request #13704 from Godmartinz/feature/sc-23571_v2 
Added a check-in button on components tab of Asset view
 2023-10-05 14:28:37 +01:00
Godfrey M dee36fc294 adds component checkin to asset tab 2023-10-03 12:30:08 -07:00
snipe 129e9b90dc
Merge pull request #13585 from spencerrlongg/eol_2 
Standardize Asset EOL Date
 2023-10-02 16:09:22 +01:00
snipe bb7a41628a Fixed #13662 - added clipboard.js 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 15:06:55 +01: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
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 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
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
snipe c21a7db3c1 Moved warranty into manufactuer’s section 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-15 10:45:36 +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
akemidx 1163af3c10 change to make sure department actually exists 2023-07-12 15:57:44 -04:00
snipe a569a99e61 Used inline markdown in views 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-12 16:57:04 +01:00
Ivan Nieto Vivanco e0df8cc4aa Add admin role to show encrypted customfield values 2023-07-11 17:21:32 -06:00
akemidx d0212d4bda formatting fix 2023-06-29 15:39:19 -04: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
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
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
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
akemidx 537aa04c9a
Merge branch 'develop' into delete_asset_from_view_page 2023-05-10 09:30:54 -04:00
snipe ec76de607b Final google login tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 03:08:29 -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 60515f1262 Show signature column regardless of “require sig” state 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-04 10:56:35 -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
akemidx ad7a1d6c3b edits from Github comments 2023-05-01 15:50:48 -04: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 99ef435d40 Fixed translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 18:32:38 -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 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
akemidx 16a5a883e5 new request, preparing support_url for validation 2023-04-20 16:34:25 -04:00
Godfrey M bd212b3108 adds component costs to asset view 2023-04-19 16:35:06 -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
akemidx 0a993b2aa1 added external link icon to warranty link 2023-04-12 18:52:21 -04: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
akemidx 0c38257f80 fixing one liner 2023-03-30 15:40:23 -04:00
akemidx 6bee4c1a75 Updating Apple warranty link to match current Apple webpage 2023-03-29 15:09:14 -04:00
akemidx bb7b655fd2 translating screen reader lines 2023-03-21 16:02:34 -04:00
akemidx 68094b23b9 moved dell and levono icons to local machine 2023-03-15 15:02:33 -04: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
snipe 1f7ae08d76
Merge branch 'develop' into features/make_eol_sortable 2023-02-28 18:05:09 -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
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
akemidx 37ce68af5b once again fixing an apostrophe 2023-02-02 15:54:05 -05:00
akemidx 79d9cff22a translations added for the hardware blades 2023-01-26 16:26:31 -05:00
snipe 3587017591 Updated EOL date in view blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-22 00:55:19 -08:00
Marcus Moore 0fa956403c
Fix row divider overflow 2023-01-19 14:16:28 -08:00
snipe fce620b54f Added byod to blades 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-18 13:11:02 -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 389ec3a3cb
Merge pull request #12247 from Godmartinz/gh12225_serial_added_to_components 
adds serial to components tab of assets
 2022-12-13 12:57:50 -08:00
Godfrey M 6a72c344b7 removed the cuddlers 2022-12-13 12:32:30 -08:00
Godfrey M 4442b446b9 adds serial to components tab of assets 2022-12-13 10:30:37 -08:00
snipe c432fb9d70
Merge pull request #12181 from Godmartinz/gh12163_asset_age 
Adds asset age to asset index and asset view pages
 2022-12-13 10:28:17 -08:00
snipe 43acd3b488 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-07 13:11:17 -08:00
Godfrey M 078e7281cd adds asset age to asset view 2022-11-28 10:45:58 -08:00
snipe 60d7128a5e Replace error suppression with better logic 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-15 17:41:57 +00:00
snipe 236684ec92 Fixed model file image path/variable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 14:12:49 -07:00
Ivan Nieto Vivanco ab0c5bcd9d Add precision parameter to the diffForHumans() Carbon function to report 2022-10-12 12:16:13 -05:00
snipe 62ad3fad1c Remove DL button if file doesn’t exist 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 16:11:27 -07:00
snipe eb1e287c15 Better handle missing files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 16:08:13 -07:00
snipe 1885e73704 Ignore warning icon if no purchase date 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 15:42:47 -07:00
snipe 24910433a1 Fixed 500 when depreciation is set but no purchase_date 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 15:39:47 -07:00
snipe 72feaee6c0 Added Applecare lookup link if manufacturer is apple 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-14 19:43:48 -07:00
David Sferruzza f60ea9581d
Fixed #11742: display correct file sizes when using S3(-like) storage 2022-08-28 12:07:14 +02:00
snipe af34fc207c Suppress error output if file doesn’t exist on server 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 13:47:56 -07:00
snipe da1c1dbdd9 Added warning icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:19:08 -07:00
snipe 56b6904564 Added time difference 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:13:02 -07:00
snipe b035003546 Handled hardware route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 15:59:54 -07:00
snipe 33de45d8fb Swirtched to conditionally adding the nbsp; that the table needs for proper layout if cell is empty 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-29 00:57:20 -07:00
snipe 723454b04d Changed model file icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 16:17:35 -07:00
snipe ed95adb45c Show model files on hardware page 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-28 16:17:46 -07:00
snipe a7a61a3620 Fixed #11351 - add link on asset view to order number 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 11:07:54 -07:00
snipe a111482217 Use number_format on badges 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-15 14:59:06 -07:00
snipe 5fe1078013 Squashed commit of the following: 
commit a011b07d99
Merge: b392ed269 6059e9e11
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:52:50 2022 -0700

    Merge pull request #11315 from snipe/features/adds_fullscreen_option_to_tables

    Added fullscreen option to tables

commit b392ed269b
Merge: 693043e64 e6d792bdf
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:52:41 2022 -0700

    Merge pull request #11316 from snipe/fixes/smaller_padlock_on_table_header

    Tweaked CSS for smaller padlock

commit 6059e9e119
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:49:00 2022 -0700

    Added fullscreen option to tables

    Signed-off-by: snipe <snipe@snipe.net>

commit e6d792bdf7
Author: snipe <snipe@snipe.net>
Date:   Tue Jun 14 17:43:12 2022 -0700

    Tweaked CSS for smaller padlock

    Signed-off-by: snipe <snipe@snipe.net>

Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 17:54:18 -07:00
Ivan Nieto Vivanco d2fc27e21d Add formatted date to EOL field in asset detailed view 2022-06-07 18:22:09 -05:00
snipe 8c64e7359a Added signature column, removed stored_eula_file column 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe 5f1f6baee9 Fixed unrelated typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 10:19:12 -07:00
snipe 3a31104b5c Fixed #11052 - add file sizes to upload displays 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 19:33:14 -07:00
Godfrey Martinez fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf 2022-03-22 10:10:56 -07:00
snipe 42220cc566
Merge pull request #10809 from inietov/fixes/customfields_boolean_format_not_saving 
Fixes Customfields with boolean format not saving [ch-9973]
 2022-03-19 22:10:54 +00:00