DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11361 commits 101 branches 268 tags 320 MiB
Commit graph

11361 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 5645141f93
Merge pull request #13488 from snipe/fixes/13487_supplier_url_in_listing 
Fixed #13487 - include supplier url in listing
 2023-08-18 15:32:14 +01:00
snipe da2f22d504 Fixed #13487 - include supplier url in listing 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 15:31:15 +01:00
Marcus Moore 8b2716d2b7
Fix update statement 2023-08-17 18:33:01 -07:00
Marcus Moore 56fb45f1ea
WIP: Add last_checkin to assets table 2023-08-17 18:01:26 -07:00
Godfrey M a62876d4bc Adds readable asset history in the action log transformer 2023-08-17 16:14:01 -07:00
snipe 0ee032a10d
Merge pull request #13391 from Godmartinz/ldap_sync_field_clear_bug 
Fixed Ldap sync field clear bug
 2023-08-17 17:45:03 +01:00
snipe 03a01c02c4
Merge pull request #13483 from inietov/fixes/default_locations_advanced_search 
Fixed #13359 Advanced search by Default Location does not work
 2023-08-17 15:15:21 +01:00
Ivan Nieto Vivanco b607a59875 Add query to search default locations in advanced search 2023-08-16 15:04:17 -06:00
snipe 34f2221b02
Merge pull request #13471 from inietov/fixes/components_search 
Fixed #13409 Search in component detail view not working
 2023-08-16 21:59:40 +01:00
snipe b81c6825cf
Merge pull request #13476 from uberbrady/accessry_checkin_fix_develop 
Accessory checkin via API reported wrong target user
 2023-08-16 13:05:54 +01:00
Brady Wetherington 852e9ff311 Accessory checkin via API reported wrong target user 2023-08-16 13:03:37 +01:00
Ivan Nieto Vivanco 92df32dfaa Move a couple assignation of variables inside an else to only execute once 2023-08-15 21:10:48 -06:00
snipe eacbde37e2
Merge pull request #13473 from snipe/fixes/check_for_company_on_labels 
Check that there is a company before trying to get name property
 2023-08-16 01:27:48 +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
snipe 027afa71f1 Check that there is a company before trying to get name property 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-16 01:09:22 +01:00
Ivan Nieto Vivanco 993918f47c Add query to search into the per-component view 2023-08-15 15:31:36 -06: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 297390ae63
Merge pull request #13470 from snipe/fixes/13464_typo_in_accessories_clone 
Fixed #13464 typo in accessories clone
 2023-08-15 20:41:54 +01:00
snipe 01ab360ef3 Fixed accessory clone typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:39:09 +01:00
snipe 1c2f3cd552 Fixed translation typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:39:00 +01:00
snipe bc4a47421a
Merge pull request #13469 from snipe/fixes/missed_one_checkbox_in_label 
Fixed checkboxes for accessibility
 2023-08-15 20:30:39 +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 9af850dbaa Re-apply a change that was dropped 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:27:47 +01:00
snipe 96b616be89 Downgraded TCPDF 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:11:56 +01:00
snipe 2b9f8ce4a6
Merge pull request #13467 from snipe/fixes/more_label_html_tweaks 
Fixes more label html tweaks
 2023-08-15 20:05:03 +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 697dc10d76 More label tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:03:32 +01:00
snipe d47b502d86
Merge pull request #13466 from snipe/fixes/weird_label_engine_layout 
Fixes weird label engine layout
 2023-08-15 18:52:54 +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 64342838fd Return the user to the labels page on save 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 18:48:12 +01:00
snipe 346f243bc0
Merge pull request #13465 from snipe/fixes/parse_error_in_helper 
Fixed unclosed brace
 2023-08-15 18:14:55 +01:00
snipe 443adc50da Fixed unclosed brace 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 18:12:25 +01:00
snipe cebf0e0de1 Add @cram42 as a contributor 2023-08-15 18:07:56 +01:00
snipe e41368daac
Merge pull request #12050 from cram42/develop 
New Label Engine
 2023-08-15 17:58:57 +01:00
Godfrey M d1efca2ae1 fixes conflicts 2023-08-15 09:28:42 -07: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 6f373aed33
Merge pull request #13461 from snipe/localization/new_translations 
Updated language strings from CrowdIn
 2023-08-15 13:22:14 +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
Marcus Moore dc1a8840f1
Ensure empty string is not passed to strpos() 2023-08-14 16:40:34 -07:00
Ivan Nieto Vivanco 96440834bd Move the declinedCheckout function so it don/'t separate the class properties 2023-08-14 16:16:28 -06: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
snipe aa333bcf0b
Merge pull request #13448 from Godmartinz/status-label-translations_fix 
Fixed #13446 - added translations to status label type column
 2023-08-14 22:25:46 +01:00
snipe ba56746f57
Merge pull request #13437 from marcusmoore/feature/improve-user-factory 
Allowed permissions in the user factory to be chained
 2023-08-14 22:23:55 +01:00