From a6f7c1f140da1cd8159118708cf7420e0b29bc50 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 18 Jan 2017 13:10:39 +0100 Subject: [PATCH 1/8] =?UTF-8?q?Detecci=C3=B3n=20de=20idioma=20de=20navegad?= =?UTF-8?q?or=20mejorada?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 +- js/vn/locale.js | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8df29a1b..2b4f9f6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.390-deb8) stable; urgency=low +hedera-web (1.391-deb8) stable; urgency=low * Initial Release. diff --git a/js/vn/locale.js b/js/vn/locale.js index e1fdde23..1c706be5 100644 --- a/js/vn/locale.js +++ b/js/vn/locale.js @@ -10,11 +10,18 @@ module.exports = ,init: function () { - if (!this.language) - { - var language = navigator.language.substr (0, 2); - this.language = language ? language : 'en'; - } + if (this.language) + return; + + var language = 'en'; + var languages = navigator.languages; + + if (languages && languages.length > 0) + language = languages[0]; + else if (navigator.language) + language = navigator.language; + + this.language = language.substr (0, 2); } ,load: function (path, callback) From 1ead56f304d46a86208985002f46f51b2a506992 Mon Sep 17 00:00:00 2001 From: jgallego Date: Tue, 11 Apr 2017 13:24:58 +0200 Subject: [PATCH 2/8] en supplier descarga tambien GLNAddressCode --- rest/edi/sql/supplier.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/rest/edi/sql/supplier.sql b/rest/edi/sql/supplier.sql index 93c82929..636d0a0b 100644 --- a/rest/edi/sql/supplier.sql +++ b/rest/edi/sql/supplier.sql @@ -3,6 +3,7 @@ LOAD DATA LOCAL INFILE #file FIELDS TERMINATED BY ';' LINES TERMINATED BY '\n' (@col1, @col2, @col3, @col4, @col5, @col6, @col7, @col8, @col9, @col10, @col11, @col12, @col13, @col14, @col15, @col16, @col17, @col18, @col19, @col20) SET + GLNAddressCode = @col2, supplier_id = @col4, company_name = @col3, entry_date = STR_TO_DATE(@col9, '%Y%m%d'), From 55f1af040e2243681eb076b7857129e3792dac0d Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 24 Apr 2017 10:06:50 +0200 Subject: [PATCH 3/8] Webpack 2, logo png, errores solucionados --- debian/changelog | 2 +- image/logo.png | Bin 0 -> 8577 bytes rest/core/recover-password.php | 6 +++--- webpack.config.js | 21 +++++++++++---------- 4 files changed, 15 insertions(+), 14 deletions(-) create mode 100644 image/logo.png diff --git a/debian/changelog b/debian/changelog index 2b4f9f6a..10f4b113 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.391-deb8) stable; urgency=low +hedera-web (1.392-deb8) stable; urgency=low * Initial Release. diff --git a/image/logo.png b/image/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..55e26fec6d6a2abff506862b1f851e1554f603c6 GIT binary patch literal 8577 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 - $token = $service->createToken ($_REQUEST['user'], FALSE, TRUE); + $token = $service->createToken ($_REQUEST['recoverUser'], FALSE, TRUE); $url = $service->getUrl () ."#!form=account/conf&token=$token"; $report = new Vn\Web\Report ($db, 'recover-password', ['url' => $url]); diff --git a/webpack.config.js b/webpack.config.js index a6168619..a408ead8 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -13,19 +13,20 @@ var config = { publicPath: 'build/' }, module: { - loaders: [ - { test: /\.css$/, loader: 'style!css' }, - { test: /\.json$/, loader: 'json' }, - { test: /\.xml$/, loader: 'raw' }, - { test: /\.ttf$/, loader: 'file' } + rules: [ + { test: /\.css$/, loader: 'style-loader!css-loader' }, + { test: /\.json$/, loader: 'json-loader' }, + { test: /\.xml$/, loader: 'raw-loader' }, + { test: /\.ttf$/, loader: 'file-loader' } ] }, resolve: { - modulesDirectories: [__dirname +'/js', __dirname, 'node_modules'], - fallback: process.env.NODE_PATH, - }, - resolveLoader: { - fallback: process.env.NODE_PATH + modules: [ + __dirname +'/js', + __dirname, + 'node_modules', + '/usr/lib/node_modules' + ] }, plugins: [ new webpack.DefinePlugin ({ _DEV_MODE: devMode }) From 51ee8a3755e0f391e2341f2fdeeb0604b46a8e4a Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 24 Apr 2017 10:10:09 +0200 Subject: [PATCH 4/8] version incrementada --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 10f4b113..b00ef15f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.392-deb8) stable; urgency=low +hedera-web (1.393-deb8) stable; urgency=low * Initial Release. From 6eda62a5dc29c21c51dcb636ae3ec42930653234 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 24 Apr 2017 15:10:14 +0200 Subject: [PATCH 5/8] =?UTF-8?q?Errores=20recuperar=20contrase=C3=B1a=20sol?= =?UTF-8?q?ucionado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 +- js/hedera/login.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b00ef15f..6a1a9220 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.393-deb8) stable; urgency=low +hedera-web (1.394-deb8) stable; urgency=low * Initial Release. diff --git a/js/hedera/login.js b/js/hedera/login.js index 56144131..575b3095 100644 --- a/js/hedera/login.js +++ b/js/hedera/login.js @@ -114,7 +114,7 @@ module.exports = new Class if (!user) Htk.Toast.showError (_('Please write your user name')); else - this._conn.send ('core/recover-password', {'user': user}, + this._conn.send ('core/recover-password', {recoverUser: user}, this._onPasswordRecovered.bind (this)); } From 394e08fd023db3c8db120a29f22f4dcaddedf896 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 24 Apr 2017 15:50:05 +0200 Subject: [PATCH 6/8] Errores mail solucionados --- debian/changelog | 2 +- debian/postinst | 1 + rest/misc/mail.php | 12 +++++------- web/mailer.php | 6 +++++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6a1a9220..5defc29b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.394-deb8) stable; urgency=low +hedera-web (1.397-deb8) stable; urgency=low * Initial Release. diff --git a/debian/postinst b/debian/postinst index 23f7c1b8..13608102 100755 --- a/debian/postinst +++ b/debian/postinst @@ -3,5 +3,6 @@ cd /usr/share/hedera-web && npm install --production a2enconf hedera-web service apache2 reload +service php5-fpm restart service cron restart diff --git a/rest/misc/mail.php b/rest/misc/mail.php index f816b5c8..eec5547d 100755 --- a/rest/misc/mail.php +++ b/rest/misc/mail.php @@ -25,7 +25,7 @@ class Mail extends Vn\Lib\Method $status = 'OK'; try { - //if (!preg_match ('/^[\w\._%-]+@[\w\.-]+\.[A-Za-z]{2,4}$/', $row['to'])) + //if (!preg_match ('/^[\w\._%-]+@[\w\.-]+\.[A-Za-z]{2,4}$/', $mailTo)) // throw new Exception ('Destination mail has invalid sintax'); $mail = new PHPMailer (); @@ -50,14 +50,12 @@ class Mail extends Vn\Lib\Method $mail->setFrom ($conf['sender'], $conf['sender_name']); $mail->AddReplyTo ($row['reply_to'], $conf['sender_name']); - if (strpos ($row['to'], ',')) - $mailList = explode (',', $row['to']); - else - $mailList = explode (';', $row['to']); + $mailList = explode (',', $row['to']); - foreach ($mailList as $mailTo) - $mail->AddAddress ($mailTo); + foreach ($mailList as $to) + $mail->AddAddress ($to); + $mail->IsHTML (TRUE); $mail->Subject = $row['subject']; $mail->Body = ' '. $row['text']; $mail->CharSet = 'UTF-8'; diff --git a/web/mailer.php b/web/mailer.php index 0b9db29b..815ea72c 100755 --- a/web/mailer.php +++ b/web/mailer.php @@ -35,7 +35,11 @@ class Mailer } $mail->setFrom ($conf['sender'], $conf['sender_name']); - $mail->AddAddress ($mailTo); + + $mailList = explode (',', $mailTo); + + foreach ($mailList as $to) + $mail->AddAddress ($to); $mail->IsHTML (TRUE); $mail->Subject = $subject; From f4416cc39ab74d3215cfcddd5423b89a44bba7a8 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Wed, 26 Apr 2017 08:40:52 +0200 Subject: [PATCH 7/8] =?UTF-8?q?Subir=20versi=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 +- rest/misc/access-version.php | 76 ++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100755 rest/misc/access-version.php diff --git a/debian/changelog b/debian/changelog index 5defc29b..6df1a176 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.397-deb8) stable; urgency=low +hedera-web (1.398-deb8) stable; urgency=low * Initial Release. diff --git a/rest/misc/access-version.php b/rest/misc/access-version.php new file mode 100755 index 00000000..2ccfd746 --- /dev/null +++ b/rest/misc/access-version.php @@ -0,0 +1,76 @@ + Date: Thu, 27 Apr 2017 10:27:39 +0200 Subject: [PATCH 8/8] =?UTF-8?q?Cambios=20comunicaci=C3=B3n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.js | 2 +- debian/changelog | 2 +- forms/cms/home/ui.xml | 1 + forms/news/new/locale/ca.json | 1 + forms/news/new/locale/en.json | 1 + forms/news/new/locale/es.json | 1 + forms/news/new/locale/fr.json | 1 + forms/news/new/locale/mn.json | 1 + forms/news/new/locale/pt.json | 1 + forms/news/new/ui.xml | 6 +++++- js/hedera/locale/ca.json | 2 +- js/hedera/locale/en.json | 2 +- js/hedera/locale/es.json | 2 +- js/hedera/locale/fr.json | 2 +- js/hedera/locale/mn.json | 2 +- js/hedera/locale/pt.json | 2 +- js/hedera/login.xml | 2 +- pages/main/head.php | 2 +- webpack.config.js | 1 + 19 files changed, 23 insertions(+), 11 deletions(-) diff --git a/app.js b/app.js index 5407c0a9..8291c1fb 100644 --- a/app.js +++ b/app.js @@ -2,7 +2,7 @@ var host = window.location.host.split(':')[0]; if (_DEV_MODE) - host = host +':8080'; + host = host +':9000'; __webpack_public_path__ = '//'+ host +'/build/'; diff --git a/debian/changelog b/debian/changelog index 6df1a176..e9e978a3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -hedera-web (1.398-deb8) stable; urgency=low +hedera-web (1.399-deb8) stable; urgency=low * Initial Release. diff --git a/forms/cms/home/ui.xml b/forms/cms/home/ui.xml index 5c9f1e56..8fa004a0 100755 --- a/forms/cms/home/ui.xml +++ b/forms/cms/home/ui.xml @@ -15,6 +15,7 @@ SELECT title, date_time, text, image, id FROM news + WHERE tag != 'course' ORDER BY priority, date_time DESC diff --git a/forms/news/new/locale/ca.json b/forms/news/new/locale/ca.json index a0cdb622..4c85c5b0 100755 --- a/forms/news/new/locale/ca.json +++ b/forms/news/new/locale/ca.json @@ -4,6 +4,7 @@ ,"Title": "Títol" ,"NewBody": "Cos" ,"Tag": "Etiqueta" + ,"Priority": "Prioritat" ,"Return": "Tornar" ,"Accept": "Acceptar" diff --git a/forms/news/new/locale/en.json b/forms/news/new/locale/en.json index 0213d99a..c6c807b0 100755 --- a/forms/news/new/locale/en.json +++ b/forms/news/new/locale/en.json @@ -4,6 +4,7 @@ ,"Title": "Title" ,"NewBody": "New body" ,"Tag": "Tag" + ,"Priority": "Priority" ,"Return": "Return" ,"Accept": "Accept" diff --git a/forms/news/new/locale/es.json b/forms/news/new/locale/es.json index f55b512b..2b9b2ca4 100755 --- a/forms/news/new/locale/es.json +++ b/forms/news/new/locale/es.json @@ -4,6 +4,7 @@ ,"Title": "Título" ,"NewBody": "Cuerpo" ,"Tag": "Etiqueta" + ,"Priority": "Prioridad" ,"Return": "Volver" ,"Accept": "Aceptar" diff --git a/forms/news/new/locale/fr.json b/forms/news/new/locale/fr.json index 0b0c1c84..a178493f 100755 --- a/forms/news/new/locale/fr.json +++ b/forms/news/new/locale/fr.json @@ -4,6 +4,7 @@ ,"Title": "Titre" ,"NewBody": "Corps" ,"Tag": "Tag" + ,"Priority": "Priorité" ,"Return": "Reviens" ,"Accept": "Accepter" diff --git a/forms/news/new/locale/mn.json b/forms/news/new/locale/mn.json index 0213d99a..c6c807b0 100755 --- a/forms/news/new/locale/mn.json +++ b/forms/news/new/locale/mn.json @@ -4,6 +4,7 @@ ,"Title": "Title" ,"NewBody": "New body" ,"Tag": "Tag" + ,"Priority": "Priority" ,"Return": "Return" ,"Accept": "Accept" diff --git a/forms/news/new/locale/pt.json b/forms/news/new/locale/pt.json index 8dc040d1..e35497ff 100644 --- a/forms/news/new/locale/pt.json +++ b/forms/news/new/locale/pt.json @@ -4,6 +4,7 @@ ,"Title": "Título" ,"NewBody": "Corpo" ,"Tag": "Etiqueta" + ,"Priority": "Prioridade" ,"Return": "Voltar" ,"Accept": "Aceitar" diff --git a/forms/news/new/ui.xml b/forms/news/new/ui.xml index e4a35a18..9d66e02b 100755 --- a/forms/news/new/ui.xml +++ b/forms/news/new/ui.xml @@ -9,7 +9,7 @@ updatable="true" on-operations-done="onOperationsDone"> - SELECT id, title, text, tag + SELECT id, title, text, tag, priority FROM news WHERE id = #new @@ -52,6 +52,10 @@ +
+ + +