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 |
|
Ivan Nieto Vivanco
|
064f4b3fc6
|
Fix typo in language files
|
2022-06-07 16:30:18 -05:00 |
|
snipe
|
5458676ead
|
Default to v3 of LDAP on settings save
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-06 21:00:22 -07:00 |
|
snipe
|
8337628323
|
Set elvis operator to ensure ldap version is 3 if null
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-06 20:57:18 -07:00 |
|
snipe
|
7faaa4ce24
|
Merge pull request #11263 from inietov/fixes/dont_save_update_action_if_nothings_changed
Fixes log update action even if no changes are made to assets [sc-19131]
|
2022-06-06 20:06:19 -07:00 |
|
snipe
|
9583a72016
|
Merge pull request #11262 from snipe/fixes/11093_use_true_false_in_custom_fields_fieldsets
Fixed #11093 - Return true/false for custom fields/fieldsets required value in API
|
2022-06-06 20:04:52 -07:00 |
|
snipe
|
e0102ddbf0
|
Fixes #11093 Return true/false for custom fields/fieldsets required in API
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-06 20:03:20 -07:00 |
|
Ivan Nieto Vivanco
|
1030ad9a27
|
Early returns if no change is made in the Asset so the 'update' action doesn't log
|
2022-06-06 22:00:05 -05:00 |
|
snipe
|
ab8dcdcc40
|
Merge remote-tracking branch 'origin/master' into develop
|
2022-06-06 19:35:29 -07:00 |
|
snipe
|
773997a492
|
Merge pull request #11261 from snipe/features/11255_add_location_2_to_locations_listing
Fixed #11255 - add address 2 field to locations listing
|
2022-06-06 19:35:07 -07:00 |
|
snipe
|
8333c80b7a
|
Added address2 to column selector for locations listing
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-06 19:31:08 -07:00 |
|
snipe
|
96644ab6b9
|
Merge pull request #11259 from inietov/fixes/history_issues
Fixes some issues in the asset observer
|
2022-06-06 18:25:05 -07:00 |
|
Ivan Nieto Vivanco
|
f977c53ecb
|
Fixes some issues in the asset observer
|
2022-06-06 19:14:32 -05:00 |
|
Godfrey M
|
8c1843b351
|
updates colors in light color modes
|
2022-06-06 11:40:57 -07:00 |
|
snipe
|
c9e86ac194
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-06 10:23:37 -07:00 |
|
snipe
|
f7449921e9
|
Merge pull request #11253 from snipe/features/nicer_locations_ui
Nicer locations UI
|
2022-06-06 10:23:04 -07:00 |
|
snipe
|
5f79534f4a
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-05 22:44:53 -07:00 |
|
snipe
|
3bcd5d94d6
|
Merge pull request #11254 from snipe/fixes/11224_only_show_possible_options_in_bulk_menu
Fixed #11224 - only show menu options if the user is allowed
|
2022-06-05 22:44:26 -07:00 |
|