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 @@ +
+ + +