cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflict fix

Browse Source 
all conflict fixed
This commit is contained in:
Sujit Prasad
2016-08-03 21:19:11 +05:30
parent ffa56a43cb e90c764c88
commit 18af857291
9 changed files with 23 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -3,12 +3,9 @@
example.env
Homestead.yaml
Homestead.json
/app/config/
/app/Plugins/Reseller/
/app/Plugins/
/app/Plugins/ServiceDesk/
/config/app.php
/config/database.php
/config/lfm.php
/nbproject/private/
/node_modules

10
README.md
View File

@@ -17,8 +17,14 @@ Faveo is designed & developed by <a href="http://www.ladybirdweb.com/" target="_
</ul>
<h3><a id="user-content-faveo-user-manual" href="https://github.com/ladybirdweb/faveo-helpdesk#faveo-user-manual" aria-hidden="true"></a>Faveo User Manual</h3>
<p>Check out Faveo Knowledge Base <a href="http://www.ladybirdweb.com/support/knowledgebase" target="_blank">here</a></p>
<h3><a id="user-content-faveo-user-manual" href="https://github.com/ladybirdweb/faveo-helpdesk#faveo-user-manual" aria-hidden="true"></a>Faveo Documentation</h3>
<ul>
<li> <a href="http://www.ladybirdweb.com/support/knowledgebase" target="_blank">Faveo user Manual</a></li>
<li><a href="https://docs.google.com/document/d/1TEUVyFSzlNRIQGHVK88rzBtYbhyk2FNb3TeekjfsXQA/" target="_blank">Faveo API Documentation</a></li>
<li> <a href="https://docs.google.com/document/d/1pXpsQKcTyX5x6H4xA8unYxd5Duw2k94xt7wevTdoF_E/" target="_blank">Faveo Event List</a></li>
<li> <a href="https://docs.google.com/document/d/1PGcpB19Vr42rM_DrCzC3snujzEL8N9Ocy0yewfPNWqU/" target="_blank">Faveo Plugin creation guide</a></li>
</ul>
<h3><a id="user-content-requirements" href="https://github.com/ladybirdweb/faveo-helpdesk#requirements" aria-hidden="true"></a>Requirements</h3>
<p>To run Faveo your host just needs a couple of things:</p>
<ul>

2
app/Http/Controllers/Api/v1/InstallerApiController.php
View File

@@ -98,7 +98,7 @@ class InstallerApiController extends Controller
$ENV['QUEUE_DRIVER'] = 'sync';
$config = '';
foreach ($ENV as $key => $val) {
$config .= "{$key}={$val}\n";
}

5
resources/views/themes/default1/admin/layout/admin.blade.php
View File

@@ -21,17 +21,16 @@
<!-- This controlls the top tabs -->
<link href="{{asset("lb-faveo/css/tabby.css")}}" rel="stylesheet" type="text/css" >
<!-- In app notification style -->
<link href="{{asset('css/notification-style.css')}}" rel="stylesheet" type="text/css">
<link href="{{asset("css/notification-style.css")}}" rel="stylesheet" type="text/css">
<link href="{{asset("lb-faveo/css/jquerysctipttop.css")}}" rel="stylesheet" type="text/css">
<link href="{{asset("lb-faveo/css/editor.css")}}" rel="stylesheet" type="text/css">
<script src="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}" type="text/javascript"></script>
<link href="{{asset("lb-faveo/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.min.css")}}" rel="stylesheet" type="text/css" />
<link href="{{asset("lb-faveo/plugins/datatables/dataTables.bootstrap.css")}}" rel="stylesheet" type="text/css" >
<script src="{{asset("lb-faveo/js/jquery-2.1.4.js")}}" type="text/javascript"></script>
<script src="{{asset("lb-faveo/js/jquery2.1.1.min.js")}}" type="text/javascript"></script>
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>

4
resources/views/themes/default1/agent/layout/agent.blade.php
View File

@@ -24,6 +24,7 @@
<link href="{{asset("lb-faveo/css/jquerysctipttop.css")}}" rel="stylesheet" type="text/css"/>
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<link href="{{asset("lb-faveo/css/editor.css")}}" rel="stylesheet" type="text/css"/>
<link href="{{asset("lb-faveo/css/jquery.ui.css")}}" rel="stylesheet" rel="stylesheet"/>
@@ -97,6 +98,7 @@
<li @yield('Users')><a data-target="#tabB" href="#">{!! Lang::get('lang.users') !!}</a></li>
<li @yield('Tickets')><a data-target="#tabC" href="#">{!! Lang::get('lang.tickets') !!}</a></li>
<li @yield('Tools')><a data-target="#tabD" href="#">{!! Lang::get('lang.tools') !!}</a></li>
</ul>
@else
<?php \Event::fire('service.desk.agent.topbar', array()); ?>
@@ -433,6 +435,7 @@
</footer>
</div><!-- ./wrapper -->
<script src="{{asset("lb-faveo/js/ajax-jquery.min.js")}}" type="text/javascript"></script>
<script src="{{asset("lb-faveo/js/bootstrap-datetimepicker4.7.14.min.js")}}" type="text/javascript"></script>
@@ -444,7 +447,6 @@
<script src="{{asset("lb-faveo/plugins/fastclick/fastclick.min.js")}}" type="text/javascript"></script>
<!-- AdminLTE App -->
<script src="{{asset("lb-faveo/js/app.min.js")}}" type="text/javascript"></script>
<!-- iCheck -->
<script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
<!-- jquery ui -->

