Code

Dev marta#25

Code

Open

MartaHung wants to merge 92 commits intoLaboratoria:mainLaboratoria/SCL020-social-network:mainfrom MartaHung:devMartaMartaHung/SCL020-social-network:devMartaCopy head branch name to clipboard

+509-530

Commits

Commits on Jun 18, 2022

• probando css

  FernandaFloresC

  committed
  0b15e47

  Copy full SHA for 0b15e47

Commits on Jun 20, 2022

• Merge pull request #1 from MartaHung/DevFer

  Show description for 1e00a70
  MartaHung

  authored
  1e00a70

  Copy full SHA for 1e00a70

• templaate test

  MartaHung

  committed
  6b9d449

  Copy full SHA for 6b9d449

• Merge pull request #2 from MartaHung/devMarta

  Show description for 598cffc
  MartaHung

  authored
  598cffc

  Copy full SHA for 598cffc

• agregamos los templates y routes de prueba

  FernandaFloresC

  committed
  51fe488

  Copy full SHA for 51fe488

• Merge pull request #3 from MartaHung/DevFer

  Show description for 3ab288d
  MartaHung

  authored
  3ab288d

  Copy full SHA for 3ab288d

• tz

  MartaHung

  committed
  3f666a1

  Copy full SHA for 3f666a1

• m

  MartaHung

  committed
  bc04251

  Copy full SHA for bc04251

• gradiente rosa con meme

  FernandaFloresC

  committed
  a49900f

  Copy full SHA for a49900f

Commits on Jun 30, 2022

• templates, intento de rutas

  MartaHung

  committed
  08e7448

  Copy full SHA for 08e7448

• templates separados

  MartaHung

  committed
  6ba5ad7

  Copy full SHA for 6ba5ad7

• Merge pull request #4 from MartaHung/devMarta

  Show description for 3dc2c0f
  MartaHung

  authored
  3dc2c0f

  Copy full SHA for 3dc2c0f

Commits on Jul 4, 2022

• se agrega base de las funciones para enrutar y cambiar de ruta y la funcion init

  MartaHung

  committed
  a166f15

  Copy full SHA for a166f15

• Merge pull request #5 from MartaHung/devMarta

  Show description for 5ea3b14
  MartaHung

  authored
  5ea3b14

  Copy full SHA for 5ea3b14

• error de visual

  FernandaFloresC

  committed
  279c322

  Copy full SHA for 279c322

• Merge branch 'devMarta' of https://github.com/MartaHung/SCL020-social-network into DevFer

  FernandaFloresC

  committed
  5e2f4e9

  Copy full SHA for 5e2f4e9

• rama kathy

  KatherineGalleguillos

  committed
  655a6c4

  Copy full SHA for 655a6c4

• Merge pull request #6 from MartaHung/devkathy

  Show description for d0280ac
  MartaHung

  authored
  d0280ac

  Copy full SHA for d0280ac

• actualizacion

  MartaHung

  committed
  96ec552

  Copy full SHA for 96ec552

• Merge pull request #7 from MartaHung/devMarta

  Show description for 66dcf23
  MartaHung

  authored
  66dcf23

  Copy full SHA for 66dcf23

• KatherineGalleguillos

  committed
  159e66a

  Copy full SHA for 159e66a

• Merge branch 'devkathy' of https://github.com/MartaHung/SCL020-social-network into DevFer

  FernandaFloresC

  committed
  518c3c9

  Copy full SHA for 518c3c9

• init

  KatherineGalleguillos

  committed
  7bc79ce

  Copy full SHA for 7bc79ce

• Merge pull request #8 from MartaHung/devMarta

  Show description for 47826db
  MartaHung

  authored
  47826db

  Copy full SHA for 47826db

• router

  KatherineGalleguillos

  committed
  ca5661e

  Copy full SHA for ca5661e

• error 2Â

  FernandaFloresC

  committed
  819653f

  Copy full SHA for 819653f

• Merge branch 'main' of https://github.com/MartaHung/SCL020-social-network into DevFer

  FernandaFloresC

  committed
  b7659a4

  Copy full SHA for b7659a4

