- 
+ )
+
diff --git a/client/src/app/install/install-step-1-language.js b/client/src/app/install/install-step-1-language.js
index 890ada50..7c8d1fdd 100644
--- a/client/src/app/install/install-step-1-language.js
+++ b/client/src/app/install/install-step-1-language.js
@@ -1,7 +1,7 @@
import React from 'react';
import {connect} from 'react-redux';
-import {browserHistory} from 'react-router';
+import history from 'lib-app/history';
import i18n from 'lib-app/i18n';
import ConfigActions from 'actions/config-actions';
@@ -17,7 +17,7 @@ class InstallStep1Language extends React.Component {
OpenSupports
-
-
+
+
-
+
\ No newline at end of file
diff --git a/client/src/lib-app/history.js b/client/src/lib-app/history.js
new file mode 100644
index 00000000..b13a379c
--- /dev/null
+++ b/client/src/lib-app/history.js
@@ -0,0 +1,8 @@
+import {browserHistory} from 'react-router';
+import {syncHistoryWithStore} from 'react-router-redux';
+import {useBasename} from 'history';
+import store from 'app/store';
+
+const history = syncHistoryWithStore(browserHistory, store);
+
+export default useBasename(() => history)({basename: globalIndexPath});
\ No newline at end of file
diff --git a/server/composer.json b/server/composer.json
old mode 100644
new mode 100755
diff --git a/server/controllers/article.php b/server/controllers/article.php
old mode 100644
new mode 100755
diff --git a/server/controllers/article/add-topic.php b/server/controllers/article/add-topic.php
old mode 100644
new mode 100755
diff --git a/server/controllers/article/add.php b/server/controllers/article/add.php
old mode 100644
new mode 100755
diff --git a/server/controllers/article/delete-topic.php b/server/controllers/article/delete-topic.php
old mode 100644
new mode 100755
diff --git a/server/controllers/article/delete.php b/server/controllers/article/delete.php
old mode 100644
new mode 100755
diff --git a/server/controllers/article/edit-topic.php b/server/controllers/article/edit-topic.php
old mode 100644
new mode 100755
diff --git a/server/controllers/article/edit.php b/server/controllers/article/edit.php
old mode 100644
new mode 100755
diff --git a/server/controllers/article/get-all.php b/server/controllers/article/get-all.php
old mode 100644
new mode 100755
diff --git a/server/controllers/staff.php b/server/controllers/staff.php
old mode 100644
new mode 100755
diff --git a/server/controllers/staff/add.php b/server/controllers/staff/add.php
old mode 100644
new mode 100755
diff --git a/server/controllers/staff/assign-ticket.php b/server/controllers/staff/assign-ticket.php
old mode 100644
new mode 100755
diff --git a/server/controllers/staff/delete.php b/server/controllers/staff/delete.php
old mode 100644
new mode 100755
diff --git a/server/controllers/staff/edit.php b/server/controllers/staff/edit.php
old mode 100644
new mode 100755
diff --git a/server/controllers/staff/get-all-tickets.php b/server/controllers/staff/get-all-tickets.php
old mode 100644
new mode 100755
diff --git a/server/controllers/staff/get-all.php b/server/controllers/staff/get-all.php
old mode 100644
new mode 100755
diff --git a/server/controllers/staff/get-new-tickets.php b/server/controllers/staff/get-new-tickets.php
old mode 100644
new mode 100755
diff --git a/server/controllers/staff/get-tickets.php b/server/controllers/staff/get-tickets.php
old mode 100644
new mode 100755
diff --git a/server/controllers/staff/get.php b/server/controllers/staff/get.php
old mode 100644
new mode 100755
diff --git a/server/controllers/staff/last-events.php b/server/controllers/staff/last-events.php
old mode 100644
new mode 100755
diff --git a/server/controllers/staff/search-tickets.php b/server/controllers/staff/search-tickets.php
old mode 100644
new mode 100755
diff --git a/server/controllers/staff/un-assign-ticket.php b/server/controllers/staff/un-assign-ticket.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system.php b/server/controllers/system.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/add-api-key.php b/server/controllers/system/add-api-key.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/add-department.php b/server/controllers/system/add-department.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/backup-database.php b/server/controllers/system/backup-database.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/check-requirements.php b/server/controllers/system/check-requirements.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/csv-import.php b/server/controllers/system/csv-import.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/delete-all-users.php b/server/controllers/system/delete-all-users.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/delete-api-key.php b/server/controllers/system/delete-api-key.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/delete-department.php b/server/controllers/system/delete-department.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/disable-registration.php b/server/controllers/system/disable-registration.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/disable-user-system.php b/server/controllers/system/disable-user-system.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/download.php b/server/controllers/system/download.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/edit-department.php b/server/controllers/system/edit-department.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/edit-mail-template.php b/server/controllers/system/edit-mail-template.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/edit-settings.php b/server/controllers/system/edit-settings.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/enable-registration.php b/server/controllers/system/enable-registration.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/enable-user-system.php b/server/controllers/system/enable-user-system.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/get-api-keys.php b/server/controllers/system/get-api-keys.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/get-logs.php b/server/controllers/system/get-logs.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/get-mail-templates.php b/server/controllers/system/get-mail-templates.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/get-settings.php b/server/controllers/system/get-settings.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/get-stats.php b/server/controllers/system/get-stats.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/init-admin.php b/server/controllers/system/init-admin.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/init-database.php b/server/controllers/system/init-database.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/init-settings.php b/server/controllers/system/init-settings.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/installation-done.php b/server/controllers/system/installation-done.php
old mode 100644
new mode 100755
diff --git a/server/controllers/system/recover-mail-template.php b/server/controllers/system/recover-mail-template.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket.php b/server/controllers/ticket.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket/add-custom-response.php b/server/controllers/ticket/add-custom-response.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket/change-department.php b/server/controllers/ticket/change-department.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket/change-priority.php b/server/controllers/ticket/change-priority.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket/check.php b/server/controllers/ticket/check.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket/close.php b/server/controllers/ticket/close.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket/comment.php b/server/controllers/ticket/comment.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket/create.php b/server/controllers/ticket/create.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket/delete-custom-response.php b/server/controllers/ticket/delete-custom-response.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket/edit-custom-response.php b/server/controllers/ticket/edit-custom-response.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket/get-custom-responses.php b/server/controllers/ticket/get-custom-responses.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket/get.php b/server/controllers/ticket/get.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket/re-open.php b/server/controllers/ticket/re-open.php
old mode 100644
new mode 100755
diff --git a/server/controllers/ticket/seen.php b/server/controllers/ticket/seen.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user.php b/server/controllers/user.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/ban.php b/server/controllers/user/ban.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/check-session.php b/server/controllers/user/check-session.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/delete.php b/server/controllers/user/delete.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/edit-email.php b/server/controllers/user/edit-email.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/edit-password.php b/server/controllers/user/edit-password.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/get-user.php b/server/controllers/user/get-user.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/get-users.php b/server/controllers/user/get-users.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/get.php b/server/controllers/user/get.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/list-ban.php b/server/controllers/user/list-ban.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/login.php b/server/controllers/user/login.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/logout.php b/server/controllers/user/logout.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/recover-password.php b/server/controllers/user/recover-password.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/send-recover-password.php b/server/controllers/user/send-recover-password.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/signup.php b/server/controllers/user/signup.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/un-ban.php b/server/controllers/user/un-ban.php
old mode 100644
new mode 100755
diff --git a/server/controllers/user/verify.php b/server/controllers/user/verify.php
old mode 100644
new mode 100755
diff --git a/server/data/ERRORS.php b/server/data/ERRORS.php
old mode 100644
new mode 100755
diff --git a/server/data/EXCEPTIONS.php b/server/data/EXCEPTIONS.php
old mode 100644
new mode 100755
diff --git a/server/data/InitialMails.php b/server/data/InitialMails.php
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-closed-cn.html b/server/data/mail-templates/ticket-closed-cn.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-closed-de.html b/server/data/mail-templates/ticket-closed-de.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-closed-en.html b/server/data/mail-templates/ticket-closed-en.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-closed-es.html b/server/data/mail-templates/ticket-closed-es.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-closed-fr.html b/server/data/mail-templates/ticket-closed-fr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-closed-in.html b/server/data/mail-templates/ticket-closed-in.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-closed-jp.html b/server/data/mail-templates/ticket-closed-jp.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-closed-pt.html b/server/data/mail-templates/ticket-closed-pt.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-closed-ru.html b/server/data/mail-templates/ticket-closed-ru.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-closed-tr.html b/server/data/mail-templates/ticket-closed-tr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-created-cn.html b/server/data/mail-templates/ticket-created-cn.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-created-de.html b/server/data/mail-templates/ticket-created-de.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-created-en.html b/server/data/mail-templates/ticket-created-en.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-created-es.html b/server/data/mail-templates/ticket-created-es.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-created-fr.html b/server/data/mail-templates/ticket-created-fr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-created-in.html b/server/data/mail-templates/ticket-created-in.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-created-jp.html b/server/data/mail-templates/ticket-created-jp.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-created-pt.html b/server/data/mail-templates/ticket-created-pt.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-created-ru.html b/server/data/mail-templates/ticket-created-ru.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-created-tr.html b/server/data/mail-templates/ticket-created-tr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-responded-cn.html b/server/data/mail-templates/ticket-responded-cn.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-responded-de.html b/server/data/mail-templates/ticket-responded-de.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-responded-en.html b/server/data/mail-templates/ticket-responded-en.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-responded-es.html b/server/data/mail-templates/ticket-responded-es.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-responded-fr.html b/server/data/mail-templates/ticket-responded-fr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-responded-in.html b/server/data/mail-templates/ticket-responded-in.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-responded-jp.html b/server/data/mail-templates/ticket-responded-jp.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-responded-pt.html b/server/data/mail-templates/ticket-responded-pt.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-responded-ru.html b/server/data/mail-templates/ticket-responded-ru.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/ticket-responded-tr.html b/server/data/mail-templates/ticket-responded-tr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-email-cn.html b/server/data/mail-templates/user-edit-email-cn.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-email-de.html b/server/data/mail-templates/user-edit-email-de.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-email-en.html b/server/data/mail-templates/user-edit-email-en.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-email-es.html b/server/data/mail-templates/user-edit-email-es.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-email-fr.html b/server/data/mail-templates/user-edit-email-fr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-email-in.html b/server/data/mail-templates/user-edit-email-in.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-email-jp.html b/server/data/mail-templates/user-edit-email-jp.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-email-pt.html b/server/data/mail-templates/user-edit-email-pt.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-email-ru.html b/server/data/mail-templates/user-edit-email-ru.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-email-tr.html b/server/data/mail-templates/user-edit-email-tr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-password-cn.html b/server/data/mail-templates/user-edit-password-cn.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-password-de.html b/server/data/mail-templates/user-edit-password-de.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-password-en.html b/server/data/mail-templates/user-edit-password-en.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-password-es.html b/server/data/mail-templates/user-edit-password-es.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-password-fr.html b/server/data/mail-templates/user-edit-password-fr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-password-in.html b/server/data/mail-templates/user-edit-password-in.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-password-jp.html b/server/data/mail-templates/user-edit-password-jp.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-password-pt.html b/server/data/mail-templates/user-edit-password-pt.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-password-ru.html b/server/data/mail-templates/user-edit-password-ru.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-edit-password-tr.html b/server/data/mail-templates/user-edit-password-tr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-password-forgot-cn.html b/server/data/mail-templates/user-password-forgot-cn.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-password-forgot-de.html b/server/data/mail-templates/user-password-forgot-de.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-password-forgot-en.html b/server/data/mail-templates/user-password-forgot-en.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-password-forgot-es.html b/server/data/mail-templates/user-password-forgot-es.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-password-forgot-fr.html b/server/data/mail-templates/user-password-forgot-fr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-password-forgot-in.html b/server/data/mail-templates/user-password-forgot-in.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-password-forgot-jp.html b/server/data/mail-templates/user-password-forgot-jp.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-password-forgot-pt.html b/server/data/mail-templates/user-password-forgot-pt.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-password-forgot-ru.html b/server/data/mail-templates/user-password-forgot-ru.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-password-forgot-tr.html b/server/data/mail-templates/user-password-forgot-tr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-signup-cn.html b/server/data/mail-templates/user-signup-cn.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-signup-de.html b/server/data/mail-templates/user-signup-de.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-signup-en.html b/server/data/mail-templates/user-signup-en.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-signup-es.html b/server/data/mail-templates/user-signup-es.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-signup-fr.html b/server/data/mail-templates/user-signup-fr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-signup-in.html b/server/data/mail-templates/user-signup-in.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-signup-jp.html b/server/data/mail-templates/user-signup-jp.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-signup-pt.html b/server/data/mail-templates/user-signup-pt.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-signup-ru.html b/server/data/mail-templates/user-signup-ru.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-signup-tr.html b/server/data/mail-templates/user-signup-tr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-disabled-cn.html b/server/data/mail-templates/user-system-disabled-cn.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-disabled-de.html b/server/data/mail-templates/user-system-disabled-de.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-disabled-en.html b/server/data/mail-templates/user-system-disabled-en.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-disabled-es.html b/server/data/mail-templates/user-system-disabled-es.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-disabled-fr.html b/server/data/mail-templates/user-system-disabled-fr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-disabled-in.html b/server/data/mail-templates/user-system-disabled-in.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-disabled-jp.html b/server/data/mail-templates/user-system-disabled-jp.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-disabled-pt.html b/server/data/mail-templates/user-system-disabled-pt.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-disabled-ru.html b/server/data/mail-templates/user-system-disabled-ru.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-disabled-tr.html b/server/data/mail-templates/user-system-disabled-tr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-enabled-cn.html b/server/data/mail-templates/user-system-enabled-cn.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-enabled-de.html b/server/data/mail-templates/user-system-enabled-de.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-enabled-en.html b/server/data/mail-templates/user-system-enabled-en.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-enabled-es.html b/server/data/mail-templates/user-system-enabled-es.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-enabled-fr.html b/server/data/mail-templates/user-system-enabled-fr.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-enabled-in.html b/server/data/mail-templates/user-system-enabled-in.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-enabled-jp.html b/server/data/mail-templates/user-system-enabled-jp.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-enabled-pt.html b/server/data/mail-templates/user-system-enabled-pt.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-enabled-ru.html b/server/data/mail-templates/user-system-enabled-ru.html
old mode 100644
new mode 100755
diff --git a/server/data/mail-templates/user-system-enabled-tr.html b/server/data/mail-templates/user-system-enabled-tr.html
old mode 100644
new mode 100755
diff --git a/server/files/.gitkeep b/server/files/.gitkeep
old mode 100644
new mode 100755
diff --git a/server/libs/Controller.php b/server/libs/Controller.php
old mode 100644
new mode 100755
diff --git a/server/libs/ControllerGroup.php b/server/libs/ControllerGroup.php
old mode 100644
new mode 100755
diff --git a/server/libs/DataStoreList.php b/server/libs/DataStoreList.php
old mode 100644
new mode 100755
diff --git a/server/libs/Date.php b/server/libs/Date.php
old mode 100644
new mode 100755
diff --git a/server/libs/FileDownloader.php b/server/libs/FileDownloader.php
old mode 100644
new mode 100755
diff --git a/server/libs/FileManager.php b/server/libs/FileManager.php
old mode 100644
new mode 100755
diff --git a/server/libs/FileUploader.php b/server/libs/FileUploader.php
old mode 100644
new mode 100755
diff --git a/server/libs/Hashing.php b/server/libs/Hashing.php
old mode 100644
new mode 100755
diff --git a/server/libs/LinearCongruentialGenerator.php b/server/libs/LinearCongruentialGenerator.php
old mode 100644
new mode 100755
diff --git a/server/libs/MailSender.php b/server/libs/MailSender.php
old mode 100644
new mode 100755
diff --git a/server/libs/Validator.php b/server/libs/Validator.php
old mode 100644
new mode 100755
diff --git a/server/libs/validations/captcha.php b/server/libs/validations/captcha.php
old mode 100644
new mode 100755
diff --git a/server/libs/validations/dataStoreId.php b/server/libs/validations/dataStoreId.php
old mode 100644
new mode 100755
diff --git a/server/libs/validations/userEmail.php b/server/libs/validations/userEmail.php
old mode 100644
new mode 100755
diff --git a/server/libs/validations/validLanguage.php b/server/libs/validations/validLanguage.php
old mode 100644
new mode 100755
diff --git a/server/libs/validations/validTicketNumber.php b/server/libs/validations/validTicketNumber.php
old mode 100644
new mode 100755
diff --git a/server/models/APIKey.php b/server/models/APIKey.php
old mode 100644
new mode 100755
diff --git a/server/models/Article.php b/server/models/Article.php
old mode 100644
new mode 100755
diff --git a/server/models/Ban.php b/server/models/Ban.php
old mode 100644
new mode 100755
diff --git a/server/models/CustomResponse.php b/server/models/CustomResponse.php
old mode 100644
new mode 100755
diff --git a/server/models/DataStore.php b/server/models/DataStore.php
old mode 100644
new mode 100755
diff --git a/server/models/Department.php b/server/models/Department.php
old mode 100644
new mode 100755
diff --git a/server/models/Language.php b/server/models/Language.php
old mode 100644
new mode 100755
diff --git a/server/models/Log.php b/server/models/Log.php
old mode 100644
new mode 100755
diff --git a/server/models/MailTemplate.php b/server/models/MailTemplate.php
old mode 100644
new mode 100755
diff --git a/server/models/NullDataStore.php b/server/models/NullDataStore.php
old mode 100644
new mode 100755
diff --git a/server/models/RecoverPassword.php b/server/models/RecoverPassword.php
old mode 100644
new mode 100755
diff --git a/server/models/Response.php b/server/models/Response.php
old mode 100644
new mode 100755
diff --git a/server/models/Session.php b/server/models/Session.php
old mode 100644
new mode 100755
diff --git a/server/models/SessionCookie.php b/server/models/SessionCookie.php
old mode 100644
new mode 100755
diff --git a/server/models/Setting.php b/server/models/Setting.php
old mode 100644
new mode 100755
diff --git a/server/models/Staff.php b/server/models/Staff.php
old mode 100644
new mode 100755
diff --git a/server/models/Stat.php b/server/models/Stat.php
old mode 100644
new mode 100755
diff --git a/server/models/Ticket.php b/server/models/Ticket.php
old mode 100644
new mode 100755
diff --git a/server/models/Ticketevent.php b/server/models/Ticketevent.php
old mode 100644
new mode 100755
diff --git a/server/models/Topic.php b/server/models/Topic.php
old mode 100644
new mode 100755
diff --git a/server/models/User.php b/server/models/User.php
old mode 100644
new mode 100755
diff --git a/server/tests/__lib__/Mock.php b/server/tests/__lib__/Mock.php
old mode 100644
new mode 100755
diff --git a/server/tests/__mocks__/APIKeyMock.php b/server/tests/__mocks__/APIKeyMock.php
old mode 100644
new mode 100755
diff --git a/server/tests/__mocks__/BeanMock.php b/server/tests/__mocks__/BeanMock.php
old mode 100644
new mode 100755
diff --git a/server/tests/__mocks__/ControllerMock.php b/server/tests/__mocks__/ControllerMock.php
old mode 100644
new mode 100755
diff --git a/server/tests/__mocks__/HashingMock.php b/server/tests/__mocks__/HashingMock.php
old mode 100644
new mode 100755
diff --git a/server/tests/__mocks__/NullDataStoreMock.php b/server/tests/__mocks__/NullDataStoreMock.php
old mode 100644
new mode 100755
diff --git a/server/tests/__mocks__/ReCaptchaMock.php b/server/tests/__mocks__/ReCaptchaMock.php
old mode 100644
new mode 100755
diff --git a/server/tests/__mocks__/RedBeanMock.php b/server/tests/__mocks__/RedBeanMock.php
old mode 100644
new mode 100755
diff --git a/server/tests/__mocks__/RespectMock.php b/server/tests/__mocks__/RespectMock.php
old mode 100644
new mode 100755
diff --git a/server/tests/__mocks__/ResponseMock.php b/server/tests/__mocks__/ResponseMock.php
old mode 100644
new mode 100755
diff --git a/server/tests/__mocks__/SessionMock.php b/server/tests/__mocks__/SessionMock.php
old mode 100644
new mode 100755
diff --git a/server/tests/__mocks__/SettingMock.php b/server/tests/__mocks__/SettingMock.php
old mode 100644
new mode 100755
diff --git a/server/tests/__mocks__/SlimMock.php b/server/tests/__mocks__/SlimMock.php
old mode 100644
new mode 100755
diff --git a/server/tests/__mocks__/UserMock.php b/server/tests/__mocks__/UserMock.php
old mode 100644
new mode 100755
diff --git a/server/tests/controllers/user/loginTest.php b/server/tests/controllers/user/loginTest.php
old mode 100644
new mode 100755
diff --git a/server/tests/libs/validations/captchaTest.php b/server/tests/libs/validations/captchaTest.php
old mode 100644
new mode 100755
diff --git a/server/tests/models/DataStoreTest.php b/server/tests/models/DataStoreTest.php
old mode 100644
new mode 100755
diff --git a/server/tests/models/MailTemplateTest.php b/server/tests/models/MailTemplateTest.php
old mode 100644
new mode 100755
diff --git a/server/tests/models/ResponseTest.php b/server/tests/models/ResponseTest.php
old mode 100644
new mode 100755
-
diff --git a/client/src/app/install/install-step-2-requirements.js b/client/src/app/install/install-step-2-requirements.js
index 07833df9..6a19d00a 100644
--- a/client/src/app/install/install-step-2-requirements.js
+++ b/client/src/app/install/install-step-2-requirements.js
@@ -1,8 +1,8 @@
import React from 'react';
import _ from 'lodash';
import classNames from 'classnames';
-import {browserHistory} from 'react-router';
+import history from 'lib-app/history';
import i18n from 'lib-app/i18n';
import API from 'lib-app/api-call';
@@ -39,7 +39,7 @@ class InstallStep2Requirements extends React.Component {
-
@@ -90,7 +90,7 @@ class InstallStep2Requirements extends React.Component {
onPreviousClick(event) {
event.preventDefault();
- browserHistory.push('/install/step-1');
+ history.push('/install/step-1');
}
isAllOk() {
diff --git a/client/src/app/install/install-step-3-database.js b/client/src/app/install/install-step-3-database.js
index 82e8818e..488ef3fe 100644
--- a/client/src/app/install/install-step-3-database.js
+++ b/client/src/app/install/install-step-3-database.js
@@ -1,6 +1,6 @@
import React from 'react';
-import {browserHistory} from 'react-router';
+import history from 'lib-app/history';
import i18n from 'lib-app/i18n';
import API from 'lib-app/api-call';
@@ -54,7 +54,7 @@ class InstallStep3Database extends React.Component {
onPreviousClick(event) {
event.preventDefault();
- browserHistory.push('/install/step-2');
+ history.push('/install/step-2');
}
onSubmit(form) {
@@ -65,7 +65,7 @@ class InstallStep3Database extends React.Component {
path: '/system/init-database',
data: form
})
- .then(() => browserHistory.push('/install/step-4'))
+ .then(() => history.push('/install/step-4'))
.catch(({message}) => this.setState({
loading: false,
error: true,
diff --git a/client/src/app/install/install-step-4-user-system.js b/client/src/app/install/install-step-4-user-system.js
index 2f1033f9..2bdb8de9 100644
--- a/client/src/app/install/install-step-4-user-system.js
+++ b/client/src/app/install/install-step-4-user-system.js
@@ -1,7 +1,7 @@
import React from 'react';
-import {browserHistory} from 'react-router';
import { connect } from 'react-redux'
+import history from 'lib-app/history';
import i18n from 'lib-app/i18n';
import API from 'lib-app/api-call';
@@ -49,7 +49,7 @@ class InstallStep4UserSystem extends React.Component {
onPreviousClick(event) {
event.preventDefault();
- browserHistory.push('/install/step-3');
+ history.push('/install/step-3');
}
onSubmit(form) {
@@ -64,7 +64,7 @@ class InstallStep4UserSystem extends React.Component {
}
}).then(() => this.setState({
loading: false
- }, () => browserHistory.push('/install/step-5'))));
+ }, () => history.push('/install/step-5'))));
}
isDisabled() {
diff --git a/client/src/app/install/install-step-5-admin.js b/client/src/app/install/install-step-5-admin.js
index 112fc190..4c3114c4 100644
--- a/client/src/app/install/install-step-5-admin.js
+++ b/client/src/app/install/install-step-5-admin.js
@@ -1,10 +1,9 @@
import React from 'react';
-import {browserHistory} from 'react-router';
+import history from 'lib-app/history';
import i18n from 'lib-app/i18n';
import API from 'lib-app/api-call';
-import Button from 'core-components/button';
import Header from 'core-components/header';
import Form from 'core-components/form';
import FormField from 'core-components/form-field';
@@ -58,7 +57,7 @@ class InstallStep5Admin extends React.Component {
path: '/system/init-admin',
data: form
})
- .then(() => browserHistory.push('/install/step-6'))
+ .then(() => history.push('/install/step-6'))
.catch(({message}) => this.setState({
loading: false,
error: true,
diff --git a/client/src/app/install/install-step-6-completed.js b/client/src/app/install/install-step-6-completed.js
index 5a776d00..32d15a68 100644
--- a/client/src/app/install/install-step-6-completed.js
+++ b/client/src/app/install/install-step-6-completed.js
@@ -1,6 +1,7 @@
import React from 'react';
-import {browserHistory} from 'react-router';
+import store from 'app/store';
+import ConfigActions from 'actions/config-actions';
import i18n from 'lib-app/i18n';
import Header from 'core-components/header';
@@ -9,7 +10,9 @@ import Message from 'core-components/message';
class InstallStep6Completed extends React.Component {
componentDidMount() {
- setTimeout(() => browserHistory.push('/admin'), 5000);
+ setTimeout(() => {
+ store.dispatch(ConfigActions.checkInstallation());
+ }, 5000);
}
render() {
diff --git a/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js b/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js
index b8fac0aa..35dc66fb 100644
--- a/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js
+++ b/client/src/app/main/dashboard/dashboard-create-ticket/create-ticket-form.js
@@ -1,9 +1,9 @@
import React from 'react';
import _ from 'lodash';
-import { browserHistory } from 'react-router';
import {connect} from 'react-redux';
import {EditorState, convertToRaw} from 'draft-js';
+import history from 'lib-app/history';
import i18n from 'lib-app/i18n';
import API from 'lib-app/api-call';
import SessionStore from 'lib-app/session-store';
@@ -142,9 +142,9 @@ class CreateTicketForm extends React.Component {
if(this.props.userLogged) {
store.dispatch(SessionActions.getUserData());
- setTimeout(() => {browserHistory.push('/dashboard')}, 2000);
+ setTimeout(() => {history.push('/dashboard')}, 2000);
} else {
- setTimeout(() => {browserHistory.push('/check-ticket/' + result.data.ticketNumber + '/' + email)}, 1000);
+ setTimeout(() => {history.push('/check-ticket/' + result.data.ticketNumber + '/' + email)}, 1000);
}
}
diff --git a/client/src/app/main/main-check-ticket-page.js b/client/src/app/main/main-check-ticket-page.js
index 5984f454..d03e12b8 100644
--- a/client/src/app/main/main-check-ticket-page.js
+++ b/client/src/app/main/main-check-ticket-page.js
@@ -1,8 +1,8 @@
import React from 'react';
import classNames from 'classnames';
-import {browserHistory} from 'react-router';
import {connect} from 'react-redux';
+import history from 'lib-app/history';
import i18n from 'lib-app/i18n';
import API from 'lib-app/api-call';
import SessionStore from 'lib-app/session-store';
@@ -99,7 +99,7 @@ class MainCheckTicketPage extends React.Component {
onTicketGetSuccess(result) {
SessionStore.setItem('token', result.data.token);
- setTimeout(() => {browserHistory.push('/view-ticket/' + this.state.form.ticketNumber)}, 2000);
+ setTimeout(() => {history.push('/view-ticket/' + this.state.form.ticketNumber)}, 2000);
}
}
diff --git a/client/src/app/main/main-home/main-home-page-portal.js b/client/src/app/main/main-home/main-home-page-portal.js
index a27916de..bc03f018 100644
--- a/client/src/app/main/main-home/main-home-page-portal.js
+++ b/client/src/app/main/main-home/main-home-page-portal.js
@@ -1,8 +1,8 @@
import React from 'react';
import classNames from 'classnames';
-import {browserHistory} from 'react-router';
import {connect} from 'react-redux'
+import history from 'lib-app/history';
import Widget from 'core-components/widget';
import Card from 'core-components/card';
import i18n from 'lib-app/i18n';
@@ -41,7 +41,7 @@ class MainHomePagePortal extends React.Component {
icon: 'ticket',
color: 'red',
buttonText: (this.props.type === 'complete') ? i18n('CREATE_TICKET') : null,
- onButtonClick: () => browserHistory.push('/create-ticket')
+ onButtonClick: () => history.push('/create-ticket')
};
}
@@ -61,7 +61,7 @@ class MainHomePagePortal extends React.Component {
icon: 'book',
color: 'blue',
buttonText: (this.props.type === 'complete') ? i18n('VIEW_ARTICLES') : null,
- onButtonClick: () => browserHistory.push('/articles')
+ onButtonClick: () => history.push('/articles')
};
}
@@ -72,7 +72,7 @@ class MainHomePagePortal extends React.Component {
icon: 'check-square-o',
color: 'green',
buttonText: (this.props.type === 'complete') ? i18n('CHECK_TICKET') : null,
- onButtonClick: () => browserHistory.push('/check-ticket')
+ onButtonClick: () => history.push('/check-ticket')
};
}
}
diff --git a/client/src/app/main/main-verify-token-page.js b/client/src/app/main/main-verify-token-page.js
index 8218414d..fd5d61f1 100644
--- a/client/src/app/main/main-verify-token-page.js
+++ b/client/src/app/main/main-verify-token-page.js
@@ -1,8 +1,8 @@
import React from 'react';
import {connect} from 'react-redux'
-import {browserHistory} from 'react-router';
import SessionActions from 'actions/session-actions'
+import history from 'lib-app/history';
import API from 'lib-app/api-call';
import Message from 'core-components/message';
@@ -18,10 +18,10 @@ class MainVerifyTokenPage extends React.Component {
}
}).then(() => {
this.props.dispatch(SessionActions.verify(true));
- browserHistory.push('/');
+ history.push('/');
}).catch(() => {
this.props.dispatch(SessionActions.verify(false));
- browserHistory.push('/');
+ history.push('/');
});
}
diff --git a/client/src/app/main/main-view-ticket-page.js b/client/src/app/main/main-view-ticket-page.js
index de2f0096..08f2cbb8 100644
--- a/client/src/app/main/main-view-ticket-page.js
+++ b/client/src/app/main/main-view-ticket-page.js
@@ -1,7 +1,7 @@
import React from 'react';
-import {browserHistory} from 'react-router';
import {connect} from 'react-redux';
+import history from 'lib-app/history';
import AdminPanelViewTicket from 'app/admin/panel/tickets/admin-panel-view-ticket'
import Widget from 'core-components/widget';
@@ -20,7 +20,7 @@ class MainViewTicketPage extends React.Component {
onRetrieveFail() {
if (!this.props.config['user-system-enabled']) {
- setTimeout(() => {browserHistory.push('/check-ticket')}, 2000);
+ setTimeout(() => {history.push('/check-ticket')}, 2000);
}
}
}
diff --git a/client/src/config.js b/client/src/config.js
index e206592e..1828bbe4 100644
--- a/client/src/config.js
+++ b/client/src/config.js
@@ -1,2 +1,3 @@
root = 'http://localhost:3000';
apiRoot = 'http://localhost:3000/api';
+globalIndexPath = '';
diff --git a/client/src/core-components/icon.js b/client/src/core-components/icon.js
index becdb99b..47e8d193 100644
--- a/client/src/core-components/icon.js
+++ b/client/src/core-components/icon.js
@@ -1,6 +1,8 @@
import React from 'react';
import classNames from 'classnames';
+import API from 'lib-app/api-call';
+
class Icon extends React.Component {
static propTypes = {
@@ -25,7 +27,7 @@ class Icon extends React.Component {
renderFlag() {
return (
-
+
);
}
diff --git a/client/src/index.html b/client/src/index.html
old mode 100644
new mode 100755
diff --git a/client/src/index.js b/client/src/index.js
index e5b95387..aed4693b 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -14,7 +14,7 @@ Array.prototype.swap = function (x,y) {
return this;
};
-if ( process.env.NODE_ENV !== 'production' ) {
+if (isProd === 'disabled') {
// Enable React devtools
window.React = React;
}
diff --git a/client/src/index.php b/client/src/index.php
old mode 100644
new mode 100755
index c73e539e..172d8f29
--- a/client/src/index.php
+++ b/client/src/index.php
@@ -1,3 +1,7 @@
+
@@ -8,16 +12,17 @@
+ }/images/icons/${this.props.name}.png`}){kind=icon}
);
}
diff --git a/client/src/index.html b/client/src/index.html
old mode 100644
new mode 100755
diff --git a/client/src/index.js b/client/src/index.js
index e5b95387..aed4693b 100644
--- a/client/src/index.js
+++ b/client/src/index.js
@@ -14,7 +14,7 @@ Array.prototype.swap = function (x,y) {
return this;
};
-if ( process.env.NODE_ENV !== 'production' ) {
+if (isProd === 'disabled') {
// Enable React devtools
window.React = React;
}
diff --git a/client/src/index.php b/client/src/index.php
old mode 100644
new mode 100755
index c73e539e..172d8f29
--- a/client/src/index.php
+++ b/client/src/index.php
@@ -1,3 +1,7 @@
+
@@ -8,16 +12,17 @@