From b11a4f66491051b1de0726507f85d980a31efab9 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Wed, 10 Apr 2019 15:26:17 +0530 Subject: [PATCH] v1.10.5 updates update Fixes testclasses Apply fixes from StyleCI Update .travis.yml Revert "Update .travis.yml" This reverts commit 462dd1cb44402f6cbcb516ff17e48d1d562e98e2. --- DB/demodatabase.sql | 2 +- DB/dummy-data.sql | 2 +- config/app.php | 2 +- release-notes.txt | 5 +++++ .../themes/default1/agent/helpdesk/ticket/timeline.blade.php | 4 ++-- tests/ExampleTest.php | 2 ++ tests/TestCase.php | 4 +++- 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/DB/demodatabase.sql b/DB/demodatabase.sql index 36876f533..b944ce8af 100644 --- a/DB/demodatabase.sql +++ b/DB/demodatabase.sql @@ -1457,7 +1457,7 @@ CREATE TABLE `settings_system` ( -- INSERT INTO `settings_system` (`id`, `status`, `url`, `name`, `department`, `page_size`, `log_level`, `purge_log`, `api_enable`, `api_key_mandatory`, `api_key`, `name_format`, `time_farmat`, `date_format`, `date_time_format`, `day_date_time`, `time_zone`, `content`, `version`, `created_at`, `updated_at`) VALUES -(1, 1, '', '', '1', '', '', '', 0, 0, '', '', NULL, NULL, 1, '', 32, '', '1.10.4', '2016-12-13 03:19:29', '2016-12-13 03:19:29'); +(1, 1, '', '', '1', '', '', '', 0, 0, '', '', NULL, NULL, 1, '', 32, '', '1.10.5', '2016-12-13 03:19:29', '2016-12-13 03:19:29'); -- -------------------------------------------------------- diff --git a/DB/dummy-data.sql b/DB/dummy-data.sql index 36876f533..b944ce8af 100644 --- a/DB/dummy-data.sql +++ b/DB/dummy-data.sql @@ -1457,7 +1457,7 @@ CREATE TABLE `settings_system` ( -- INSERT INTO `settings_system` (`id`, `status`, `url`, `name`, `department`, `page_size`, `log_level`, `purge_log`, `api_enable`, `api_key_mandatory`, `api_key`, `name_format`, `time_farmat`, `date_format`, `date_time_format`, `day_date_time`, `time_zone`, `content`, `version`, `created_at`, `updated_at`) VALUES -(1, 1, '', '', '1', '', '', '', 0, 0, '', '', NULL, NULL, 1, '', 32, '', '1.10.4', '2016-12-13 03:19:29', '2016-12-13 03:19:29'); +(1, 1, '', '', '1', '', '', '', 0, 0, '', '', NULL, NULL, 1, '', 32, '', '1.10.5', '2016-12-13 03:19:29', '2016-12-13 03:19:29'); -- -------------------------------------------------------- diff --git a/config/app.php b/config/app.php index 1627b178b..9e2ca7d03 100644 --- a/config/app.php +++ b/config/app.php @@ -33,7 +33,7 @@ return [ | This tells about aplication current version. | */ - 'version' => 'Community 1.10.4', + 'version' => 'Community 1.10.5', /* |-------------------------------------------------------------------------- | Application Name diff --git a/release-notes.txt b/release-notes.txt index 6821a8c19..9b1e728b7 100644 --- a/release-notes.txt +++ b/release-notes.txt @@ -7,6 +7,11 @@ |_| \__,_| \_/ \___|\___/ |_| |_|\___|_| .__/ \__,_|\___||___/_|\_\ | | |_| +|===================================================== +| v1.10.5 Chrome UI issue fix patch +|===================================================== +Recent updates of Chrome browser introduced an issue in ticket timeline page where the reply threads from users were not visible in chrome browser's latest version. + |===================================================== | v1.10.4 Security patch for Slack channel |===================================================== diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php index b927de8f2..0a4a469a4 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php @@ -709,7 +709,7 @@ if ($thread->title != "") { $('body').css('display', 'block'); setTimeout(function(){ var $iframe = "Id{{$conversation->id}}"; - $('').appendTo(".timeline-body{{$conversation->id}}"); + $('').appendTo(".timeline-body{{$conversation->id}}"); setTimeout(function(){ $('#' + $iframe).contents().find('body').append('{!!$conversation->purify(true)!!}'); }, 100); @@ -730,7 +730,7 @@ if ($thread->title != "") { setTimeout(function(){ $('body').css('display', 'block'); var $iframe = "Id{{$conversation->id}}"; - $('').appendTo(".timeline-body{{$conversation->id}}"); + $('').appendTo(".timeline-body{{$conversation->id}}"); setTimeout(function(){ $('#' + $iframe).contents().find('body').append('{!!$conversation->purify(true)!!}'); }, 100); diff --git a/tests/ExampleTest.php b/tests/ExampleTest.php index a754c9fd2..4e0218f25 100644 --- a/tests/ExampleTest.php +++ b/tests/ExampleTest.php @@ -1,5 +1,7 @@