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

Enviando cambios de la rama magenta #10

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

Enviando cambios de la rama magenta #10

wants to merge 42 commits into from

Commits on Apr 11, 2023

  1. Formulario registro e implementacion de estilos

    @adrieli2307
    adrieli2307 committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    6bc4e76 View commit details
    Browse the repository at this point in the history

  2. Se realizó la estructura de la página home y se dio diseño segun prot… 

    …otipo
    @abrakel
    abrakel committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    5cbbc55 View commit details
    Browse the repository at this point in the history

  3. Enviando cambios de la rama magenta

    @Meowwuw
    Meowwuw committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    a2af068 View commit details
    Browse the repository at this point in the history

  4. Correciones de imagen en formulario CSS

    @adrieli2307
    adrieli2307 committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    e3b4494 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1 from adrieli2307/alejandra 

    Primer merge de la rama alejandra
    @Meowwuw
    Meowwuw authored Apr 11, 2023
    Configuration menu
    Copy the full SHA
    cc7ee4d View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/main' into magenta

    @Meowwuw
    Meowwuw committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    30448e1 View commit details
    Browse the repository at this point in the history

  7. Fucionando merge con rama main

    @Meowwuw
    Meowwuw committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    e7473d3 View commit details
    Browse the repository at this point in the history

  8. Corrección de nombres de archivos para juntar trabajos con colaboradores

    @abrakel
    abrakel committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    7f0dff8 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #2 from adrieli2307/magenta 

    merge de rama magenta, con código de ramas magenta y alejandra juntos
    @abrakel
    abrakel authored Apr 11, 2023
    Configuration menu
    Copy the full SHA
    7ba6aab View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/main' into alejandra

    @abrakel
    abrakel committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    bedf4e9 View commit details
    Browse the repository at this point in the history

  11. Merge con rama magenta

    @abrakel
    abrakel committed Apr 11, 2023
    Configuration menu
    Copy the full SHA
    f8ec421 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Merge pull request #3 from adrieli2307/alejandra 

    Pull Request 3
    @adrieli2307
    adrieli2307 authored Apr 12, 2023
    Configuration menu
    Copy the full SHA
    27fd903 View commit details
    Browse the repository at this point in the history

  2. Compilacion de avance red social

    @adrieli2307
    adrieli2307 committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    13fb3b5 View commit details
    Browse the repository at this point in the history

  3. Agregar archivos de imagen

    @adrieli2307
    adrieli2307 committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    6fa2440 View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

  1. imagenes

    @adrieli2307
    adrieli2307 committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    0909a2e View commit details
    Browse the repository at this point in the history

  2. Renombrar login

    @adrieli2307
    adrieli2307 committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    965b9eb View commit details
    Browse the repository at this point in the history

  3. Agregar Firebase SDK

    @adrieli2307
    adrieli2307 committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    f530623 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2023

  1. Unificacion de estilos CSS de las 3 páginas-

    @adrieli2307
    adrieli2307 committed Apr 14, 2023
    Configuration menu
    Copy the full SHA
    27c95de View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2023

  1. Merge pull request #4 from adrieli2307/adri 

    Actualizacion estilos CSS
    @adrieli2307
    adrieli2307 authored Apr 16, 2023
    Configuration menu
    Copy the full SHA
    261ddbd View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Se agrego autenticacion con microsoft e inicializó firebase

    @abrakel
    abrakel committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    ed74d4a View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/main' into alejandra

    @abrakel
    abrakel committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    5b066e0 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2023

  1. First commit

    @Meowwuw
    Meowwuw committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    b3fe419 View commit details
    Browse the repository at this point in the history

  2. Enviando login con ingreso a Twitter

    @Meowwuw
    Meowwuw committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    b0076c9 View commit details
    Browse the repository at this point in the history

  3. gitignore

    @Meowwuw
    Meowwuw committed Apr 18, 2023
    Configuration menu
    Copy the full SHA
    812695e View commit details
    Browse the repository at this point in the history

  4. Delete firebaseConfig.js

    @Meowwuw
    Meowwuw authored Apr 18, 2023
    Configuration menu
    Copy the full SHA
    8e9f851 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Ingreso con email y password

    @adrieli2307
    adrieli2307 committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    202e81b View commit details
    Browse the repository at this point in the history

  2. Inicio de sesión con gmail y twitter 

    Inicio de sesión con gmail y twitter
    @adrieli2307
    adrieli2307 authored Apr 19, 2023
    Configuration menu
    Copy the full SHA
    cf84599 View commit details
    Browse the repository at this point in the history

  3. Compilación inicio de sesión

    @adrieli2307
    adrieli2307 committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    dd53f9c View commit details
    Browse the repository at this point in the history

  4. Compilaciones de los tipos de inicio de sesión del proyecto 

    Twitter 
Email
Gmail
    @adrieli2307
    adrieli2307 authored Apr 19, 2023
    Configuration menu
    Copy the full SHA
    f1a062e View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2023

  1. avances inicio de sesion con microsoft

    @abrakel
    abrakel committed Apr 24, 2023
    Configuration menu
    Copy the full SHA
    0609804 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2023

  1. actualización proyecto magenta y adriana

    @abrakel
    abrakel committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    19de90a View commit details
    Browse the repository at this point in the history

  2. Avances de magenta y adriana juntos

    @abrakel
    abrakel committed Apr 25, 2023
    Configuration menu
    Copy the full SHA
    f372995 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2023

  1. Se agregó condicion al post para que no se pueda postear con campos v… 

    …acíos y se agregó modal para alertar al usuario
    @abrakel
    abrakel committed Apr 27, 2023
    Configuration menu
    Copy the full SHA
    ad27b61 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2023

  1. Se dio diseño a la pagina muro

    @abrakel
    abrakel committed May 3, 2023
    Configuration menu
    Copy the full SHA
    d557f4c View commit details
    Browse the repository at this point in the history

Commits on May 5, 2023

  1. Solucion a click de botones y diseño css

    @abrakel
    abrakel committed May 5, 2023
    Configuration menu
    Copy the full SHA
    1b398b8 View commit details
    Browse the repository at this point in the history

  2. se agregó fecha a las publicaciones

    @abrakel
    abrakel committed May 5, 2023
    Configuration menu
    Copy the full SHA
    7178bb5 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2023

  1. Se dio diseño final mobile first y se agrego funcion de fecha y hora … 

    …servidor a los post
    @abrakel
    abrakel committed May 8, 2023
    Configuration menu
    Copy the full SHA
    8b80c3e View commit details
    Browse the repository at this point in the history

Commits on May 9, 2023

  1. se agregó la funcion like

    @abrakel
    abrakel committed May 9, 2023
    Configuration menu
    Copy the full SHA
    35166bf View commit details
    Browse the repository at this point in the history

Commits on May 15, 2023

  1. diseño final y corrección función button like

    @abrakel
    abrakel committed May 15, 2023
    Configuration menu
    Copy the full SHA
    43d9ff2 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. se cambio la funcion de botón like, utilizando arrayUnion y arrayRemove

    @abrakel
    abrakel committed May 16, 2023
    Configuration menu
    Copy the full SHA
    c0a097e View commit details
    Browse the repository at this point in the history

  2. Actualización readme

    @abrakel
    abrakel committed May 16, 2023
    Configuration menu
    Copy the full SHA
    ba11c18 View commit details
    Browse the repository at this point in the history

  3. correccion readme

    @abrakel
    abrakel committed May 16, 2023
    Configuration menu
    Copy the full SHA
    7e8ddbe View commit details
    Browse the repository at this point in the history