tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2 from ivandiazwm/master 

Bug fixing and Improvements
This commit is contained in:
Ivan Diaz 2017-04-21 08:18:59 +02:00 committed by GitHub
parent ebd4f8ca9f 81d97fa271
commit 57ed917f54
28 changed files with 68 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/app-components/are-you-sure.js
View File

@ -27,7 +27,7 @@ class AreYouSure extends React.Component {
password: '' password: ''
}; };
static openModal(description, onYes, type) { static openModal(description, onYes, type = 'default') {
ModalContainer.openModal( ModalContainer.openModal(
<AreYouSure description={description} onYes={onYes} type={type}/>, <AreYouSure description={description} onYes={onYes} type={type}/>,
true true

6
client/src/app-components/ticket-viewer.js
View File

@ -151,10 +151,10 @@ class TicketViewer extends React.Component {
{i18n(priorities[this.props.ticket.priority || 'low'])} {i18n(priorities[this.props.ticket.priority || 'low'])}
</div> </div>
<div className="col-md-4"> <div className="col-md-4">
{(ticket.owner) ? ticket.owner.name : i18n('NONE')} {this.renderOwnerNode()}
</div> </div>
<div className="col-md-4"> <div className="col-md-4">
{this.renderOwnerNode()} {i18n((this.props.ticket.closed) ? 'CLOSED' : 'OPENED')}
</div> </div>
</div> </div>
</div> </div>
@ -171,7 +171,7 @@ class TicketViewer extends React.Component {
</Button> </Button>
); );
} else { } else {
ownerNode = i18n((this.props.ticket.closed) ? 'CLOSED' : 'OPENED'); ownerNode = (this.props.ticket.owner) ? this.props.ticket.owner.name : i18n('NONE')
} }
return ownerNode; return ownerNode;

2
client/src/app-components/topic-viewer.js
View File

@ -72,7 +72,7 @@ class TopicViewer extends React.Component {
renderDeleteButton() { renderDeleteButton() {
return ( return (
<span onClick={AreYouSure.openModal.bind(this, i18n('DELETE_TOPIC_DESCRIPTION'), this.onDeleteClick.bind(this))}> <span onClick={() => AreYouSure.openModal(i18n('DELETE_TOPIC_DESCRIPTION'), this.onDeleteClick.bind(this))}>
<Icon className="topic-viewer__edit-icon" name="trash" /> <Icon className="topic-viewer__edit-icon" name="trash" />
</span> </span>
); );

2
client/src/app/admin/panel/staff/staff-editor.js
View File

@ -198,7 +198,7 @@ class StaffEditor extends React.Component {
<div className="staff-editor__delete-title"> <div className="staff-editor__delete-title">
{i18n('DELETE_STAFF_MEMBER')} {i18n('DELETE_STAFF_MEMBER')}
</div> </div>
<Button onClick={AreYouSure.openModal.bind(this, i18n('WILL_DELETE_STAFF'), this.onDeleteClick.bind(this))}> <Button onClick={() => AreYouSure.openModal(i18n('WILL_DELETE_STAFF'), this.onDeleteClick.bind(this))}>
{i18n('DELETE_STAFF_MEMBER')} {i18n('DELETE_STAFF_MEMBER')}
</Button> </Button>
</div> </div>

2
client/src/app/admin/panel/staff/staff-editor.scss
View File

@ -136,7 +136,7 @@
position: absolute; position: absolute;
bottom: 0; bottom: 0;
right: 0; right: 0;
width: 180px; min-width: 180px;
} }
&__update-email, &__update-email,

4
client/src/app/install/install-step-4-user-system.js
View File

@ -64,7 +64,9 @@ class InstallStep4UserSystem extends React.Component {
} }
}).then(() => this.setState({ }).then(() => this.setState({
loading: false loading: false
}, () => history.push('/install/step-5')))); }, () => history.push('/install/step-5'))).catch(() => this.setState({
loading: false
})));
} }
isDisabled() { isDisabled() {

4
client/src/app/install/install-step-6-completed.js
View File

@ -10,9 +10,11 @@ import Message from 'core-components/message';
class InstallStep6Completed extends React.Component { class InstallStep6Completed extends React.Component {
componentDidMount() { componentDidMount() {
store.dispatch(ConfigActions.init());
setTimeout(() => { setTimeout(() => {
store.dispatch(ConfigActions.checkInstallation()); store.dispatch(ConfigActions.checkInstallation());
}, 5000); }, 3000);
} }
render() { render() {

2
client/src/app/main/main-home/main-home-page-login-widget.js
View File

@ -68,7 +68,7 @@ class MainHomePageLoginWidget extends React.Component {
<Widget className="main-home-page__widget login-widget_password" title={i18n('RECOVER_PASSWORD')} ref="recoverWidget"> <Widget className="main-home-page__widget login-widget_password" title={i18n('RECOVER_PASSWORD')} ref="recoverWidget">
<Form {...this.getRecoverFormProps()}> <Form {...this.getRecoverFormProps()}>
<div className="login-widget__inputs"> <div className="login-widget__inputs">
<FormField placeholder="email" name="email" className="login-widget__input" validation="EMAIL" required/> <FormField placeholder={i18n('EMAIL_LOWERCASE')} name="email" className="login-widget__input" validation="EMAIL" required/>
</div> </div>
<div className="login-widget__submit-button"> <div className="login-widget__submit-button">
<SubmitButton type="primary">{i18n('RECOVER_PASSWORD')}</SubmitButton> <SubmitButton type="primary">{i18n('RECOVER_PASSWORD')}</SubmitButton>

11
client/src/app/main/main-layout-header.scss
View File

@ -3,8 +3,8 @@
.main-layout-header { .main-layout-header {
background-color: $primary-blue; background-color: $primary-blue;
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
height: 32px;
width: 100%; width: 100%;
position: relative;
&__user-name { &__user-name {
color: $primary-red; color: $primary-red;
@ -19,9 +19,16 @@
} }
&__languages { &__languages {
display: inline-block;
float: right; float: right;
position: relative; position: relative;
top: 5px; top: 5px;
left: -6px; margin: 0 6px;
}
@media screen and (max-width: 500px) {
.main-layout-header__languages {
float: none;
}
} }
} }

2
client/src/app/main/main-signup/main-signup-page.scss
View File

@ -1,5 +1,5 @@
.main-signup-page { .main-signup-page {
height: 669px; min-height: 669px;
.signup-widget { .signup-widget {
padding: 30px; padding: 30px;

3
client/src/core-components/input.scss
View File

@ -2,6 +2,7 @@
.input { .input {
display: block; display: block;
max-width: 100%;
&__text { &__text {
border: 1px solid $grey; border: 1px solid $grey;
@ -20,7 +21,7 @@
} }
&_auto { &_auto {
width: 100%; max-width: 100%;
} }
&_small { &_small {

2
client/src/data/language-list.js
View File

@ -47,7 +47,7 @@ export default {
data: turkishLanguage data: turkishLanguage
}, },
'in': { 'in': {
name: 'Indian', name: 'Hindi',
data: indianLanguage data: indianLanguage
} }
}; };

2
client/src/data/languages/es.js
View File

@ -66,7 +66,7 @@ export default {
'DELETE': 'Borrar', 'DELETE': 'Borrar',
'LANGUAGE': 'Idioma', 'LANGUAGE': 'Idioma',
'OWNER': 'Propietario', 'OWNER': 'Propietario',
'OWNED': 'Propiedad', 'OWNED': 'Asignado',
'STATUS': 'Estado', 'STATUS': 'Estado',
'NONE': 'Ninguno', 'NONE': 'Ninguno',
'OPENED': 'Abierto', 'OPENED': 'Abierto',

2
server/controllers/article/add-topic.php
View File

@ -11,7 +11,7 @@ class AddTopicController extends Controller {
'permission' => 'staff_2', 'permission' => 'staff_2',
'requestData' => [ 'requestData' => [
'name' => [ 'name' => [
'validation' => DataValidator::length(3, 40), 'validation' => DataValidator::length(3, 100),
'error' => ERRORS::INVALID_NAME 'error' => ERRORS::INVALID_NAME
] ]
] ]

2
server/controllers/article/add.php
View File

@ -11,7 +11,7 @@ class AddArticleController extends Controller {
'permission' => 'staff_2', 'permission' => 'staff_2',
'requestData' => [ 'requestData' => [
'title' => [ 'title' => [
'validation' => DataValidator::length(3, 40), 'validation' => DataValidator::length(3, 100),
'error' => ERRORS::INVALID_NAME 'error' => ERRORS::INVALID_NAME
], ],
'content' => [ 'content' => [

3
server/controllers/user/recover-password.php
View File

@ -65,7 +65,8 @@ class RecoverPasswordController extends Controller {
$mailSender->setTemplate(MailTemplate::USER_PASSWORD, [ $mailSender->setTemplate(MailTemplate::USER_PASSWORD, [
'to' => $this->user->email, 'to' => $this->user->email,
'name' => $this->user->name, 'url' => Setting::getSetting('url')->getValue(),
'name' => $this->user->name
]); ]);
$mailSender->send(); $mailSender->send();

6
server/data/mail-templates/user-password-forgot-cn.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%"> <table cellpadding="0" cellspacing="0" width="100%">
<tr> <tr>
<td style="padding-bottom: 30px;"> <td style="padding-bottom: 30px;">
使用此代码 {{url}}/recover-password?email={{email}}&token={{token}} 或单击下面的按钮. 使用此代码 {{url}}/recover-password?email={{to}}&token={{token}} 或单击下面的按钮.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -351,11 +351,11 @@
<tr> <tr>
<td class="button"> <td class="button">
<div><!--[if mso]> <div><!--[if mso]>
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{email}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f"> <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{to}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
<w:anchorlock/> <w:anchorlock/>
<center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">恢复密码</center> <center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">恢复密码</center>
</v:roundrect> </v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}" <![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">恢复密码</a></div> style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">恢复密码</a></div>
</td> </td>
</tr> </tr>

6
server/data/mail-templates/user-password-forgot-de.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%"> <table cellpadding="0" cellspacing="0" width="100%">
<tr> <tr>
<td style="padding-bottom: 30px;"> <td style="padding-bottom: 30px;">
Verwenden Sie diesen Code in {{url}}/recover-password?email={{email}}&token={{token}} oder klicken Sie auf die Schaltfläche unten. Verwenden Sie diesen Code in {{url}}/recover-password?email={{to}}&token={{token}} oder klicken Sie auf die Schaltfläche unten.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -351,11 +351,11 @@
<tr> <tr>
<td class="button"> <td class="button">
<div><!--[if mso]> <div><!--[if mso]>
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{email}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f"> <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{to}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
<w:anchorlock/> <w:anchorlock/>
<center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Passwort wiederherstellen</center> <center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Passwort wiederherstellen</center>
</v:roundrect> </v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}" <![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Passwort wiederherstellen</a></div> style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Passwort wiederherstellen</a></div>
</td> </td>
</tr> </tr>

6
server/data/mail-templates/user-password-forgot-en.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%"> <table cellpadding="0" cellspacing="0" width="100%">
<tr> <tr>
<td style="padding-bottom: 30px;"> <td style="padding-bottom: 30px;">
Use this code in {{url}}/recover-password?email={{email}}&token={{token}} or click the button below. Use this code in {{url}}/recover-password?email={{to}}&token={{token}} or click the button below.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -351,11 +351,11 @@
<tr> <tr>
<td class="button"> <td class="button">
<div><!--[if mso]> <div><!--[if mso]>
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{email}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f"> <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{to}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
<w:anchorlock/> <w:anchorlock/>
<center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Recover password</center> <center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Recover password</center>
</v:roundrect> </v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}" <![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Recover password</a></div> style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Recover password</a></div>
</td> </td>
</tr> </tr>

6
server/data/mail-templates/user-password-forgot-es.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%"> <table cellpadding="0" cellspacing="0" width="100%">
<tr> <tr>
<td style="padding-bottom: 30px;"> <td style="padding-bottom: 30px;">
Usá este codigo en {{url}}/recover-password?email={{email}}&token={{token}} o hacé click en el botón de abajo. Usá este codigo en {{url}}/recover-password?email={{to}}&token={{token}} o hacé click en el botón de abajo.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -351,11 +351,11 @@
<tr> <tr>
<td class="button"> <td class="button">
<div><!--[if mso]> <div><!--[if mso]>
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{email}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f"> <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{to}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
<w:anchorlock/> <w:anchorlock/>
<center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Recuperar contraseña</center> <center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Recuperar contraseña</center>
</v:roundrect> </v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}" <![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Recuperar contraseña</a></div> style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Recuperar contraseña</a></div>
</td> </td>
</tr> </tr>

6
server/data/mail-templates/user-password-forgot-fr.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%"> <table cellpadding="0" cellspacing="0" width="100%">
<tr> <tr>
<td style="padding-bottom: 30px;"> <td style="padding-bottom: 30px;">
Utilisez ce code dans {{url}}/recover-password?email={{email}}&token={{token}} ou cliquez sur le bouton ci-dessous. Utilisez ce code dans {{url}}/recover-password?email={{to}}&token={{token}} ou cliquez sur le bouton ci-dessous.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -351,11 +351,11 @@
<tr> <tr>
<td class="button"> <td class="button">
<div><!--[if mso]> <div><!--[if mso]>
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{email}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f"> <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{to}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
<w:anchorlock/> <w:anchorlock/>
<center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Récupérer mot de passe</center> <center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Récupérer mot de passe</center>
</v:roundrect> </v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}" <![endif]--><a class="button-mobile" target="_blank" href="{{to}}/recover-password?email={{to}}&token={{token}}"
style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Récupérer mot de passe</a></div> style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Récupérer mot de passe</a></div>
</td> </td>
</tr> </tr>

6
server/data/mail-templates/user-password-forgot-in.html
View File

@ -341,7 +341,7 @@
<table cellpadding="0" cellspacing="0" width="100%"> <table cellpadding="0" cellspacing="0" width="100%">
<tr> <tr>
<td style="padding-bottom: 30px;"> <td style="padding-bottom: 30px;">
इस कोड का उपयोग करें {{url}}/recover-password?email={{email}}&token={{token}} या नीचे दिए गए बटन पर क्लिक करें. इस कोड का उपयोग करें {{url}}/recover-password?email={{to}}&token={{token}} या नीचे दिए गए बटन पर क्लिक करें.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -352,11 +352,11 @@
<tr> <tr>
<td class="button"> <td class="button">
<div><!--[if mso]> <div><!--[if mso]>
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{email}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f"> <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{to}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
<w:anchorlock/> <w:anchorlock/>
<center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">गोपनीय शब्द पुन प्राप्त करे</center> <center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">गोपनीय शब्द पुन प्राप्त करे</center>
</v:roundrect> </v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}" <![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">गोपनीय शब्द पुन प्राप्त करे</a></div> style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">गोपनीय शब्द पुन प्राप्त करे</a></div>
</td> </td>
</tr> </tr>

6
server/data/mail-templates/user-password-forgot-jp.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%"> <table cellpadding="0" cellspacing="0" width="100%">
<tr> <tr>
<td style="padding-bottom: 30px;"> <td style="padding-bottom: 30px;">
でこのコードを使用 {{url}}/recover-password?email={{email}}&token={{token}} 下のボタンをクリックしてください. でこのコードを使用 {{url}}/recover-password?email={{to}}&token={{token}} 下のボタンをクリックしてください.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -351,11 +351,11 @@
<tr> <tr>
<td class="button"> <td class="button">
<div><!--[if mso]> <div><!--[if mso]>
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{email}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f"> <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{to}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
<w:anchorlock/> <w:anchorlock/>
<center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">パスワードを回復</center> <center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">パスワードを回復</center>
</v:roundrect> </v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}" <![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">パスワードを回復</a></div> style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">パスワードを回復</a></div>
</td> </td>
</tr> </tr>

6
server/data/mail-templates/user-password-forgot-pt.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%"> <table cellpadding="0" cellspacing="0" width="100%">
<tr> <tr>
<td style="padding-bottom: 30px;"> <td style="padding-bottom: 30px;">
Use este código em {{url}}/recover-password?email={{email}}&token={{token}} ou clique no botão abaixo. Use este código em {{url}}/recover-password?email={{to}}&token={{token}} ou clique no botão abaixo.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -351,11 +351,11 @@
<tr> <tr>
<td class="button"> <td class="button">
<div><!--[if mso]> <div><!--[if mso]>
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{email}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f"> <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{to}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
<w:anchorlock/> <w:anchorlock/>
<center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Recuperar senha</center> <center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Recuperar senha</center>
</v:roundrect> </v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}" <![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Recuperar senha</a></div> style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Recuperar senha</a></div>
</td> </td>
</tr> </tr>

6
server/data/mail-templates/user-password-forgot-ru.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%"> <table cellpadding="0" cellspacing="0" width="100%">
<tr> <tr>
<td style="padding-bottom: 30px;"> <td style="padding-bottom: 30px;">
Используйте этот код в {{url}}/recover-password?email={{email}}&token={{token}} или нажмите кнопку ниже. Используйте этот код в {{url}}/recover-password?email={{to}}&token={{token}} или нажмите кнопку ниже.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -351,11 +351,11 @@
<tr> <tr>
<td class="button"> <td class="button">
<div><!--[if mso]> <div><!--[if mso]>
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{email}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f"> <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{to}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
<w:anchorlock/> <w:anchorlock/>
<center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Восстановить пароль</center> <center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Восстановить пароль</center>
</v:roundrect> </v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}" <![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Восстановить пароль</a></div> style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Восстановить пароль</a></div>
</td> </td>
</tr> </tr>

6
server/data/mail-templates/user-password-forgot-tr.html
View File

@ -340,7 +340,7 @@
<table cellpadding="0" cellspacing="0" width="100%"> <table cellpadding="0" cellspacing="0" width="100%">
<tr> <tr>
<td style="padding-bottom: 30px;"> <td style="padding-bottom: 30px;">
Bu kodu şu adreste kullanın {{url}}/recover-password?email={{email}}&token={{token}} veya aşağıdaki butona tıklayın. Bu kodu şu adreste kullanın {{url}}/recover-password?email={{to}}&token={{token}} veya aşağıdaki butona tıklayın.
</td> </td>
</tr> </tr>
<tr> <tr>
@ -351,11 +351,11 @@
<tr> <tr>
<td class="button"> <td class="button">
<div><!--[if mso]> <div><!--[if mso]>
<v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{email}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f"> <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="{{url}}/recover-password?email={{to}}&token={{token}}" style="height:45px;v-text-anchor:middle;width:155px;" arcsize="15%" strokecolor="#ffffff" fillcolor="#ff6f6f">
<w:anchorlock/> <w:anchorlock/>
<center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Şifre kurtarma</center> <center style="color:#ffffff;font-family:Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;">Şifre kurtarma</center>
</v:roundrect> </v:roundrect>
<![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{email}}&token={{token}}" <![endif]--><a class="button-mobile" target="_blank" href="{{url}}/recover-password?email={{to}}&token={{token}}"
style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Şifre kurtarma</a></div> style="background-color:#ff6f6f;border-radius:5px;color:#ffffff;display:inline-block;font-family:'Cabin', Helvetica, Arial, sans-serif;font-size:14px;font-weight:regular;line-height:45px;text-align:center;text-decoration:none;width:155px;-webkit-text-size-adjust:none;mso-hide:all;">Şifre kurtarma</a></div>
</td> </td>
</tr> </tr>

3
tests/article/article.rb
View File

@ -83,6 +83,9 @@ describe 'Article path' do
}) })
(result['status']).should.equal('success') (result['status']).should.equal('success')
article = $database.getRow('article', @article_id)
(article).should.equal(nil)
lastLog = $database.getLastRow('log') lastLog = $database.getLastRow('log')
(lastLog['type']).should.equal('DELETE_ARTICLE') (lastLog['type']).should.equal('DELETE_ARTICLE')
end end

3
tests/article/topic.rb
View File

@ -48,6 +48,9 @@ describe 'Topic paths' do
(result['status']).should.equal('success') (result['status']).should.equal('success')
topic = $database.getRow('topic', 1)
(topic).should.equal(nil)
lastLog = $database.getLastRow('log') lastLog = $database.getLastRow('log')
(lastLog['type']).should.equal('DELETE_TOPIC') (lastLog['type']).should.equal('DELETE_TOPIC')
end end