Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prueba #21

Open
wants to merge 56 commits into
base: main
Choose a base branch
from
Open

Prueba #21

wants to merge 56 commits into from

Commits on Jun 18, 2024

  1. hola mundo

    @Maye85
    Maye85 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    1231568 View commit details
    Browse the repository at this point in the history

  2. hola mundo beta

    @Maye85
    Maye85 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    a478a98 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from Maye85/prueba 

    Prueba
    @lisettevirginia
    lisettevirginia committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    8114266 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. esqueleto del HTML

    @Maye85
    Maye85 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    d608777 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. modificación del html

    @Maye85
    Maye85 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    ab63a1d View commit details
    Browse the repository at this point in the history

  2. primera version del dataset

    @lisettevirginia
    lisettevirginia committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    669aef2 View commit details
    Browse the repository at this point in the history

  3. segunda version del dataset

    @lisettevirginia
    lisettevirginia committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    27fd7a7 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #5 from lisettevirginia/feature-dataset 

    Feature dataset
    @Maye85
    Maye85 committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    bfebaf1 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. arreglo del dataset y agregado de URL de imagenes

    @Maye85
    Maye85 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    35c0853 View commit details
    Browse the repository at this point in the history

  2. prueba beta

    @Maye85
    Maye85 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    5b92880 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #6 from Maye85/primerhito 

    prueba beta
    @Maye85
    Maye85 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    b0be6d3 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. metodo reactor hito 2

    @Maye85
    Maye85 committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    0e834fd View commit details
    Browse the repository at this point in the history

  2. Merge pull request #7 from Maye85/primerhito 

    metodo reactor hito 2
    @lisettevirginia
    lisettevirginia committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    9a19f8d View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. nuestra primera versión del código

    @lisettevirginia
    lisettevirginia committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    85cc04d View commit details
    Browse the repository at this point in the history

  2. prueba dos

    @lisettevirginia
    lisettevirginia committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    b850da6 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #8 from lisettevirginia/SegundoHitoLis 

    Segundo hito lis
    @lisettevirginia
    lisettevirginia committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    a2a3c7a View commit details
    Browse the repository at this point in the history

  4. correccion de errores en el view.js y se agregaron algunos comentarios

    @Maye85
    Maye85 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    4d5d984 View commit details
    Browse the repository at this point in the history

  5. segundo intento, correciones del view.js y se agregaron comentarios f… 

    …altante
    @Maye85
    Maye85 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    39d1285 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #9 from Maye85/segundohitomaye 

    Segundohitomaye
    @Maye85
    Maye85 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    2022f16 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. comienzo de botones

    @Maye85
    Maye85 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    5e78ebd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'prueba' of github.com:Maye85/DEV015-dataverse into segu… 

    …ndohitomaye
    @Maye85
    Maye85 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    e5dcead View commit details
    Browse the repository at this point in the history

  3. comienzo de funcionalidades de botones

    @Maye85
    Maye85 committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    03b93b4 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2024

  1. se agrego el select, se corrigió la muestra de la información, se cam… 

    …bio el orden en el q se muestra la información
    @lisettevirginia
    lisettevirginia committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    a1b7971 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11 from lisettevirginia/cambiolis2806 

    Cambiolis2806
    @Maye85
    Maye85 committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    c408d0b View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2024

  1. correcciones de errores del test OAS-HTML

    @Maye85
    Maye85 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    eaa9f00 View commit details
    Browse the repository at this point in the history

  2. correcciones del test OAS-HTML y comentario

    @Maye85
    Maye85 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    02b74b3 View commit details
    Browse the repository at this point in the history

  3. tercer intento

    @Maye85
    Maye85 committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    c566254 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Merge pull request #12 from Maye85/segundohitomaye 

    Segundohitomaye
    @lisettevirginia
    lisettevirginia committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    e1be615 View commit details
    Browse the repository at this point in the history

  2. mejorando el código para poder implementar los filtros necesarios, ag… 

    …regado el item familia para hacer el filtro
    @lisettevirginia
    lisettevirginia committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    1f75493 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #13 from lisettevirginia/segundohitomaye 

    Cambio Lis Lunes 01-07
    @Maye85
    Maye85 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    d842a10 View commit details
    Browse the repository at this point in the history

  4. primera versión de las funciones de filtrado y ordenado

    @Maye85
    Maye85 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    3523547 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #14 from Maye85/segundohitomaye 

    primera versión de las funciones de filtrado y ordenado
    @lisettevirginia
    lisettevirginia committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    fa3a72e View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2024

  1. errores del main, HTML y dataFunction arreglados

    @Maye85
    Maye85 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    778ebe1 View commit details
    Browse the repository at this point in the history

  2. filtro que si filtra, ordenador q ordena de a-z pero no de z-a y boto… 

    …n que despeja cuando quiere
    @lisettevirginia
    lisettevirginia committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    82590b1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #15 from lisettevirginia/segundohitomaye 

    Segundohitomaye
    @Maye85
    Maye85 committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    ac47ea7 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. comentarios de linea de código

    @Maye85
    Maye85 committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    03912fb View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2024

  1. segundo intento

    @Maye85
    Maye85 committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    949b8b2 View commit details
    Browse the repository at this point in the history

  2. cuarto intento

    @Maye85
    Maye85 committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    8ea4bf4 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #16 from Maye85/segundohitomaye 

    Segundohitomaye
    @Maye85
    Maye85 committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    4cb92fd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'prueba' of https://github.com/Maye85/DEV015-dataverse i… 

    …nto segundohitomaye
    @lisettevirginia
    lisettevirginia committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    477ce6c View commit details
    Browse the repository at this point in the history

  5. subiebdo por 5ta vez

    @Maye85
    Maye85 committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    3d8b8ad View commit details
    Browse the repository at this point in the history

  6. Merge branch 'segundohitomaye' of https://github.com/Maye85/DEV015-da… 

    …taverse into segundohitomaye
    @lisettevirginia
    lisettevirginia committed Jul 9, 2024
    Configuration menu
    Copy the full SHA
    a3ca69d View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. se mejoró el CSS y se agregaron imagenes

    @Maye85
    Maye85 committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    443a1a5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'segundohitomaye' of https://github.com/Maye85/DEV015-da… 

    …taverse into segundohitomaye
    @lisettevirginia
    lisettevirginia committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    423483f View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. corrección de errores del test de html

    @lisettevirginia
    lisettevirginia committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    4fba9e8 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2024

  1. cambios en el css para poder ver las tarjetas segun pantalla, elimina… 

    … el ul adicional y se cambio el selectbyid por un queryselector en el dataview
    @lisettevirginia
    lisettevirginia committed Jul 20, 2024
    Configuration menu
    Copy the full SHA
    b43779c View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. Merge pull request #19 from Maye85/segundohitomaye 

    Arreglo de css
    @Maye85
    Maye85 committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    6444e1e View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2024

  1. comienzo del calculo de estadistica y terminado del CSS

    @Maye85
    Maye85 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    e0083ea View commit details
    Browse the repository at this point in the history

  2. Merge pull request #20 from Maye85/segundohitomaye 

    comienzo del calculo de estadistica y terminado del CSS
    @Maye85
    Maye85 committed Jul 23, 2024
    Configuration menu
    Copy the full SHA
    9edc04b View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. se agrego los filtros correspondientes y anidados, se estuvo moviendo… 

    … el css en cuanto a tamaño de la letra y ubicacion del form de los filtros
    @lisettevirginia
    lisettevirginia committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    91f05d7 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2024

  1. se creó el boton en el HTML, el DOM y el manejador de enventos en el … 

    …main y la funcion en el datafuntion
    @Maye85
    Maye85 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    2004e09 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #21 from Maye85/tercerhitolisette 

    Tercer hito
    @Maye85
    Maye85 committed Jul 26, 2024
    Configuration menu
    Copy the full SHA
    cff60d5 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2024

  1. calculo de estadisticas creado, se agregó un select para el mismo, ad… 

    …emas de crearle estilos en CSS para que el cuadro del resultado aparezca solo al dar resultados
    @Maye85
    Maye85 committed Jul 27, 2024
    Configuration menu
    Copy the full SHA
    ec2a9b2 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. arreglo del test JS con el cambio al metodo map y reduce, agregamos e… 

    …l readme y comentarios del código para mejor comprension del mismo
    @Maye85
    Maye85 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    33fcd5e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #22 from Maye85/cuartohitolismay 

    calculo de estadisticas creado, se agregó un select para el mismo, ad…
    @Maye85
    Maye85 committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    9203c3e View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2024

  1. Update style.css 

    adición de una llave que se había borrado en la linea  140
    @Maye85
    Maye85 committed Aug 1, 2024
    Configuration menu
    Copy the full SHA
    66c1a91 View commit details
    Browse the repository at this point in the history