DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 02:24:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
9405 commits 96 branches 267 tags 295 MiB
Commit graph

9405 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 3e8837dd6e Bumped dev branch to 6.0.3 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 22:13:18 -07:00
snipe ea1ff1e8bb Bumped version to 6.0.3 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 22:12:40 -07:00
snipe a7b155108d Merge remote-tracking branch 'origin/develop' 2022-06-13 22:07:13 -07:00
snipe 44c0c1bf0e
Merge pull request #11301 from snipe/features/models_view_in_categories 
Added models view (and bulk edit) in category detail view
 2022-06-13 21:45:43 -07:00
snipe 7cd35a80b6 Updated assets for production 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:52:47 -07:00
snipe e8973f08b5 Added a back button 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:47:35 -07:00
snipe dd9c9520fb Correctly filter by category_id 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:42:21 -07:00
snipe aec033d8d2 Use better phrasing for tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:33:37 -07:00
snipe 5496b62b33 Split categories into two tabs if the type = asset 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:30:50 -07:00
snipe e393e2eb4b Fixed issue in BS tables where uncheck-all then checking a few would not uncheck properly 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:30:35 -07:00
snipe 10781a6e4b Use new bulk edit partial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:29:17 -07:00
snipe 5a86004081 Created new models bulk edit partial 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 20:29:08 -07:00
snipe 91ade1f33e Merge remote-tracking branch 'origin/develop' 2022-06-13 20:02:52 -07:00
snipe eaecf8137a Updated assets for develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 19:52:27 -07:00
snipe 92bb8fac32 Removed log statement 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 19:49:14 -07:00
snipe d4a7811078
Merge pull request #11282 from Godmartinz/new_Yellow_skin 
redone none dark mode yellow skin
 2022-06-13 19:48:24 -07:00
snipe cb8dbcc172
Merge pull request #11281 from Godmartinz/chore_dark_mode_color_clean_up 
cleans up dark modes
 2022-06-13 19:48:15 -07:00
snipe 495e68d23c
Merge pull request #11258 from Godmartinz/bug/sc-19123/link-colors-slightly-different-settings 
Fixed colors in light color skins
 2022-06-13 19:48:05 -07:00
snipe 20a0c4e3b5
Merge pull request #11272 from inietov/fixes/date_localization_in_customfields 
Fixes #8143 Date localization not working on custom fields
 2022-06-13 19:47:20 -07:00
snipe 4d773829f8
Merge pull request #10988 from bestlong/bestlong-patch-1 
Ensure schedule analysis job never runs on forked repos
 2022-06-13 19:45:36 -07:00
snipe bcb9804be8 Added a little more context to mail template 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 19:44:18 -07:00
snipe 5e59fa2598 Default to $snipeSettings->site_name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 19:29:46 -07:00
snipe 6ea722d41e
Merge pull request #11271 from inietov/fixes/bulk_delete_not_checking_assignedto_type 
Fix typo in language files
 2022-06-13 19:24:08 -07:00
snipe 66346684a9
Merge pull request #11288 from snipe/fixes/set_crons_as_app_user_in_installer 
Fixes - set crons as app user in installer
 2022-06-13 19:18:55 -07:00
snipe 9731a31cb6 Merge remote-tracking branch 'origin/develop' 2022-06-13 18:37:18 -07:00
snipe ef3e016667
Merge pull request #11300 from snipe/fixes/fa_map_icon_in_chrome 
Fixed font-awesome leading class
 2022-06-13 18:37:04 -07:00
snipe 93e4d23143 Changed font-awesome leading class 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-13 18:36:13 -07:00
snipe 0153a37cd7
Merge pull request #11264 from snipe/fixes/set_default_ldap_version 
Fixed default ldap version if not specified
 2022-06-13 17:14:57 -07:00
snipe cce5846018 Squashed commit of the following: 
commit a070f7cd5e
Merge: 166f52630 4c1104147
Author: snipe <snipe@snipe.net>
Date:   Thu Jun 9 17:23:05 2022 -0700

    Merge pull request #11291 from snipe/fixes/regression_missing_restore_command

    Fixed regression: missing restore option for assets via API

commit 4c11041477
Author: snipe <snipe@snipe.net>
Date:   Thu Jun 9 17:17:38 2022 -0700

    Fixed regression: missing restore option for assets via API

    Signed-off-by: snipe <snipe@snipe.net>

Signed-off-by: snipe <snipe@snipe.net>
 2022-06-09 17:23:50 -07:00
snipe a070f7cd5e
Merge pull request #11291 from snipe/fixes/regression_missing_restore_command 
Fixed regression: missing restore option for assets via API
 2022-06-09 17:23:05 -07:00
snipe 4c11041477 Fixed regression: missing restore option for assets via API 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-09 17:17:38 -07:00
snipe 166f526302
Merge pull request #11290 from inietov/fixes/asset_observer_fails_checkout_on_creating 
Fixes observer fails when creating and assigning a new asset
 2022-06-09 16:13:12 -07:00
Ivan Nieto Vivanco f8718ffc1e Fixes observer fails when creating and assigning asset 2022-06-09 18:08:04 -05:00
snipe 31e4d3b725 Added second run_as_app_user 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-09 14:31:02 -07:00
snipe a766572a2f Set crons as app user for installer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-09 14:21:38 -07:00
snipe 6a8824a467
Merge pull request #11286 from inietov/fixes/return_element_type_of_customfield 
Fixes #11092 Add element type of customfield to API response
 2022-06-09 11:40:09 -07:00
Ivan Nieto Vivanco 0c3972d7b7 Add spaces to the code for consistency 2022-06-09 13:02:31 -05:00
Ivan Nieto Vivanco 4a0eb2b3f1 Add element type of customfield to API response 2022-06-09 12:57:20 -05:00
Godfrey M b3559ac74e redone none dark mode yellow skin 2022-06-08 13:59:46 -07:00
Godfrey M 4252bd2348 cleans up dark modes 2022-06-08 13:17:16 -07:00
snipe 728338bfa8
Merge pull request #10824 from inietov/fixes/accessories_consumables_negative_numbers_develop 
Fixes Accessories total quantity shows a negative number for develop branch
 2022-06-08 10:53:57 -07:00
snipe df8834fd88
Merge pull request #11278 from Godmartinz/bug/sc-19134/possible-missing-wrong-translations-in-ldap 
fixes translation references in the users ldap blade
 2022-06-08 10:47:03 -07:00
Godfrey M c8bc0eff11 fixes translation references in the users ldap blade 2022-06-08 09:52:55 -07:00
snipe 8b6e869215
Merge pull request #11276 from snipe/fixes/added_bulk_data_attributes_to_manufacturers 
Added new JS data attributes for assets in manufacturers
 2022-06-08 04:19:38 -07:00
snipe 063893c109 Added new JS data attributes for assets in manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-08 04:18:05 -07:00
Ivan Nieto Vivanco 44f4f20187 Only fix typo in 'en' file 2022-06-07 19:09:59 -05:00
Ivan Nieto Vivanco 792b18f845 Return language files to previous state 2022-06-07 19:09:03 -05:00
snipe 0671e478cd
Merge pull request #11273 from inietov/fixes/eol_without_specified_date_format 
Fixes EOL field doesn't have date formatter applied
 2022-06-07 17:01:46 -07:00
Ivan Nieto Vivanco d2fc27e21d Add formatted date to EOL field in asset detailed view 2022-06-07 18:22:09 -05:00
Ivan Nieto Vivanco 740f27198f Evaluate if a custom field is a Date to present it with the correct format 2022-06-07 18:00:46 -05:00