{!! Form::label('password',Lang::get('lang.password')) !!} *
{!! $errors->first('password', ':message') !!}
password !!} >
From b008c9443e1be394ad2a88f661e4db75a9a6831b Mon Sep 17 00:00:00 2001
From: Manish Verma
Date: Mon, 6 Aug 2018 10:34:40 +0530
Subject: [PATCH 28/31] Revert "updated readme"
This reverts commit dd3882a98890f55901e3d4804e3e8927688d3cab.
Removed v1.10-Beta as it was unstable and had unnecessary updates
---
README.md | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 63c2663bb..893b7dd1b 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,6 @@ Faveo Helpdesk Community
========
-#### :new: Faveo Helpdesk Community [v1.10-BETA](https://github.com/ladybirdweb/faveo-helpdesk/releases/tag/v1.10.0-BETA) is out. Click [here](https://github.com/ladybirdweb/faveo-helpdesk/archive/v1.10.0-BETA.zip) to download it now.
-
Faveo Helpdesk provides Businesses with an automated Helpdesk system to manage customer support.
The word Faveo comes from Latin which means to be favourable. Which truly highlights vision and the scope as well as the functionality of the product that Faveo is. In today’s competitive startup scenario customer retention is one of the major challenges. Handling client query diligently is all the difference between retaining or losing a long lasting relationship. The company is driven with passion of providing tools for managing consumer queries for strategic insights and helping companies take those decisive decisions.
@@ -17,7 +15,7 @@ Flavors of Faveo
* Faveo Community Edition – Free, Open source edition
* Faveo Pro Edition – Paid version with many advance features and integrations
* Faveo Service Desk - Paid version for IT Assest management
-
+
Faveo Documentation
--------------------------
* Faveo user Manual
From f0284fe22ab7c91cc36c641ac56f9b6be093b188 Mon Sep 17 00:00:00 2001
From: Manish Verma
Date: Mon, 6 Aug 2018 05:28:58 +0000
Subject: [PATCH 29/31] Apply fixes from StyleCI
---
resources/lang/de/lang.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/resources/lang/de/lang.php b/resources/lang/de/lang.php
index c523f91b2..03d926e8a 100644
--- a/resources/lang/de/lang.php
+++ b/resources/lang/de/lang.php
@@ -172,7 +172,7 @@ return [
| Settings Pages [English(en)]
|----------------------------------------------------------------------------------------
|
- | Die folgenden Sprachzeilen werden in allen Problemen mit der Einstellung verwendet,
+ | Die folgenden Sprachzeilen werden in allen Problemen mit der Einstellung verwendet,
| verwendet um einige Wörter ins Deutsche zu übersetzen. Es steht Ihnen frei, Sie so zu ändern
| dass Sie IHre Ansichten an Ihre Anforderungen anpassen können.
|
@@ -703,7 +703,7 @@ return [
'please_select_an_organization' => 'Bitte wählen Sie eine Organisation',
'please_select_an_user' => 'Bitte wählen Sie einen Benutzer aus',
'organization_profile' => 'Organisationsprofil',
- 'organization-s_head' => "Leiter der Organisation",
+ 'organization-s_head' => 'Leiter der Organisation',
'select_department_manager' => 'Wählen Sie den Abteilungsmanager',
'users_of' => 'Benutzer von',
/*
@@ -934,7 +934,7 @@ return [
'password_updated_sucessfully' => 'Passwort wurde erfolgreich aktualisiert',
'password_was_not_updated_incorrect_old_password' => 'Das Passwort wurde nicht aktualisiert. Falsches altes Passwort',
'there_is_no_such_ticket_number' => 'Es gibt keine solche Ticketnummer',
- "email_didn't_match_with_ticket_number" => "Die E-Mail-Adresse stimmt nicht mit der Ticketnummer überein",
+ "email_didn't_match_with_ticket_number" => 'Die E-Mail-Adresse stimmt nicht mit der Ticketnummer überein',
'we_have_sent_you_a_link_by_email_please_click_on_that_link_to_view_ticket' => 'Wir haben Ihnen einen Link per E-Mail gesendet. Bitte klicken Sie auf diesen Link, um das Ticket anzuzeigen',
'no_records_on_publish_time' => 'Keine Einträge zur Veröffentlichungszeit',
'your_details_send_to_system' => 'Ihre Daten werden an das System gesendet',
From eb5e066e7d04f3d2e7715c55c9568ab810bbd5c2 Mon Sep 17 00:00:00 2001
From: Manish Verma
Date: Mon, 6 Aug 2018 06:56:18 +0000
Subject: [PATCH 30/31] Apply fixes from StyleCI
---
resources/lang/it/lang.php | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/resources/lang/it/lang.php b/resources/lang/it/lang.php
index 5418783eb..2386f42bd 100644
--- a/resources/lang/it/lang.php
+++ b/resources/lang/it/lang.php
@@ -276,11 +276,11 @@ return [
| System Settings Page
|--------------------------------------
*/
- 'api' => 'Api',
- 'api_key' => 'Chiave Api',
- 'api_key_mandatory' => 'Chiave Api obbligatoria',
- 'api_configurations' => 'Configurazioni Api',
- 'generate_key' => 'Genera chiave',
+ 'api' => 'Api',
+ 'api_key' => 'Chiave Api',
+ 'api_key_mandatory' => 'Chiave Api obbligatoria',
+ 'api_configurations' => 'Configurazioni Api',
+ 'generate_key' => 'Genera chiave',
'system' => 'Sistema',
'online' => 'Online',
'offline' => 'Manutenzione',
From cd4f98c12d31f0efbc5da0a6c97669d146718608 Mon Sep 17 00:00:00 2001
From: Manish Verma
Date: Mon, 6 Aug 2018 06:58:13 +0000
Subject: [PATCH 31/31] Apply fixes from StyleCI
---
app/Http/Requests/helpdesk/EmailsEditRequest.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/Http/Requests/helpdesk/EmailsEditRequest.php b/app/Http/Requests/helpdesk/EmailsEditRequest.php
index afc47cd09..cc520207b 100644
--- a/app/Http/Requests/helpdesk/EmailsEditRequest.php
+++ b/app/Http/Requests/helpdesk/EmailsEditRequest.php
@@ -35,7 +35,7 @@ class EmailsEditRequest extends Request
// 'priority' => 'required',
// 'help_topic' => 'required',
// 'imap_config' => 'required',
- 'password' => 'required|min:6',
+ 'password' => 'required|min:6',
'user_name' => 'required',
// 'sending_host' => 'required',
// 'sending_port' => 'required',