• router

  KatherineGalleguillos

  committed
  e9fdbf7

  Copy full SHA for e9fdbf7

Commits on Jul 6, 2022

• rutas funcionales

  MartaHung

  committed
  9c08131

  Copy full SHA for 9c08131

• rutas router

  MartaHung

  committed
  877faf6

  Copy full SHA for 877faf6

• Merge pull request #9 from MartaHung/devMarta

  Show description for 00f6d0c
  MartaHung

  authored
  00f6d0c

  Copy full SHA for 00f6d0c

• agregÃuÃé images a carpeta

  FernandaFloresC

  committed
  43faad0

  Copy full SHA for 43faad0

Commits on Jul 7, 2022

• auth google en proceso

  MartaHung

  committed
  b868bb2

  Copy full SHA for b868bb2

• Merge pull request #11 from MartaHung/devMarta

  Show description for 1bd096d
  MartaHung

  authored
  1bd096d

  Copy full SHA for 1bd096d

Commits on Jul 8, 2022

• template feed

  MartaHung

  committed
  f741cae

  Copy full SHA for f741cae

• Merge pull request #12 from MartaHung/devMarta

  Show description for 97cad48
  MartaHung

  authored
  97cad48

  Copy full SHA for 97cad48

• vistas e img de prueba

  FernandaFloresC

  committed
  ec64002

  Copy full SHA for ec64002

• Merge pull request #13 from MartaHung/DevFer

  Show description for 2d46672
  MartaHung

  authored
  2d46672

  Copy full SHA for 2d46672

• teest

  MartaHung

  committed
  b14e159

  Copy full SHA for b14e159

• Delete config.js

  MartaHung

  authored
  74fddf0

  Copy full SHA for 74fddf0

• cambios de css en 1vista

  FernandaFloresC

  committed
  a902c08

  Copy full SHA for a902c08

• configuracion firestore, modificacion configuracion firebase, organizacion modulos

  MartaHung

  committed
  6eb0474

  Copy full SHA for 6eb0474

• Merge pull request #14 from MartaHung/DevFer

  Show description for c4fd223
  MartaHung

  authored
  c4fd223

  Copy full SHA for c4fd223

• Merge pull request #15 from MartaHung/devMarta

  Show description for 9d729c4
  MartaHung

  authored
  9d729c4

  Copy full SHA for 9d729c4

• Merge branch 'devMarta' of https://github.com/MartaHung/SCL020-social-network into DevFer

  FernandaFloresC

  committed
  fe67121

  Copy full SHA for fe67121

• Merge branch 'DevFer' of https://github.com/MartaHung/SCL020-social-network into devMarta

  MartaHung

  committed
  1887235

  Copy full SHA for 1887235

Commits on Jul 11, 2022

• template post y funciones para manipular data y crear posts

  MartaHung

  committed
  7ca1a36

  Copy full SHA for 7ca1a36

• Merge branch 'main' of https://github.com/MartaHung/SCL020-social-network into DevFer

  FernandaFloresC

  committed
  1dce1df

  Copy full SHA for 1dce1df

Commits on Jul 12, 2022

• ramapruebakathy

  KatherineGalleguillos

  committed
  241b311

  Copy full SHA for 241b311

• ni idea del commit

  FernandaFloresC

  committed
  6949a06

  Copy full SHA for 6949a06

• boton

  KatherineGalleguillos

  committed
  12e5317

  Copy full SHA for 12e5317

• Merge branch 'main' into pruebakathy

  MartaHung

  authored
  5bf7d64

  Copy full SHA for 5bf7d64

• Merge pull request #16 from MartaHung/pruebakathy

  Show description for 2893828
  MartaHung

  authored
  2893828

  Copy full SHA for 2893828

• no veo nada :c

  FernandaFloresC

  committed
  350c555

  Copy full SHA for 350c555

• funciones posts

  MartaHung

  committed
  bfb02b9

  Copy full SHA for bfb02b9

• correcciones

  MartaHung

  committed
  3ed5040

  Copy full SHA for 3ed5040

• funciones para los posts, crear, editar y eliminar.

  MartaHung

  committed
  0e0b4e6

  Copy full SHA for 0e0b4e6