4
resources/views/themes/default1/client/layout/client.blade.php
View File

@@ -36,7 +36,6 @@
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
<script src="{{asset("lb-faveo/js/jquery2.1.1.min.js")}}" type="text/javascript"></script>
@yield('HeadInclude')
</head>
@@ -123,6 +122,7 @@
<?php
if (is_object($errors)) {
if ($errors->first('email') || $errors->first('password')) {
?> class="sfHover"
<?php
}
@@ -147,6 +147,7 @@
<?php goto b; ?>
@endif
<div class="alert alert-danger alert-dismissable">
@if(Session::has('error'))
{!! Session::get('error') !!}
@else
@@ -373,6 +374,7 @@
</div>
</footer><!-- #colophon -->
<!-- jQuery 2.1.1 -->
<script src="{{asset("lb-faveo/js/jquery2.1.1.min.js")}}" type="text/javascript"></script>
<!-- Bootstrap 3.3.2 JS -->
<script src="{{asset("lb-faveo/js/bootstrap.min.js")}}" type="text/javascript"></script>

10
resources/views/themes/default1/layouts/admin.blade.php
View File

@@ -69,7 +69,7 @@
<img src="{{ Gravatar::src(Auth::user()->email) }}" class="user-image" alt="User Image">
@endif
<span class="hidden-xs">{!! Auth::user()->first_name." ".Auth::user()->last_name !!}</span>
@endif
@endif
</a>
<ul class="dropdown-menu">
<!-- User image -->
@@ -87,7 +87,7 @@
@endif
</li>
<!-- Menu Footer-->
<li class="user-footer" style="background-color:#1a2226;">
<div class="pull-left">
<a href="{{url('admin-profile')}}" class="btn btn-info btn-sm"><b>Profile</b></a>
@@ -163,14 +163,14 @@
<li @yield('myticket')>
<a href="{{url('ticket/myticket')}}">
<i class="fa fa-user"></i> <span>My Tickets</span>
<small class="label pull-right bg-green">{{count($myticket) }}</small>
</a>
</li>
<li>
<a href="{{url('unassigned')}}">
<i class="fa fa-th"></i> <span>Unassigned</span>
<small class="label pull-right bg-green">{{count($unassigned)}}</small>
</a>
</li>
@@ -257,7 +257,7 @@
<div class="pull-right hidden-xs">
<b>Version</b> 0.1
</div>
<?php
<?php
$company = App\Model\helpdesk\Settings\Company::where('id','=','1')->first();
?>
<strong>Copyright &copy; {!! date('Y') !!} <a href="{!! $company->website !!}">{!! $company->company_name !!}</a>.</strong> All rights reserved. Powered by <a href="http://www.faveohelpdesk.com/" target="blank">Faveo</a>

203
resources/views/themes/default1/layouts/blank.blade.php
View File

@@ -1,203 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title> SUPPORT CENTER | CLIENT PANEL</title>
<meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
<!-- Bootstrap 3.3.2 -->
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<!-- Font Awesome Icons -->
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
<!-- Ionicons -->
<link href="http://code.ionicframework.com/ionicons/2.0.0/css/ionicons.min.css" rel="stylesheet" type="text/css" />
<!-- fullCalendar 2.2.5-->
<link href="{{asset("lb-faveo/plugins/fullcalendar/fullcalendar.min.css")}}" rel="stylesheet" type="text/css" />
<link href="{{asset("lb-faveo/plugins/fullcalendar/fullcalendar.print.css")}}" rel="stylesheet" type="text/css" media='print' />
<!-- Theme style -->
<link href="{{asset("dist/css/AdminLTE.min.css")}}" rel="stylesheet" type="text/css" />
<!-- AdminLTE Skins. Choose a skin from the css/skins
folder instead of downloading all of them to reduce the load. -->
<link href="{{asset("dist/css/skins/_all-skins.min.css")}}" rel="stylesheet" type="text/css" />
<!-- iCheck -->
<link href="{{asset("lb-faveo/plugins/iCheck/flat/blue.css")}}" rel="stylesheet" type="text/css" />
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
<link rel="stylesheet" href="{{asset("dist/css/tabby.css")}}" type="text/css">
<link href="http://www.jqueryscript.net/css/jquerysctipttop.css" rel="stylesheet" type="text/css">
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
<link rel="stylesheet" href="{{asset("dist/css/editor.css")}}" type="text/css">
<script src="ckeditor/ckeditor.js"></script>
<!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
<![endif]-->
@yield('HeadInclude')
</head>
<body class="skin-yellow">
<div class="wrapper">
<header class="main-header">
<a href="../../index2.html" class="logo"><b>SUPPORT </b> CENTER</a>
<?php $company = App\Model\Settings\Company::where('id', '=', '1')->first();?>
@if($company->logo)
<img src="{{asset('dist')}}{{'/'}}{{$company->logo}}" class="logo" alt="User Image" />
@endif
<!-- Header Navbar: style can be found in header.less -->
<nav class="navbar navbar-static-top" role="navigation">
<!-- Sidebar toggle button-->
<a href="#" class="sidebar-toggle" data-toggle="offcanvas" role="button">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav navbar-right">
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<li>
<a href="{{url('auth/login')}}" class="logo"><span>Sign In</span></a>
&nbsp;</li>
<li>
<a href="{{url('auth/register')}}" class="logo"><span>Register</span></a>
</li>
</ul>
</div>
</ul>
</div>
</nav>
</header>
<!-- Left side column. contains the logo and sidebar -->
<aside class="main-sidebar">
<!-- sidebar: style can be found in sidebar.less -->
<section class="sidebar">
<ul class="sidebar-menu">
<li class="header">MAIN NAVIGATION</li>
<li>
<a href="{{url('getform')}}">
<i class="fa fa-envelope"></i> <span>Open A New Ticket</span>
</a>
</li>
<li>
<a href="{{url('checkticket')}}">
<i class="fa fa-th"></i> <span>Check your Ticket</span>
</a>
</li>
</ul>
</ul>
</section>
<!-- /.sidebar -->
</aside>
<!-- Right side column. Contains the navbar and content of the page -->
<div class="content-wrapper">
<section class="content-header">
@yield('PageHeader')
@yield('breadcrumbs')
</section>
<!-- Main content -->
<section class="content">
@yield('content')
</section><!-- /.content -->
<!-- /.content-wrapper -->
</div>
<footer class="main-footer">
<div class="pull-right hidden-xs">
<b>Version</b> 0.1
</div>
<strong>Copyright &copy; {!! date('Y') !!} <a href="{!! $company->website !!}">{!! $company->company_name !!}</a>.</strong> All rights reserved. Powered by <a href="http://www.faveohelpdesk.com/">Faveo</a>
</footer>
</div><!-- ./wrapper -->
<!-- jQuery 2.1.1 -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<!-- Bootstrap 3.3.2 JS -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" type="text/javascript"></script>
<!-- Slimscroll -->
<script src="{{asset("lb-faveo/plugins/slimScroll/jquery.slimscroll.min.js")}}" type="text/javascript"></script>
<!-- FastClick -->
<script src="{{asset("lb-faveo/plugins/fastclick/fastclick.min.js")}}"></script>
<!-- AdminLTE App -->
<script src="{{asset("dist/js/app.min.js")}}" type="text/javascript"></script>
<!-- AdminLTE for demo purposes -->
{{-- // <script src="{{asset("dist/js/demo.js")}}" type="text/javascript"></script> --}}
<!-- iCheck -->
<script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>
<!-- Page Script -->
<script>
$(function() {
//Enable iCheck plugin for checkboxes
//iCheck for checkbox and radio inputs
$('input[type="checkbox"]').iCheck({
checkboxClass: 'icheckbox_flat-blue',
radioClass: 'iradio_flat-blue'
});
//Enable check and uncheck all functionality
$(".checkbox-toggle").click(function() {
var clicks = $(this).data('clicks');
if (clicks) {
//Uncheck all checkboxes
$("input[type='checkbox']", ".mailbox-messages").iCheck("uncheck");
} else {
//Check all checkboxes
$("input[type='checkbox']", ".mailbox-messages").iCheck("check");
}
$(this).data("clicks", !clicks);
});
//Handle starring for glyphicon and font awesome
$(".mailbox-star").click(function(e) {
e.preventDefault();
//detect type
var $this = $(this).find("a > i");
var glyph = $this.hasClass("glyphicon");
var fa = $this.hasClass("fa");
//Switch states
if (glyph) {
$this.toggleClass("glyphicon-star");
$this.toggleClass("glyphicon-star-empty");
}
if (fa) {
$this.toggleClass("fa-star");
$this.toggleClass("fa-star-o");
}
});
});
</script>
<script type="text/javascript">
// $(document).ready(function() {
// $("#content").Editor();
// });
// </script>
<!-- // <script src="../plugins/jQuery/jQuery-2.1.3.min.js"></script> -->
<script src="{{asset("dist/js/tabby.js")}}"></script>
<!-- // <script src="{{asset("dist/js/editor.js")}}"></script> -->
<!-- CK Editor -->
<script src="{{asset("//cdn.ckeditor.com/4.4.3/standard/ckeditor.js")}}"></script>
<script src="{{asset("//cdn.ckeditor.com/4.4.3/full/ckeditor.js")}}"></script>
<script src="{{asset("lb-faveo/plugins/filebrowser/plugin.js")}}"></script>
@yield('FooterInclude')
</body>
</html>

1
resources/views/themes/default1/layouts/login.blade.php
View File

@@ -56,6 +56,7 @@
<script src="{{asset("lb-faveo/js/ajax-jquery.min.js")}}" type="text/javascript"></script>
<script src="{{asset("lb-faveo/js/bootstrap.min.js")}}" type="text/javascript"></script>
<!-- iCheck -->
<script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>