From 91893e3056912e9c735722d062dd1ff07e279778 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Sun, 28 Oct 2018 11:14:46 -0500
Subject: [PATCH 01/18] =?UTF-8?q?actualizaci=C3=B3n=20de=20upstream?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index 7da8027..434df34 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 7da802721f833958604f274dfd1ceb242fd4c8cb
+Subproject commit 434df34e0458f6372b526a34eb2146d99fbca21e

From 2c497c474113eae69c63725a9a79f4a1ae770956 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Thu, 1 Nov 2018 12:01:46 -0500
Subject: [PATCH 02/18] actualizando upstream

---
 index.php | 28 ++++++++++++++--------------
 milfs     |  2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/index.php b/index.php
index fa21953..6f28724 100644
--- a/index.php
+++ b/index.php
@@ -36,7 +36,7 @@ if(isset($_REQUEST['debug'])) {
 <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
     <!-- Chrome, Firefox OS y Opera -->
 
-<script  type="text/javascript"> 
+<script  type="text/javascript">
 window.addEventListener("load",function() {
  setTimeout(function(){
  window.scrollTo(0, 1);
@@ -109,7 +109,7 @@ $librerias_pie ="";
 //if (isset($_GET['v'])) {$variable = $_GET['v'];}else {$variable = "";}
 if (isset($_REQUEST['empresa'])) {
 
-		
+
 	$variable = "e".$_REQUEST['empresa'];
 
 }
@@ -562,11 +562,11 @@ if ($variable !=''){
 	  		$plantilla="landingpage";
 	  		$librerias_cabeza ="
 	  		<style>
-	  		
+
 	  		.control_planilla{
 	  		display:none
 	  		}
-	  		
+
 	  		</style>
 	  		 <script src='./librerias/ekko-lightbox/4.0.1/ekko-lightbox.min.js'></script>
 	  		 <script src='./librerias/charts/Chart.bundle.js'></script>
@@ -684,7 +684,7 @@ if('serviceWorker' in navigator) {
 							<div class='container-fluid'>
 								<div  style='overflow-y: scroll; overflow-x: hidden;  max-height: calc(100vh - 50px); min-height: calc(100vh - 50px); '>
 								<br>
-<table class='table table-bordered table-striped exportable'> 
+<table class='table table-bordered table-striped exportable'>
 <thead></thead>
 <tbody style=' ' id='scroll-galeria' >
 </tbody>
@@ -706,12 +706,12 @@ if('serviceWorker' in navigator) {
 			$estadisticas = portal_listado_campos("$form");
 			$acciones= formulario_acciones("$form","aplicacion");
 			$no_mostrar="display:none; ";
-		
+
 			$footer="
 
 			<nav class='navbar navbar-inverse navbar-fixed-bottom'>
-			
-			 
+
+
 				<div id='navbar' class='' aria-expanded='false' style='height: 1px;'>
 					<ul class='nav navbar-nav center-block' style='
 					float:none;
@@ -721,7 +721,7 @@ if('serviceWorker' in navigator) {
 					  $acciones
 					</ul>
 			    </div>
-			 
+
 			</nav>";
 
 
@@ -758,7 +758,7 @@ if('serviceWorker' in navigator) {
 								<div style='overflow-y: scroll; overflow-x: hidden;  max-height: calc(100vh - 100px); min-height: calc(100vh - 150px); '  >
 <br>
 <div class=''>
-<table class='table table-bordered table-striped exportable'> 
+<table class='table table-bordered table-striped exportable'>
 <thead>$titulos</thead>
 <tbody style=' ' id='scroll-content' >
 </tbody>
@@ -1011,7 +1011,7 @@ $aplicacion_pie="
 							$banner
 
 							</div>
-							
+
 								<div class='barra navbar-collapse collapse ' id='barra_aplicaciones'>
 									 <div class='navbar-header'>
 										  <button type='button' class='navbar-toggle collapsed' data-toggle='collapse' data-target='#menu_colapsible' aria-expanded='false'>
@@ -1039,7 +1039,7 @@ $aplicacion_pie="
 								</div>
 								<div id='mapa' class='container'><a name ='mapa' ></a>$mapa</div>
 								$presentacion
-							
+
 
 
 	  		<script>
@@ -1208,7 +1208,7 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
  if(isset($_SESSION['id'])){
 	 $form_tiempo_session = "
     <li>
-		
+
 	</li> ";  } else{ $form_tiempo_session = "";}
  if($tema=="") {
 
@@ -1302,7 +1302,7 @@ else {
  <!-- iOS Safari -->
 <meta name='apple-mobile-web-app-capable' content='yes'/>
 <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
-  
+
 	";
 include("temas/$tema/cabecera");
 include("temas/$tema/pie");
diff --git a/milfs b/milfs
index 434df34..b77e346 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 434df34e0458f6372b526a34eb2146d99fbca21e
+Subproject commit b77e3464fc48ee07e958c7030456d434dfa9a4ca

From c99cf45a451bf1519ed83a6467f93d1ce1ab4322 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Thu, 1 Nov 2018 15:07:45 -0500
Subject: [PATCH 03/18] =?UTF-8?q?arreglando=20responsive=20de=20ingreso=20?=
 =?UTF-8?q?de=20usuarios=20y=20accesbibilidad=20del=20men=C3=BA=20milfs=20?=
 =?UTF-8?q?m=C3=B3viles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index b77e346..4e05a41 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit b77e3464fc48ee07e958c7030456d434dfa9a4ca
+Subproject commit 4e05a4102811fd5e011831f2468a9d60299d4c4a

From cc86a63c3effb7d7a5722e54114f72917177bd1a Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Fri, 2 Nov 2018 13:32:35 -0500
Subject: [PATCH 04/18] pull del upstream

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index 4e05a41..f309306 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 4e05a4102811fd5e011831f2468a9d60299d4c4a
+Subproject commit f309306e6560695912e33682b9d3ef837cb018d6

From 640e8bf9565726bbdac3361dd755df893b16298c Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Fri, 2 Nov 2018 14:49:55 -0500
Subject: [PATCH 05/18] Actualizand

---
 index.php | 42 ++++++++++--------------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/index.php b/index.php
index a059198..2551860 100644
--- a/index.php
+++ b/index.php
@@ -33,13 +33,8 @@
 <meta name='apple-mobile-web-app-capable' content='yes'/>
 <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
     <!-- Chrome, Firefox OS y Opera -->
-<<<<<<< HEAD
-
-<script  type="text/javascript">
-=======
 <link rel='stylesheet' href='./librerias/animate/animate.min.css'>
 <script  type="text/javascript"> 
->>>>>>> a38f633d21b1810df3d48cf254a1544b496d0861
 window.addEventListener("load",function() {
  setTimeout(function(){
  window.scrollTo(0, 1);
@@ -112,7 +107,7 @@ $librerias_pie ="";
 //if (isset($_GET['v'])) {$variable = $_GET['v'];}else {$variable = "";}
 if (isset($_REQUEST['empresa'])) {
 
-
+		
 	$variable = "e".$_REQUEST['empresa'];
 
 }
@@ -567,11 +562,11 @@ if ($variable !=''){
 	  		$plantilla="landingpage";
 	  		$librerias_cabeza ="
 	  		<style>
-
+	  		
 	  		.control_planilla{
 	  		display:none
 	  		}
-
+	  		
 	  		</style>
 	  		 <script src='./librerias/ekko-lightbox/4.0.1/ekko-lightbox.min.js'></script>
 	  		 <script src='./librerias/charts/Chart.bundle.js'></script>
@@ -689,7 +684,7 @@ if('serviceWorker' in navigator) {
 							<div class='container-fluid'>
 								<div  style='overflow-y: scroll; overflow-x: hidden;  max-height: calc(100vh - 50px); min-height: calc(100vh - 50px); '>
 								<br>
-<table class='table table-bordered table-striped exportable'>
+<table class='table table-bordered table-striped exportable'> 
 <thead></thead>
 <tbody style=' ' id='scroll-galeria' >
 </tbody>
@@ -711,25 +706,9 @@ if('serviceWorker' in navigator) {
 			$estadisticas = portal_listado_campos("$form");
 			$acciones= formulario_acciones("$form","aplicacion");
 			$no_mostrar="display:none; ";
-
+		
 			$footer="
 
-<<<<<<< HEAD
-			<nav class='navbar navbar-inverse navbar-fixed-bottom'>
-
-
-				<div id='navbar' class='' aria-expanded='false' style='height: 1px;'>
-					<ul class='nav navbar-nav center-block' style='
-					float:none;
-					margin:0 auto;
-					display: block;
-					text-align: center;'>
-					  $acciones
-					</ul>
-			    </div>
-
-			</nav>";
-=======
 			<nav class='navbar navbar-default navbar-fixed-bottom'>
 <div class='container-fluid'>
 
@@ -754,7 +733,6 @@ $acciones
 
 </div>
 </nav>";
->>>>>>> a38f633d21b1810df3d48cf254a1544b496d0861
 
 
 
@@ -790,7 +768,7 @@ $acciones
 								<div style='overflow-y: scroll; overflow-x: hidden;  max-height: calc(100vh - 100px); min-height: calc(100vh - 150px); '  >
 <br>
 <div class=''>
-<table class='table table-bordered table-striped exportable'>
+<table class='table table-bordered table-striped exportable'> 
 <thead>$titulos</thead>
 <tbody style=' ' id='scroll-content' >
 </tbody>
@@ -1043,7 +1021,7 @@ $aplicacion_pie="
 							$banner
 
 							</div>
-
+							
 								<div class='barra navbar-collapse collapse ' id='barra_aplicaciones'>
 									 <div class='navbar-header'>
 										  <button type='button' class='navbar-toggle collapsed' data-toggle='collapse' data-target='#menu_colapsible' aria-expanded='false'>
@@ -1071,7 +1049,7 @@ $aplicacion_pie="
 								</div>
 								<div id='mapa' class='container'><a name ='mapa' ></a>$mapa</div>
 								$presentacion
-
+							
 
 
 	  		<script>
@@ -1240,7 +1218,7 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
  if(isset($_SESSION['id'])){
 	 $form_tiempo_session = "
     <li>
-
+		
 	</li> ";  } else{ $form_tiempo_session = "";}
  if($tema=="") {
 
@@ -1334,7 +1312,7 @@ else {
  <!-- iOS Safari -->
 <meta name='apple-mobile-web-app-capable' content='yes'/>
 <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
-
+  
 	";
 include("temas/$tema/cabecera");
 include("temas/$tema/pie");

From a7684478ad8d9916fa7abbbb658d0580e23444eb Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Fri, 2 Nov 2018 14:52:42 -0500
Subject: [PATCH 06/18] actualizando

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index f309306..71d7de3 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit f309306e6560695912e33682b9d3ef837cb018d6
+Subproject commit 71d7de370655dbe369ffdebc916017b3a817b77e

From f4e0ec4a661eed8d34cdf765210114b271890800 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Mon, 5 Nov 2018 14:27:09 -0500
Subject: [PATCH 07/18] ultimos cambios en el index

---
 index.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/index.php b/index.php
index 2551860..1400ddc 100644
--- a/index.php
+++ b/index.php
@@ -34,7 +34,7 @@
 <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
     <!-- Chrome, Firefox OS y Opera -->
 <link rel='stylesheet' href='./librerias/animate/animate.min.css'>
-<script  type="text/javascript"> 
+<script  type="text/javascript">
 window.addEventListener("load",function() {
  setTimeout(function(){
  window.scrollTo(0, 1);
@@ -107,7 +107,7 @@ $librerias_pie ="";
 //if (isset($_GET['v'])) {$variable = $_GET['v'];}else {$variable = "";}
 if (isset($_REQUEST['empresa'])) {
 
-		
+
 	$variable = "e".$_REQUEST['empresa'];
 
 }
@@ -562,11 +562,11 @@ if ($variable !=''){
 	  		$plantilla="landingpage";
 	  		$librerias_cabeza ="
 	  		<style>
-	  		
+
 	  		.control_planilla{
 	  		display:none
 	  		}
-	  		
+
 	  		</style>
 	  		 <script src='./librerias/ekko-lightbox/4.0.1/ekko-lightbox.min.js'></script>
 	  		 <script src='./librerias/charts/Chart.bundle.js'></script>
@@ -684,7 +684,7 @@ if('serviceWorker' in navigator) {
 							<div class='container-fluid'>
 								<div  style='overflow-y: scroll; overflow-x: hidden;  max-height: calc(100vh - 50px); min-height: calc(100vh - 50px); '>
 								<br>
-<table class='table table-bordered table-striped exportable'> 
+<table class='table table-bordered table-striped exportable'>
 <thead></thead>
 <tbody style=' ' id='scroll-galeria' >
 </tbody>
@@ -706,7 +706,7 @@ if('serviceWorker' in navigator) {
 			$estadisticas = portal_listado_campos("$form");
 			$acciones= formulario_acciones("$form","aplicacion");
 			$no_mostrar="display:none; ";
-		
+
 			$footer="
 
 			<nav class='navbar navbar-default navbar-fixed-bottom'>
@@ -768,7 +768,7 @@ $acciones
 								<div style='overflow-y: scroll; overflow-x: hidden;  max-height: calc(100vh - 100px); min-height: calc(100vh - 150px); '  >
 <br>
 <div class=''>
-<table class='table table-bordered table-striped exportable'> 
+<table class='table table-bordered table-striped exportable'>
 <thead>$titulos</thead>
 <tbody style=' ' id='scroll-content' >
 </tbody>
@@ -1021,7 +1021,7 @@ $aplicacion_pie="
 							$banner
 
 							</div>
-							
+
 								<div class='barra navbar-collapse collapse ' id='barra_aplicaciones'>
 									 <div class='navbar-header'>
 										  <button type='button' class='navbar-toggle collapsed' data-toggle='collapse' data-target='#menu_colapsible' aria-expanded='false'>
@@ -1049,7 +1049,7 @@ $aplicacion_pie="
 								</div>
 								<div id='mapa' class='container'><a name ='mapa' ></a>$mapa</div>
 								$presentacion
-							
+
 
 
 	  		<script>
@@ -1218,7 +1218,7 @@ $panel_aplicaciones = panel_aplicaciones('1',"","");
  if(isset($_SESSION['id'])){
 	 $form_tiempo_session = "
     <li>
-		
+
 	</li> ";  } else{ $form_tiempo_session = "";}
  if($tema=="") {
 
@@ -1312,7 +1312,7 @@ else {
  <!-- iOS Safari -->
 <meta name='apple-mobile-web-app-capable' content='yes'/>
 <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
-  
+
 	";
 include("temas/$tema/cabecera");
 include("temas/$tema/pie");

From 767cbf870a0046cc2ed4c2124e36bfe1b95dcb3b Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Mon, 5 Nov 2018 14:36:33 -0500
Subject: [PATCH 08/18] arregalando conflicto

---
 index.php | 143 +++---------------------------------------------------
 1 file changed, 8 insertions(+), 135 deletions(-)

diff --git a/index.php b/index.php
index f44fcf9..0abc6af 100644
--- a/index.php
+++ b/index.php
@@ -34,17 +34,7 @@
 <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
     <!-- Chrome, Firefox OS y Opera -->
 <link rel='stylesheet' href='./librerias/animate/animate.min.css'>
-<<<<<<< HEAD
-<script  type="text/javascript">
-window.addEventListener("load",function() {
- setTimeout(function(){
- window.scrollTo(0, 1);
- }, 0);
- });
-</script>
-=======
 
->>>>>>> c119b18641256b0d142514cd0030b24aa799685a
 
 
 
@@ -484,8 +474,8 @@ if ($variable !=''){
 
     </script>
 			";
-			
-			
+
+
 		//	$no_mostrar="display:none; ";
 
 
@@ -498,7 +488,7 @@ if ($variable !=''){
 	  		$presentacion = contenido_presentacion("$form");
 	  		$embebido = "1";
 	  		//$no_mostrar ="display:none; ";
-	  		
+
 	  		$empresa = 	remplacetas('form_id','id',"$form",'id_empresa',"") ;
 	  		$id_empresa= $empresa[0];
 	  		$logo = remplacetas('empresa','id',$id_empresa,'imagen','') ;
@@ -668,133 +658,16 @@ if('serviceWorker' in navigator) {
 
 ";
 
-<<<<<<< HEAD
-//	  		$registros = aplicacion_carrusel("$form",'10','','embebido','',"carousel");
-	  		//$registros="<div id='mostrar_carrusel'>$registros</div>";
-	 // 		$formulario = formulario_embebido($form,$opciones);
-	  		$titulo = 	remplacetas('form_id','id',$form,'nombre',"") ;
-	  		$razon_social = remplacetas('empresa','id',"$id_empresa",'razon_social','') ;
-			$slogan = remplacetas('empresa','id',"$id_empresa",'slogan','') ;
-	  		$web =  remplacetas('empresa','id',"$id_empresa",'web','');
-	  		$logo = remplacetas('empresa','id',"$id_empresa",'imagen','') ;
-	  		$campo_imagen = buscar_campo_tipo($form,"15");
-	  		  $titulos = formulario_imprimir_linea("$form","","titulos")."";
-	$id_campo = $campo_imagen[0];
-	if($id_campo[0] =="") {
-		$galeria="";
-
-	}else{
-	$galeria= "
-					<section id='galeria' class='' >
-							<div class='container-fluid'>
-								<div  style='overflow-y: scroll; overflow-x: hidden;  max-height: calc(100vh - 50px); min-height: calc(100vh - 50px); '>
-								<br>
-<table class='table table-bordered table-striped exportable'>
-<thead></thead>
-<tbody style=' ' id='scroll-galeria' >
-</tbody>
-</table>
-								</div>
-							</div>
-					</section>
-
-	";
-	}
-
-			if($geo[0] != "") {
-			$mapa = "
-			<a name='mapa'></a>
-
-	  			<embed class='' src='mapero.php?id=$form' width='100%' style='height: calc(100vh - 150px);'  webkitAllowFullScreen mozallowfullscreen allowFullScreen ></embed>
-	  		";
-			}else {$mapa = "";}
-			$estadisticas = portal_listado_campos("$form");
-			$acciones= formulario_acciones("$form","aplicacion");
-			$no_mostrar="display:none; ";
-
-			$footer="
-
-			<nav class='navbar navbar-default navbar-fixed-bottom'>
-<div class='container-fluid'>
-
-<!-- Brand/logo -->
-<div class='navbar-header'>
-<button type='button' class='navbar-toggle collapsed' data-toggle='collapse' data-target='#example-1' aria-expanded='false'>
-<span class='sr-only'>Toggle navigation</span>
-<span class='icon-bar'></span>
-<span class='icon-bar'></span>
-<span class='icon-bar'></span>
-</button>
-<a class='navbar-brand' href='#'></a>
-</div>
-
-<!-- Collapsible Navbar -->
-<div class='collapse navbar-collapse' id='example-1'>
-<ul class='nav navbar-nav'>
-
-$acciones
-</ul>
-</div>
-
-</div>
-</nav>";
-
-
-
-	  			  		$onload="
-
-	  			<div class='reveal' style='bottom: 80px !important; '>
-					<div class='slides' >
-						<section id='inicio' class='text-center scrollable' >
-							<img style='width: 20%;
-								  display: block;
-								  margin-left: auto;
-								  margin-right: auto;' src='milfs/images/secure/?file=600/$logo[0]' alt='' class='img img-responsive  center-block'>
-							<h1>$titulo[0]</h1>
-							<h2>$descripcion[0]</h2>
-							<hr>
-							<h2>$razon_social[0]</h2>
-							<h3>$slogan[0]</h3>
-							<hr>
-							<a href='https://tupale.co'>Tupale.co</a>
-						</section>
-
-						$galeria
-						<section id='estadisticas' class='scrollable' >
-
-						$estadisticas
-
-						</section>
-						<section id='mapa'>
-						$mapa
-						</section>
-						<section id='listado' class='' >
-							<div class='container-fluid'>
-								<div style='overflow-y: scroll; overflow-x: hidden;  max-height: calc(100vh - 100px); min-height: calc(100vh - 150px); '  >
-<br>
-<div class=''>
-<table class='table table-bordered table-striped exportable'>
-<thead>$titulos</thead>
-<tbody style=' ' id='scroll-content' >
-</tbody>
-</table>
-</div>
-								</div>
-							</div>
-						</section>
-					</div>
-				</div>$footer";
-	  		//$onload = "$footer $aplicacion ";
-
-=======
 			$onload = vista_aplicacion($form);
->>>>>>> c119b18641256b0d142514cd0030b24aa799685a
 		}
 		elseif($v[0] =='g') {
 			/// g=FORMULARIO EMBEBIDO
 			$no_mostrar ="display:none; ";
 	  		$form =$v[1];
-	  		if($form =="" ){ header ("Location:./"); }
+	  		if($form =="" ){
+
+
+					er ("Location:./"); }
 	  		$empresa = 	remplacetas('form_id','id',$form,'id_empresa',"") ;
 	  		$razon_social_portal = remplacetas('empresa','id',"1",'razon_social','') ;
 			$id_empresa = $empresa[0];
@@ -1828,7 +1701,7 @@ $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) {
 						<span class='input-group-addon'><a href='#' onclick="location.reload();" title='Renovar'> <i class='fa fa-refresh' aria-hidden='true'></i></a></span>
 					</div>
 		</form>
-<script  type="text/javascript"> 
+<script  type="text/javascript">
 $('.navbar-collapse a').click(function(){
     $(".navbar-collapse").collapse('hide');
 });

From 868fe73910d4ab405a7bb746d63e7f3fe6a7ed4b Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 7 Nov 2018 20:43:29 -0500
Subject: [PATCH 09/18] actualizando cambios sin guardar

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 0abc6af..b943be6 100644
--- a/index.php
+++ b/index.php
@@ -1562,7 +1562,7 @@ echo $css_adicional;
 				</div>
 					<div class='col-md-9' id='texto_articulo'>"
 				;
-			}else{ echo "<div class='col-md-12 col-lg-12' id='lo_ultimo'>" ;}
+			}else{ echo "<div class='col-md-12 col-lg-12' id='texto_articulo'>" ;}
 		?>
 		<?php echo $eventos;
                         if($id_empresa=="") {

From 4e4d237ca12fd33498e8b854f6e2bdcbbd564d45 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 7 Nov 2018 20:44:36 -0500
Subject: [PATCH 10/18] cambios

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index 71d7de3..f4fede9 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 71d7de370655dbe369ffdebc916017b3a817b77e
+Subproject commit f4fede9cdbb119e31d7248627a8c71e1c8061801

From 388f659bd36da75fabb2864302852e1e7fcb35e5 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 7 Nov 2018 20:47:33 -0500
Subject: [PATCH 11/18] =?UTF-8?q?actualaci=C3=B3n=20upstream?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index f4fede9..14fa75d 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit f4fede9cdbb119e31d7248627a8c71e1c8061801
+Subproject commit 14fa75d74fd3bd0a125878253edcf55288477416

From a0e3f375251c57b865a13f180a20bc694b327e1b Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 5 Dec 2018 12:09:53 -0500
Subject: [PATCH 12/18] =?UTF-8?q?actualizaci=C3=B3n=20submodulo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index 14fa75d..341d432 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 14fa75d74fd3bd0a125878253edcf55288477416
+Subproject commit 341d432352b205c3cb7b15fc360b2b3727bbb935

From 4b9b19aff9cc7a787ee49ae21806eedbecab6935 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 5 Dec 2018 12:22:01 -0500
Subject: [PATCH 13/18] cambiando lo ultimo por texto articulo

---
 index.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/index.php b/index.php
index 5931d24..36b94a6 100644
--- a/index.php
+++ b/index.php
@@ -760,10 +760,7 @@ $librerias_pie ="
 			/// g=FORMULARIO EMBEBIDO
 			$no_mostrar ="display:none; ";
 	  		$form =$v[1];
-	  		if($form =="" ){
-
-
-					er ("Location:./"); }
+	  		if($form =="" ){ header ("Location:./"); }
 	  		$empresa = 	remplacetas('form_id','id',$form,'id_empresa',"") ;
 	  		$razon_social_portal = remplacetas('empresa','id',"1",'razon_social','') ;
 			$id_empresa = $empresa[0];

From c92d2b92c527aa2b32d0ab089a167da4ab580406 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Sat, 8 Dec 2018 18:19:20 -0500
Subject: [PATCH 14/18] =?UTF-8?q?actualizaci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 librerias/landingjs/scripts_landing.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/librerias/landingjs/scripts_landing.js b/librerias/landingjs/scripts_landing.js
index 055fa74..7939438 100644
--- a/librerias/landingjs/scripts_landing.js
+++ b/librerias/landingjs/scripts_landing.js
@@ -9,3 +9,11 @@ $(window).scroll(function() {
 $(window).scroll(function(){
     $(".top").css("opacity", 1 - $(window).scrollTop() / 100);
   });
+
+  $(document).ready(function(){
+    $('#user_dropdow').on("click", function(e){
+      $(this).next('ul').toggle();
+      e.stopPropagation();
+      e.preventDefault();
+    });
+  });

From d04e274bbd5c2a280747ced145c4f8b540c69188 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Sat, 8 Dec 2018 18:21:11 -0500
Subject: [PATCH 15/18] =?UTF-8?q?actualizaci=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index 341d432..53ff9b7 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 341d432352b205c3cb7b15fc360b2b3727bbb935
+Subproject commit 53ff9b786be4ca3c437148b79f99e6b278628c56

From 1eca1563f9f80e09b553f0a89b5b22b3873967f8 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Tue, 11 Dec 2018 00:35:39 -0500
Subject: [PATCH 16/18] =?UTF-8?q?actualizaci=C3=B3n=20submodulo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index 53ff9b7..9f7de6b 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 53ff9b786be4ca3c437148b79f99e6b278628c56
+Subproject commit 9f7de6b0553d48773b3a7e6da1ebb8a98b6632cf

From 921c10526ef838138c81354bb591d4c9463c0714 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Wed, 12 Dec 2018 18:45:07 -0500
Subject: [PATCH 17/18] =?UTF-8?q?actualizaci=C3=B3n=20master?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 milfs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/milfs b/milfs
index 9f7de6b..ab730fa 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 9f7de6b0553d48773b3a7e6da1ebb8a98b6632cf
+Subproject commit ab730fa739789f141914a7503facb8e80f43b981

From 4366c2d83605537f02b44b7b56206f8d36b0ef22 Mon Sep 17 00:00:00 2001
From: h4ckypurpl3 <h4ckypurpl3@gmail.com>
Date: Mon, 25 Mar 2019 16:52:18 -0500
Subject: [PATCH 18/18] quitando el rebote de los modales formularios

---
 index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.php b/index.php
index 36b94a6..d2baf4c 100644
--- a/index.php
+++ b/index.php
@@ -1552,7 +1552,7 @@ echo $css_adicional;
 <!-- </div> -->
 <!-- Modal -->
 
-<div class='modal fade  animated bounceIn' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
+<div class='modal fade  animated' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
   <div id="modal_landing" class='modal-dialog modal-lg' >
     <div class='modal-content'>
             <button type='button' class='close' data-dismiss='modal' aria-hidden='true'><i class='fa fa-times-circle'></i> </button>
@@ -1714,7 +1714,7 @@ echo $css_adicional;
   <?php echo $menu; ?>
 
 
-<div class='modal fade  animated bounceIn' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
+<div class='modal fade  animated' id='muestraInfo' tabindex='-1' role='dialog' aria-labelledby='myModalLabel' aria-hidden='true'>
   <div <div id="modal_landing"  class='modal-dialog modal-lg' >
     <div class='modal-content'>
       <div class='modal-header' >