Commit 17031bc0 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' of gitlab.com:redmic-project/client/web into dev

parents f295794a 9e831a37

app/exposure.js

+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ var express = require('express'), 
	request = require('request');



var params, app, version,

	oauthClientSecret = process.env.OAUTH_CLIENT_SECRET || 'secret';

	publicHostname = process.env.PUBLIC_HOSTNAME,

	oauthClientSecret = process.env.OAUTH_CLIENT_SECRET;



function getLang(req) {
@@ -90,7 +91,6 @@ function onUnknownRequest(req, res, next) { 
function onOauthTokenRequest(req, res) {



	var query = req.query,

		headers = req.headers,



		clientId = query.clientid,

		password = query.password,
@@ -99,7 +99,7 @@ function onOauthTokenRequest(req, res) { 
		clientCredentials = clientId + ':' + oauthClientSecret,

		base64ClientCredentials = Buffer.from(clientCredentials).toString('base64'),



		url = headers.origin + '/api/oauth/token',

		url = publicHostname + '/api/oauth/token',

		authorization = 'Basic ' + base64ClientCredentials,

		body = "grant_type=password&username=" + username + "&password=" + password + "&scope=write",

public/javascript/app/components/Topbar.js

+3 −1
Original line number Diff line number Diff line
@@ -39,8 +39,10 @@ define([ 
				innerHTML: "<a href='/home' d-state-url=true title='" + this.i18n.home +

					"'><img class='logo' src='/resources/images/logos/redmicSimple.png'></a>"

			});

			if (this.show.left)



			if (this.show.left) {

				this.leftNode = put(this.domNode, "div.manager");

			}



			this.manager = new Manager({

				parentChannel: this.parentChannel

public/javascript/app/maintenance/domains/admin/views/ActivityTypesView.js

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ define([ 
		constructor: function(args) {



			this.config = {

				listButtonsEdition: [{

					icon: "fa-edit",

					btnId: "edit",

					title: "edit",

					option: "default"

				}],

				title: this.i18n.activityType,

				target: this.services.activityType

			};

public/javascript/app/nls/es/translation.js

+2 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ define({ 
	, "undefined": "Indefinido"



	, "domains": "Dominios"

	, "activity-fields": "Campos de acción"

	, "activity-fields": "Áreas de la actividad"

	, "organisation-types": "Tipos de organización"

	, "platform-types": "Tipos de plataforma"

	, "activity-types": "Tipos de actividad"
@@ -279,6 +279,7 @@ define({ 


	, "feedback": "Contacto"

	, "message": "Mensaje"

	, "createReport": "Crear report"

	, "errorReport": "Reporte de error"

	, "subject": "Asunto"

	, "sendFeedback": "Mensaje enviado correctamente, muchas gracias por su colaboración."

public/javascript/app/nls/translation.js

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ define({ 


		, "feedback": "Feedback"

		, "message": "Message"

		, "createReport": "Create informe"

		, "errorReport": "Error report"

		, "subject": "Subject"

		, "sendFeedback": "Message sent correctly, thank you very much for your feedback."