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

3201 commits

Author SHA1 Message Date
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
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