lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
15813 commits 1 branch 0 tags 220 MiB
Commit graph

3830 commits

Author SHA1 Message Date
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
akemidx
f71b69a739 adding eol fields 2023-07-26 17:31:06 -04: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
akemidx
499a3debcd this WILL break. i'm back to site not found which is something missing. otherwise the columns are either blank or another value like expected checkin i was using to test a bit 2023-07-11 14:08:55 -04: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