From 6e7ad3244fb3a34be822acea8a9b324223f33306 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sun, 14 Oct 2018 08:56:06 -0500 Subject: [PATCH 01/12] fusiones y actualizaciones luego de los cambios --- milfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milfs b/milfs index 3f72450..60f3c18 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 3f72450e6bfdd1759235559a81847dbb4dfdca50 +Subproject commit 60f3c18a77515b1dbb28741afd7181afafa03f59 -- 2.30.2 From a967e87db318ad46ad9ca959d83c70428626b857 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sun, 14 Oct 2018 10:46:17 -0500 Subject: [PATCH 02/12] actualizacion submodulo --- milfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milfs b/milfs index 60f3c18..46b9ba4 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 60f3c18a77515b1dbb28741afd7181afafa03f59 +Subproject commit 46b9ba4193762a9ed0652e6b8a63f410ec800d17 -- 2.30.2 From 4a9effdc2594900dd125f22542351a014ef720f2 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sun, 14 Oct 2018 21:24:44 -0500 Subject: [PATCH 03/12] ultimos ajustes de menus --- index.php | 14 ++++++-------- librerias/landingjs/scripts_landing.js | 4 ++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/index.php b/index.php index 8ee1bd0..7453210 100644 --- a/index.php +++ b/index.php @@ -955,7 +955,7 @@ $aplicacion_pie=" -
    +
      $aplicaciones_listado
    @@ -1115,14 +1115,12 @@ $panel_aplicaciones = panel_aplicaciones('1',"",""); if(isset($_SESSION['id'])){ $boton_ingresar=" -
  • - $_SESSION[username] -
      -
    • - $panel_aplicaciones -
      • + diff --git a/librerias/landingjs/scripts_landing.js b/librerias/landingjs/scripts_landing.js index 055fa74..d5aa47f 100644 --- a/librerias/landingjs/scripts_landing.js +++ b/librerias/landingjs/scripts_landing.js @@ -9,3 +9,7 @@ $(window).scroll(function() { $(window).scroll(function(){ $(".top").css("opacity", 1 - $(window).scrollTop() / 100); }); + +$('.dropdown-menu').click(function(e) { + e.stopPropagation(); //This will prevent the event from bubbling up and close the dropdown when you type/click on text boxes. + }); -- 2.30.2 From 265311560f11f236e23046f81b4f51ac84a9a07b Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sun, 14 Oct 2018 21:31:57 -0500 Subject: [PATCH 04/12] cambios que generaron conflicto submodulo --- milfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milfs b/milfs index 46b9ba4..291d171 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 46b9ba4193762a9ed0652e6b8a63f410ec800d17 +Subproject commit 291d171d9d7dcdbd00c5c586124482fb1dcccc90 -- 2.30.2 From 6aa49b4903c501b0e7a1d494f07f957f192a9f3d Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Sun, 14 Oct 2018 22:08:10 -0500 Subject: [PATCH 05/12] deshaciendo el ultimo commit --- milfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milfs b/milfs index 60f3c18..46b9ba4 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 60f3c18a77515b1dbb28741afd7181afafa03f59 +Subproject commit 46b9ba4193762a9ed0652e6b8a63f410ec800d17 -- 2.30.2 From b6292462df77896678730dc6c0843cf49cdb24ea Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Mon, 22 Oct 2018 11:46:00 -0500 Subject: [PATCH 06/12] =?UTF-8?q?cambios=20de=20branch=20han=20generado=20?= =?UTF-8?q?confusi=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 46b9ba4..a4422bf 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 46b9ba4193762a9ed0652e6b8a63f410ec800d17 +Subproject commit a4422bfcde4c942a7160492c381fdf4d98471360 -- 2.30.2 From 03f991ab3b07d38524ce7e3f6d3c197fae06b050 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Mon, 22 Oct 2018 11:47:44 -0500 Subject: [PATCH 07/12] =?UTF-8?q?cambiso=20de=20branch=20han=20generado=20?= =?UTF-8?q?confusi=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 a4422bf..291d171 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit a4422bfcde4c942a7160492c381fdf4d98471360 +Subproject commit 291d171d9d7dcdbd00c5c586124482fb1dcccc90 -- 2.30.2 From ea86a011e54f276525099004e7d35a02dfdc7e40 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Mon, 22 Oct 2018 11:50:09 -0500 Subject: [PATCH 08/12] merge --- milfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milfs b/milfs index 291d171..0138eb8 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 291d171d9d7dcdbd00c5c586124482fb1dcccc90 +Subproject commit 0138eb8fc9913394dc5ce85c315db67f240948c5 -- 2.30.2 From 3c97762c7771f65a33ecbca1963c7d3720e66383 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Mon, 22 Oct 2018 11:53:15 -0500 Subject: [PATCH 09/12] submodulo --- milfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/milfs b/milfs index 0138eb8..d4f6425 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 0138eb8fc9913394dc5ce85c315db67f240948c5 +Subproject commit d4f6425c750d4e5a19b7c6b9b6f72aebef140fce -- 2.30.2 From 351276ca5bcd04119e133c37620e5c838f64ae22 Mon Sep 17 00:00:00 2001 From: h4ckypurpl3 Date: Mon, 22 Oct 2018 12:30:05 -0500 Subject: [PATCH 10/12] seguimiento a bugs --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 459793b..2181d3e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "milfs"] path = milfs - url = https://code.tupale.co/qwerty/milfs + url = https://code.tupale.co/kleper/milfskleper -- 2.30.2 From 16db54fa9cb94019cd65d2e380b29e25aebebc19 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 22 Oct 2018 12:30:58 -0500 Subject: [PATCH 11/12] Submodule update --- .gitmodules | 3 ++- milfs | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 459793b..6f9ddfd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "milfs"] path = milfs - url = https://code.tupale.co/qwerty/milfs + url = https://code.tupale.co/kleper/milfskleper + branch = master diff --git a/milfs b/milfs index 0138eb8..3373ee1 160000 --- a/milfs +++ b/milfs @@ -1 +1 @@ -Subproject commit 0138eb8fc9913394dc5ce85c315db67f240948c5 +Subproject commit 3373ee1dd17019a91f63696fdfc00277dd6ad88a -- 2.30.2 From d50cc14bf1c43923dc159410e957552cf80ff2ad Mon Sep 17 00:00:00 2001 From: kleper Date: Wed, 24 Oct 2018 09:15:14 -0500 Subject: [PATCH 12/12] Dropdown menu administrador corregido --- index.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/index.php b/index.php index fcffa38..9235b51 100644 --- a/index.php +++ b/index.php @@ -13,8 +13,8 @@ if(isset($_REQUEST['debug'])) { require ("milfs/includes/markdown.php"); require ("milfs/includes/parametrizacion.php"); require ("milfs/includes/simple_html_dom.php"); - $xajax->processRequests(); - + $xajax->processRequests(); + $timestamp=time(); setcookie("timestamp",$timestamp,($timestamp + 5000)); $_SESSION['timestamp']= $timestamp; @@ -1125,7 +1125,7 @@ $panel_aplicaciones = panel_aplicaciones('1',"",""); @@ -1138,12 +1138,12 @@ $panel_aplicaciones = panel_aplicaciones('1',"",""); ;} - if(isset($_SESSION['id'])){ + if(isset($_SESSION['id'])){ $form_tiempo_session = "
    • -
      +
      - + Reload
      @@ -1273,7 +1273,7 @@ $menu_lateral = " $soporte
      • - +
    -- 2.30.2