Skip to content

Commit

Permalink
v1.10.5 updates
Browse files Browse the repository at this point in the history
update

Fixes testclasses

Apply fixes from StyleCI

Update .travis.yml

Revert "Update .travis.yml"

This reverts commit 462dd1c.
  • Loading branch information
Manish Verma authored and Manish Verma committed Apr 10, 2019
1 parent c424736 commit b11a4f6
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 6 deletions.
2 changes: 1 addition & 1 deletion DB/demodatabase.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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');

-- --------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion DB/dummy-data.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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');

-- --------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
| This tells about aplication current version.
|
*/
'version' => 'Community 1.10.4',
'version' => 'Community 1.10.5',
/*
|--------------------------------------------------------------------------
| Application Name
Expand Down
5 changes: 5 additions & 0 deletions release-notes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
|=====================================================
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ class="active"
$('body').css('display', 'block');
setTimeout(function(){
var $iframe = "Id{{$conversation->id}}";
$('<iframe src="javascript:void(0)" id=' + $iframe + ' class="iframe" frameborder="0" scrolling="no" width="100%" style="height:1px"></iframe>').appendTo(".timeline-body{{$conversation->id}}");
$('<iframe src="about:blank" id=' + $iframe + ' class="iframe" frameborder="0" scrolling="no" width="100%" style="height:1px"></iframe>').appendTo(".timeline-body{{$conversation->id}}");
setTimeout(function(){
$('#' + $iframe).contents().find('body').append('<body><style>body{display:inline-block;}</style>{!!$conversation->purify(true)!!}<body>');
}, 100);
Expand All @@ -730,7 +730,7 @@ class="active"
setTimeout(function(){
$('body').css('display', 'block');
var $iframe = "Id{{$conversation->id}}";
$('<iframe src="javascript:void(0)" id=' + $iframe + ' class="iframe" frameborder="0" scrolling="no" width="100%" style="height:1px"></iframe>').appendTo(".timeline-body{{$conversation->id}}");
$('<iframe src="about:blank" id=' + $iframe + ' class="iframe" frameborder="0" scrolling="no" width="100%" style="height:1px"></iframe>').appendTo(".timeline-body{{$conversation->id}}");
setTimeout(function(){
$('#' + $iframe).contents().find('body').append('<body><style>body{display:inline-block;}</style>{!!$conversation->purify(true)!!}<body>');
}, 100);
Expand Down
2 changes: 2 additions & 0 deletions tests/ExampleTest.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?php

namespace Tests;

class ExampleTest extends TestCase
{
/**
Expand Down
4 changes: 3 additions & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
<?php

class TestCase extends Illuminate\Foundation\Testing\TestCase
namespace Tests;

class TestCase extends \Illuminate\Foundation\Testing\TestCase
{
/**
* The base URL to use while testing the application.
Expand Down

0 comments on commit b11a4f6

Please sign in to comment.