From d9f62e61c4d982c05e6c1a0b2f0c3dae6064cfa7 Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Fri, 16 Nov 2018 08:02:18 -0500
Subject: [PATCH 01/16] orden en parallax

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

diff --git a/milfs b/milfs
index 5a368fa..45348b1 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 5a368faa7ab29494dcd372032bb572778395d8a3
+Subproject commit 45348b174e4fcf27dd19db83b3a4324d89d3b914

From 41e624004d21d06321fc93716bbd76745ebcd22f Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Thu, 22 Nov 2018 18:49:24 -0500
Subject: [PATCH 02/16] librerias en index cuando hay tema

---
 index.php | 11 +++++++++--
 milfs     |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index af1b812..f14d9f3 100644
--- a/index.php
+++ b/index.php
@@ -330,7 +330,11 @@ if ($variable !=''){
 		elseif($v[0] =='p') {
 			$set =$v[1];
 			$form =$v[1];
+			$librerias_cabeza=' 
+			        <link rel="stylesheet" type="text/css" href="librerias/datatables/datatables.css">
+					<script type="text/javascript" charset="utf8" src="librerias/datatables/datatables.js"></script>
 
+			';
 			$empresa = 	remplacetas('form_id','id',$form,'id_empresa',"") ;
 	  		$razon_social_portal = remplacetas('empresa','id',"$empresa[0]",'razon_social','') ;
 	  		$titulo = remplacetas('empresa','id',"$empresa[0]",'razon_social','') ;
@@ -338,7 +342,9 @@ if ($variable !=''){
 			/// s= SET DE DATOS
 	  		$embebido = "1";
 	  		if(isset($_REQUEST['print'])) { $print = "window.print()";}
-			$onload = "".planilla("$set","$_REQUEST[registros]",'')." <script type=\"text/javascript\">$print</script> ";
+			$onload = "".planilla("$set","$_REQUEST[registros]",'')." <script type=\"text/javascript\">$print</script> 
+
+			";
 
 			}
 		elseif($v[0] =='i') {
@@ -913,7 +919,7 @@ $aplicacion_pie="
 												<a href='#' class='dropdown-toggle ' data-toggle='dropdown' role='button' aria-haspopup='true' aria-expanded='false'>
 												Secciones<span class='caret'></span>
 												</a>
-												<ul  class='dropdown-menu'>
+												<ul  class='dropdown-menu' id='listado_aplicaciones'>
 												$aplicaciones_listado
 												</ul>
 											</li>
@@ -1191,6 +1197,7 @@ else {
 <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent'/>
   
 	";
+	echo $librerias_cabeza; 
 include("temas/$tema/cabecera");
 include("temas/$tema/pie");
 $barra="
diff --git a/milfs b/milfs
index 45348b1..e331fbc 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 45348b174e4fcf27dd19db83b3a4324d89d3b914
+Subproject commit e331fbca0b0c21cef2148d4debdc7d508ff8bbf3

From 2313a1ad1133725172cb27efb078081937a35754 Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Thu, 22 Nov 2018 19:53:56 -0500
Subject: [PATCH 03/16] bug en visualizacion  de resaltados con plantilla

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

diff --git a/milfs b/milfs
index e331fbc..0a5b44a 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit e331fbca0b0c21cef2148d4debdc7d508ff8bbf3
+Subproject commit 0a5b44abd78484cb237d1b243fafb36f4a9a99ba

From fe90f27d88582030e805922946c77aeac01d8fef Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Thu, 22 Nov 2018 20:01:32 -0500
Subject: [PATCH 04/16] solo se muestra el controlador de session si se esta
 logueado

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

diff --git a/index.php b/index.php
index f14d9f3..d167f64 100644
--- a/index.php
+++ b/index.php
@@ -1699,12 +1699,20 @@ $(document).delegate('*[data-toggle="lightbox"]', 'click', function(event) {
 
 
 <script type="text/javascript" src="librerias/landingjs/scripts_landing.js"></script>
+
+<?php 
+if(isset($_SESSION['id'] )) {
+	echo "
 <form name='form_session' class='navbar-form navbar-left'>
 					<div class='input-group'>
 						<input type='text' name='tiempo_session' size='18' class='form-control input-sm' readonly>
-						<span class='input-group-addon'><a href='#' onclick="location.reload();" title='Renovar'> <i class='fa fa-refresh' aria-hidden='true'></i></a></span>
+						<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>
+		</form>";
+		
+		}
+?>
+
 <script  type="text/javascript"> 
 $('.navbar-collapse a').click(function(){
     $(".navbar-collapse").collapse('hide');

From cf95a841c932157b2591b3dd76744b80c985d555 Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Thu, 22 Nov 2018 20:58:47 -0500
Subject: [PATCH 05/16] pagina de inicio

---
 index.php | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/index.php b/index.php
index d167f64..68e8c74 100644
--- a/index.php
+++ b/index.php
@@ -123,12 +123,15 @@ $v = decodifica_parametro($variable);
 
 if ($v[0] =='e') {
 	if(!isset($_REQUEST['home'])){
-		$pagina_inicio_definida = remplacetas('form_parametrizacion','id_empresa',$v[1],'descripcion'," tabla='empresa' AND opcion='pagina_inicio'") ;
-		$vista_favorita = vista_favorita($pagina_inicio_definida[0]);
-	//	$onload = "<script type=\"text/javascript\">window.location.href='$vista_favorita';</script> ";
-	if($vista_favorita[0] !=""){
-		$variable = $vista_favorita;//"e".$_REQUEST['empresa'];
-	}
+			$pagina_inicio_definida = remplacetas('form_parametrizacion','id_empresa',$v[1],'descripcion'," tabla='empresa' AND opcion='pagina_inicio'") ;
+			$vista_favorita = vista_favorita($pagina_inicio_definida[0]);
+		//	$onload = "<script type=\"text/javascript\">window.location.href='$vista_favorita';</script> ";
+		if($vista_favorita[0] !=""){
+			$variable = $vista_favorita;//"e".$_REQUEST['empresa'];
+		}else{
+			$variable= "$v[0]$v[1]";
+			
+			}
 	}
 }
 $v = decodifica_parametro($variable);

From 7c3619a60ffdd36213c1d10077428ca9890d6f98 Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Sat, 24 Nov 2018 12:13:53 -0500
Subject: [PATCH 06/16] correccion bug editor

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

diff --git a/milfs b/milfs
index 0a5b44a..2e10e76 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 0a5b44abd78484cb237d1b243fafb36f4a9a99ba
+Subproject commit 2e10e762ce83d5e904b34a5cc481aa17887e9379

From ad04549388a8e1ea65fea62fbc294282a85c649e Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Sat, 24 Nov 2018 13:30:54 -0500
Subject: [PATCH 07/16] manejo de session

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

diff --git a/milfs b/milfs
index 2e10e76..1b48337 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 2e10e762ce83d5e904b34a5cc481aa17887e9379
+Subproject commit 1b483371628113723b30f75f553476fb6289a52f

From b5923d1418e175f706d4654e1fb3ab26928be446 Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Mon, 26 Nov 2018 09:46:47 -0500
Subject: [PATCH 08/16] mejoras en infinity scroll

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

diff --git a/index.php b/index.php
index 68e8c74..0e627a6 100644
--- a/index.php
+++ b/index.php
@@ -90,8 +90,8 @@ $librerias_pie ="";
 /// m = checklist
 /// n=notas
 /// o=parallax
-
 /// p= Planilla
+/// q = lab
 /// s= SET DE DATOS *
 /// S= SET DE DATOS EMBEBIDO
 
@@ -668,6 +668,83 @@ if('serviceWorker' in navigator) {
 ";
 
 			$onload = vista_aplicacion($form);
+		}elseif($v[0] =='q') {
+			$form =$v[1];
+			$embebido = "1";
+			$no_mostrar ="display:none; ";
+			
+	  		$librerias_galeria ="
+<!-- 	  		<link rel='manifest' href='manifest.json'> -->
+	  		  <link rel='stylesheet' type='text/css' href='librerias/slick/slick.css'>
+			  <link rel='stylesheet' type='text/css' href='librerias/slick/slick-theme.css'>
+			  <link rel='stylesheet' type='text/css' href='librerias/slick/style.css'>
+			  <script src='manup.js'></script>
+	  		";
+
+	  		$registros=1;
+	  		$registros_pagina=5;
+	  		$plantilla="landingpage";
+	  		$librerias_cabeza ="
+	  		<style>
+	  		
+	  		.control_planilla{
+	  		display:none
+	  		}
+	  		
+	  		</style>
+	  		 
+	  		 $librerias_galeria
+
+
+	  		";
+$librerias_pie ="
+
+
+	  
+
+
+
+<script type = 'text/javascript' >
+	$(document).ready(function() {
+
+		
+
+		loadArticle(1,$form,'galeria',$registros,'scroll-galeria','voyeur');
+		loadArticle(2,$form,'galeria',$registros,'scroll-galeria','voyeur');
+		loadArticle(3,$form,'galeria',$registros,'scroll-galeria','voyeur');
+		loadArticle(4,$form,'galeria',$registros,'scroll-galeria','voyeur');
+		loadArticle(5,$form,'galeria',$registros,'scroll-galeria','voyeur');
+		loadArticle(6,$form,'galeria',$registros,'scroll-galeria','voyeur');
+		loadArticle(7,$form,'galeria',$registros,'scroll-galeria','voyeur');
+		loadArticle(8,$form,'galeria',$registros,'scroll-galeria','voyeur');
+		loadArticle(9,$form,'galeria',$registros,'scroll-galeria','voyeur');
+		loadArticle(10,$form,'galeria',$registros,'scroll-galeria','voyeur');
+
+		var count2 = 11;
+		$('div').scroll(function() {
+			var offset = $('#scroll-galeria div').length;
+			var \$this = $(this);
+			var height = this.scrollHeight - \$this.height(); // Get the height of the div
+			var scroll = \$this.scrollTop(); // Get the vertical scroll position
+
+			var isScrolledToEnd = (scroll >= height);
+
+
+			if (isScrolledToEnd) {
+						loadArticle(count2,$form,'voyeur',$registros,'scroll-galeria','voyeur');
+				count2++;
+			}
+		});
+
+	});
+
+
+</script>
+
+
+";
+
+			$onload = vista_voyeur($form);
 		}
 		elseif($v[0] =='g') {
 			/// g=FORMULARIO EMBEBIDO
diff --git a/milfs b/milfs
index 1b48337..e9c1c88 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 1b483371628113723b30f75f553476fb6289a52f
+Subproject commit e9c1c882974048e0e7c276daac4a024bbd576c95

From 1db0cc159c654c35010cad9c226b268010beba9e Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Mon, 26 Nov 2018 12:07:03 -0500
Subject: [PATCH 09/16] mejoras en infinity scroll

---
 index.php | 11 +++++++++--
 milfs     |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index 0e627a6..208cd27 100644
--- a/index.php
+++ b/index.php
@@ -686,7 +686,13 @@ if('serviceWorker' in navigator) {
 	  		$plantilla="landingpage";
 	  		$librerias_cabeza ="
 	  		<style>
-	  		
+	  	
+			
+			img {     display: block;
+    max-width: 100%;
+    height: auto;}
+			
+			
 	  		.control_planilla{
 	  		display:none
 	  		}
@@ -757,11 +763,12 @@ $librerias_pie ="
 	  		$embebido = "1";
 			$onload = formulario_embebido($form,$opciones);
 			$librerias_cabeza ="
+
 			<script src='./librerias/summernote/summernote.js'></script>
 			<link href='./librerias/summernote/summernote.css' rel='stylesheet'>
 			";
 		$librerias_pie ="
-
+			
     <script type='text/javascript'>
 			//// wysiwyg
 			var edit = function() {
diff --git a/milfs b/milfs
index e9c1c88..ae3965f 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit e9c1c882974048e0e7c276daac4a024bbd576c95
+Subproject commit ae3965fb13ecae89e8f971f385acaffa38dabea9

From d88fc94b4b1cb407868b1f29e4889e6afa5e5098 Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Tue, 27 Nov 2018 09:00:04 -0500
Subject: [PATCH 10/16] soporte experiemntal MD en campo notas

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

diff --git a/index.php b/index.php
index 208cd27..faf9e11 100644
--- a/index.php
+++ b/index.php
@@ -7,8 +7,9 @@
 	//$xajax = new xajax("https://tupale.co/index.php");
 	require ("milfs/funciones/conex.php");
    require ('milfs/funciones/funciones.php');
+   include ('milfs/librerias/parsedown/Parsedown.php');
    include ('milfs/addon/funciones.php');
-   require ("milfs/includes/markdown.php");
+  // require ("milfs/includes/markdown.php");
    require ("milfs/includes/parametrizacion.php");
    require ("milfs/includes/simple_html_dom.php");
 	$xajax->processRequests();

From 4df695ae6439f48f543fa5e367452511e99efde4 Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Wed, 28 Nov 2018 05:40:26 -0500
Subject: [PATCH 11/16] MD en api

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

diff --git a/index.php b/index.php
index faf9e11..b5dad9e 100644
--- a/index.php
+++ b/index.php
@@ -6,8 +6,10 @@
 	$xajax = new xajax("");
 	//$xajax = new xajax("https://tupale.co/index.php");
 	require ("milfs/funciones/conex.php");
+	   include ('milfs/librerias/parsedown/Parsedown.php');
+	   
    require ('milfs/funciones/funciones.php');
-   include ('milfs/librerias/parsedown/Parsedown.php');
+
    include ('milfs/addon/funciones.php');
   // require ("milfs/includes/markdown.php");
    require ("milfs/includes/parametrizacion.php");
diff --git a/milfs b/milfs
index ae3965f..153517f 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit ae3965fb13ecae89e8f971f385acaffa38dabea9
+Subproject commit 153517f9624d7f4685343d534f67d320d708e482

From f6213e5a8241c49b762f55e7bfc1a1d4df7db82c Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Thu, 29 Nov 2018 07:07:33 -0500
Subject: [PATCH 12/16] mejoras en infinity scroll

---
 index.php | 1 +
 milfs     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index b5dad9e..4399557 100644
--- a/index.php
+++ b/index.php
@@ -673,6 +673,7 @@ if('serviceWorker' in navigator) {
 			$onload = vista_aplicacion($form);
 		}elseif($v[0] =='q') {
 			$form =$v[1];
+			if($form==""){$form='0';}
 			$embebido = "1";
 			$no_mostrar ="display:none; ";
 			
diff --git a/milfs b/milfs
index 153517f..00c726b 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 153517f9624d7f4685343d534f67d320d708e482
+Subproject commit 00c726b3cf4077cf2f603e47cdb2aa3894e2cd16

From d102d41a82b35ea55a08ae2c111d875a8beb74be Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Thu, 29 Nov 2018 07:31:28 -0500
Subject: [PATCH 13/16] correcion escapado en json

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

diff --git a/milfs b/milfs
index 00c726b..c6b3abc 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 00c726b3cf4077cf2f603e47cdb2aa3894e2cd16
+Subproject commit c6b3abcd6c81b386aa6092a7ff08d6729a43bcb6

From 3fba10bc87ea407c8021a964c77063ac2668d24d Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Fri, 30 Nov 2018 02:58:34 -0500
Subject: [PATCH 14/16] test

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

diff --git a/milfs b/milfs
index c6b3abc..0cb2568 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit c6b3abcd6c81b386aa6092a7ff08d6729a43bcb6
+Subproject commit 0cb256866e28e90ec51516565ee0fde001343390

From 4f5bc9449a690c40c0cf70adc2a7cc62d5d4ee3c Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Fri, 30 Nov 2018 04:33:42 -0500
Subject: [PATCH 15/16] =?UTF-8?q?vista=20a=C3=B1o=20en=20agenda?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/index.php b/index.php
index 4399557..934b4ec 100644
--- a/index.php
+++ b/index.php
@@ -1467,7 +1467,7 @@ $css_adicional
 				right: 'listMonth,month,agendaWeek,agendaDay,listYear,timeLineYear'
 			},
 			//defaultDate: '2017-10-12',
-			defaultView: 'listMonth',
+			defaultView: 'listYear',
 			themeSystem: 'bootstrap3',
 			navLinks: true, // can click day/week names to navigate views
 			editable: false,
diff --git a/milfs b/milfs
index 0cb2568..5cf63a8 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 0cb256866e28e90ec51516565ee0fde001343390
+Subproject commit 5cf63a8fe146bcd16e4062b657a9404740b3035b

From 5ad075c98c45dc9ba25c93ebc983f623bf4cef5d Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Fri, 30 Nov 2018 08:46:14 -0500
Subject: [PATCH 16/16] bug en formularios anidados

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

diff --git a/milfs b/milfs
index 5cf63a8..b5146f3 160000
--- a/milfs
+++ b/milfs
@@ -1 +1 @@
-Subproject commit 5cf63a8fe146bcd16e4062b657a9404740b3035b
+Subproject commit b5146f32e000cf8b8b94d1dea6c738a27f3c5461