DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-30 07:59:50 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11291 commits 102 branches 268 tags 288 MiB
Commit graph

11291 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 24a9deb735 Merge remote-tracking branch 'origin/develop' 2023-08-21 22:35:45 +01:00
snipe 79a4d915db
Merge pull request #13456 from marcusmoore/fixes/auto-incrementing-on-74 
Fixed passing invalid argument to `strpos()`
 2023-08-21 22:25:52 +01:00
snipe 2346bab8ed
Merge pull request #13492 from snipe/features/add_dymo_labelwriter 
Added Dymo labelwriter
 2023-08-18 23:27:37 +01:00
snipe 45898deb1a Don’t 500 if the 1D barcode doesn’t match the format requested - log an error instead 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:18:38 +01:00
snipe ffc7c4e99a use number format to constrain large number displays 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:18:09 +01:00
snipe 1e82c2bfad Changed example asset name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:17:54 +01:00
snipe d12f4564e1 Added Dymo Labelwriter template 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 21:44:12 +01:00
snipe 1dcca14c37 Values are not sortable, so don’t show them as sortable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 21:21:54 +01:00
snipe cb3db51fe0 Merge remote-tracking branch 'origin/develop' 2023-08-18 18:42:11 +01:00
snipe 63f847f125
Merge pull request #13491 from snipe/fixes/remove_border_from_default_label 
Removed the black label from around the default labels
 2023-08-18 18:40:45 +01:00
snipe d56c671410 Removed the black label from around the default labels 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 18:39:00 +01:00
snipe 8e9fa613e3 Merge remote-tracking branch 'origin/develop' 2023-08-18 18:14:40 +01:00
snipe 802651a1b4
Merge pull request #13489 from snipe/fixes/override_0_cols_rows_in_default_for_new_engine 
Make sure the columns and rows can never be 0
 2023-08-18 18:14:01 +01:00
snipe 0cb76a049a Make sure the columns and rows can never be 0 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 18:13:16 +01:00
snipe 384428148b Merge remote-tracking branch 'origin/develop' 2023-08-18 15:32:33 +01:00
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
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 8810059427 Merge remote-tracking branch 'origin/develop' 2023-08-16 01:40:06 +01: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
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 2848465dd2 Merge remote-tracking branch 'origin/develop' 2023-08-15 20:42:36 +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 06ed8b2f2d Merge remote-tracking branch 'origin/develop' 2023-08-15 20:31: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 2ddf5c9a0b
Merge pull request #13463 from uberbrady/fix_api_accessory_checkin 
Accessory checkin via API reported wrong target user
 2023-08-15 19:24:45 +01:00
snipe 949a88e560 Merge remote-tracking branch 'origin/develop' 2023-08-15 18:55:39 +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 28b1461cb4 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/mix-manifest.json
 2023-08-15 18:21:51 +01:00