Commit c640f656 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Merge branch 'dev' into 'master' 

Actualiza submódulos

See merge request redmic-project/client/web!107
parents e1806fbb d76084b6

client-app/dep/pdfjs

+1 −1
Original line number Diff line number Diff line 
../../node_modules/pdfjs-dist-viewer-min/build/minified
 
 No newline at end of file
 
../../node_modules/pdfjs-dist
 
 No newline at end of file

templates @ 12ed4174

Compare 65afaa94 to 12ed4174
Original line number Diff line number Diff line 
Subproject commit 65afaa94cc0062d10dc3dbf28306105111172ce6
 
Subproject commit 12ed41743bc1e042e4775b0a06276615995e213d

client-app/src/component/components/PDFViewer/PDFViewer.js

+2 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ define([ 
				this.lastPDF = url;



				var useBuilt = (/true/i).test(redmicConfig.getEnvVariableValue('envUseBuilt')),

					path = '/' + (useBuilt ? 'dist/js' : 'dep') + '/pdfjs/web/viewer.html?file=' + url;

					pdfViewerPath = '/pdfjs/build/generic/web/viewer.html',

					path = '/' + (useBuilt ? 'dist/js' : 'dep') + pdfViewerPath + '?file=' + url;



				if (!this.roleGuestActive) {

					path += '?access_token%3D' + Credentials.get("accessToken");

client-app/src/redmicConfig.js

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ define([], function() { 
	//		Configuraciones y valores globales.



	var retObj = {

		'siteKeyReCaptcha': '6LfA6_0SAAAAACT3i8poH1NqztZCtIW1OahT0cXs',

		'siteKeyReCaptcha': '6LefmUIUAAAAAA2BttWmfpK5lYMn5Bl53KFDdzPe',

		'siteKeyForDebugReCaptcha': '6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI',

		'googleTagManagerId': 'GTM-PK5MH63C',

		'googleTagManagerDevId': 'GTM-WJZRQZLZ'

client-app/src/util/ReCaptcha.js

+2 −2
Original line number Diff line number Diff line
@@ -43,8 +43,8 @@ define([ 


			_onLoadReCaptcha = null;



			var isProduction = (/true/i).test(redmicConfig.getEnvVariableValue('envProduction')),

				siteKey = isProduction ? this._siteKey : this._siteKeyForDebug;

			var isUsingBuilt = (/true/i).test(redmicConfig.getEnvVariableValue('envUseBuilt')),

				siteKey = isUsingBuilt ? this._siteKey : this._siteKeyForDebug;



			this._instanceId = grecaptcha.render(this.node, {

				'sitekey': siteKey,