diff --git a/.gitignore b/.gitignore index bfc8717cb..fecabceb8 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/README.md b/README.md index 90806a09d..e606c703d 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,14 @@ Faveo is designed & developed by Faveo User Manual -

Check out Faveo Knowledge Base here

+

Faveo Documentation

+ +

Requirements

To run Faveo your host just needs a couple of things:

@else @@ -433,6 +435,7 @@ + @@ -444,7 +447,6 @@ - diff --git a/resources/views/themes/default1/client/layout/client.blade.php b/resources/views/themes/default1/client/layout/client.blade.php index 88927d7da..c11cda367 100644 --- a/resources/views/themes/default1/client/layout/client.blade.php +++ b/resources/views/themes/default1/client/layout/client.blade.php @@ -36,7 +36,6 @@ - @yield('HeadInclude') @@ -123,6 +122,7 @@ first('email') || $errors->first('password')) { + ?> class="sfHover" @endif
+ @if(Session::has('error')) {!! Session::get('error') !!} @else @@ -373,6 +374,7 @@
+ diff --git a/resources/views/themes/default1/layouts/admin.blade.php b/resources/views/themes/default1/layouts/admin.blade.php index f4e7488f4..005c269b4 100644 --- a/resources/views/themes/default1/layouts/admin.blade.php +++ b/resources/views/themes/default1/layouts/admin.blade.php @@ -69,7 +69,7 @@ User Image @endif - @endif + @endif - - - - - -
- -
- @yield('PageHeader') - @yield('breadcrumbs') -
- - -
- - @yield('content') -
- -
- - - - - - - - - - - - - - - {{-- // --}} - - - - - - - - - - - - - - @yield('FooterInclude') - - \ No newline at end of file diff --git a/resources/views/themes/default1/layouts/login.blade.php b/resources/views/themes/default1/layouts/login.blade.php index 1df6f96f3..75f7b54ea 100644 --- a/resources/views/themes/default1/layouts/login.blade.php +++ b/resources/views/themes/default1/layouts/login.blade.php @@ -56,6 +56,7 @@ +