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

3745 commits

Author SHA1 Message Date
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 23237e5cd3 Removed unused translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-22 12:50:32 +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
Godfrey M 5076b45a0d adds id to history info 2023-08-21 13:40:39 -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 d73d15b8a2 Added form macro for name format 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:59 +01:00
snipe 8660d41aa3 Changed width of locale field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:45 +01:00
snipe c39579b170 New strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:25 +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 1c2f3cd552 Fixed translation typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:39:00 +01:00
snipe 0763b5135d Fixed checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:28:16 +01:00
snipe 253975ce72 Updated translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:27:55 +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
snipe d1ce1b6f18 Updated language strings from CrowdIn 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 13:21:35 +01:00
Ivan Nieto Vivanco 71cb16118d Change error string for a better (?) one 2023-08-14 20:52:00 -06: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 bd4061e023 Change text on dropdown 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 08:18:56 +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
akemidx e289e95721 no ? needed 2023-07-24 17:22:10 -04:00
akemidx b082d27c42 removing :item 2023-07-24 17:12:12 -04: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
snipe 7f761000b4 Use slightly less terrifying and more accurate language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-21 14:46:39 +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 33fd904c18
Merge pull request #13330 from akemidx/merge_users_typo 
merge users page typo fix
 2023-07-19 10:26:57 +01:00
akemidx 064e696521 merge users page typo fix 2023-07-18 15:33:33 -04: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
snipe bbbeaaee2b
Merge pull request #13232 from Godmartinz/labels_overlapping_issue 
fixed barcode and info from overlapping
 2023-06-29 21:23:31 +01: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
Godfrey M f83effbb85 removed unnecessary css rule 2023-06-29 11:25:40 -07:00
Godfrey M d4cddebba5 fixes custom fields labels being unreadable 2023-06-29 11:21:21 -07: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