• conflictos resueltos

  MartaHung

  committed
  c3f4d16

  Copy full SHA for c3f4d16

• cambios kathy

  KatherineGalleguillos

  committed
  fb65a6b

  Copy full SHA for fb65a6b

• bajando cambios de marta

  FernandaFloresC

  committed
  dd096da

  Copy full SHA for dd096da

• bajando cambios de kathy

  FernandaFloresC

  committed
  fb7e204

  Copy full SHA for fb7e204

• subiendo cambios para probar

  FernandaFloresC

  committed
  cd7b62d

  Copy full SHA for cd7b62d

Commits on Jul 13, 2022

• actualizacion

  MartaHung

  committed
  524c083

  Copy full SHA for 524c083

• subiendo cambios de oh

  FernandaFloresC

  committed
  dd69d38

  Copy full SHA for dd69d38

• actualizacion

  MartaHung

  committed
  e169e90

  Copy full SHA for e169e90

• test

  MartaHung

  committed
  911e34c

  Copy full SHA for 911e34c

• se rompio el code

  MartaHung

  committed
  07f34ea

  Copy full SHA for 07f34ea

• cambios de tarde con Dani

  FernandaFloresC

  committed
  15ead35

  Copy full SHA for 15ead35

• cambios que muestran la primera vista

  FernandaFloresC

  committed
  701c88f

  Copy full SHA for 701c88f

• codigo roto pero sin error

  MartaHung

  committed
  7b1b654

  Copy full SHA for 7b1b654

• nada funciona

  MartaHung

  committed
  a1d2ae0

  Copy full SHA for a1d2ae0

• cambios leves para que se vea la vista

  FernandaFloresC

  committed
  c6fb557

  Copy full SHA for c6fb557

Commits on Jul 14, 2022

• no se ven creaciones

  MartaHung

  committed
  6782100

  Copy full SHA for 6782100

• estilo

  MartaHung

  committed
  9c99dd7

  Copy full SHA for 9c99dd7

• ggg

  MartaHung

  committed
  58528d5

  Copy full SHA for 58528d5

• pequeños cambios

  KatherineGalleguillos

  committed
  6d8148b

  Copy full SHA for 6d8148b

• funciona login, y router, falta indexar el user al post, por eso no se edita y actualizar los datos

  MartaHung

  committed
  507b3cd

  Copy full SHA for 507b3cd

• nada que subir, solo errores

  FernandaFloresC

  committed
  e1e2e4f

  Copy full SHA for e1e2e4f

Commits on Jul 15, 2022

• codigo funcionando, actualizado. Hay que arreglar funciones de guardar post y capturar id login

  MartaHung

  committed
  37c0075

  Copy full SHA for 37c0075

• actualizado

  MartaHung

  committed
  f20aef8

  Copy full SHA for f20aef8

• actualizacion

  MartaHung

  committed
  c4e1b2a

  Copy full SHA for c4e1b2a

• commit de mentiras

  FernandaFloresC

  committed
  b374b5e

  Copy full SHA for b374b5e

• test

  MartaHung

  committed
  7426b54

  Copy full SHA for 7426b54

• modificaciones css

  KatherineGalleguillos

  committed
  c1c1e8e

  Copy full SHA for c1c1e8e

• viendo lo del observador

  MartaHung

  committed
  b976376

  Copy full SHA for b976376

• merging

  MartaHung

  committed
  474355e

  Copy full SHA for 474355e

• cambios de css en primera vista final

  FernandaFloresC

  committed
  c95132d

  Copy full SHA for c95132d

• test

  MartaHung

  committed
  08a19e2

  Copy full SHA for 08a19e2

• merge

  MartaHung

  committed
  02ff41a

  Copy full SHA for 02ff41a

Commits on Jul 16, 2022

• ahora se puede editar

  MartaHung

  committed
  c063d45

  Copy full SHA for c063d45

Commits on Jul 18, 2022

• actualizacion, guarda id de usuario en firestore

  MartaHung

  committed
  368e8d4

  Copy full SHA for 368e8d4

• funcion logout y creacion de coleccion de usuarios

  MartaHung

  committed
  6b7e6cf

  Copy full SHA for 6b7e6cf