Skip to content
This repository has been archived by the owner on Jan 24, 2023. It is now read-only.

Progreso N°1 #27

Open
wants to merge 81 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
81 commits
Select commit Hold shift + click to select a range
1a6c268
Añadiendo la instalacion de babel y estrcutura de carpetas
margaritasj Jan 26, 2018
3721c6c
setting up index html
lucerohospina Jan 27, 2018
f902441
setting up index html
lucerohospina Jan 27, 2018
3f62772
Merge pull request #1 from lucerohospina/l-plugin
lucerohospina Jan 27, 2018
bd50d4e
setting up file app js
lucerohospina Jan 27, 2018
95c2a1d
adding changes
lucerohospina Jan 27, 2018
36f817b
agrega ejemplo plugin
lucerohospina Jan 27, 2018
f953c34
Merge pull request #2 from lucerohospina/l-plugin
lucerohospina Jan 27, 2018
e7ee72c
modificando readme
lucerohospina Jan 27, 2018
c6a680c
Merge pull request #3 from lucerohospina/l-plugin
lucerohospina Jan 27, 2018
42f83f1
modificando readme
lucerohospina Jan 27, 2018
f8332ea
Merge pull request #4 from lucerohospina/master
lucerohospina Jan 27, 2018
c78cdfe
modificando link de nombres en readme
lucerohospina Jan 27, 2018
df60a12
corrige readme
lucerohospina Jan 27, 2018
23407b0
Merge pull request #5 from lucerohospina/master
lucerohospina Jan 27, 2018
bebe5c8
corrige link de nombres en readme
lucerohospina Jan 27, 2018
d478b7e
Merge pull request #6 from lucerohospina/l-plugin
lucerohospina Jan 27, 2018
b2afd84
estructura index
dayamll Jan 27, 2018
db4d5cd
agrega gitignore, test de figure y figcaption (cardify) / Persiste bu…
lucerohospina Jan 28, 2018
0d7e756
Merge pull request #8 from lucerohospina/l-plugin
lucerohospina Jan 28, 2018
1c4fa4e
Merge pull request #7 from dayamll/d-plugin
dayamll Jan 28, 2018
8d7b2b9
babel working properly
lucerohospina Jan 28, 2018
c619a7a
modificando estructura de folders y carpetas
lucerohospina Jan 28, 2018
c0a32a9
corrigiendo link de css cdn bst4
lucerohospina Jan 28, 2018
6db011f
borrando cache, probando gitignore
lucerohospina Jan 28, 2018
6130ca7
Merge pull request #9 from lucerohospina/l-plugin
lucerohospina Jan 28, 2018
5b71033
merging from l-plugin
lucerohospina Jan 28, 2018
a08d0f2
Modificando readme
dayamll Jan 28, 2018
be6db64
Organizando carpetas
dayamll Jan 28, 2018
f99cc1f
fixing gitignore bug
lucerohospina Jan 28, 2018
f24be76
fixing gitignore
lucerohospina Jan 28, 2018
eec7a7d
fixing gitignore the return
lucerohospina Jan 28, 2018
063519b
Merge pull request #10 from lucerohospina/l-plugin
lucerohospina Jan 28, 2018
b61f549
dandole forma al ejemplo del plugin
lucerohospina Jan 29, 2018
bd826fd
Merge pull request #11 from lucerohospina/l-plugin
lucerohospina Jan 29, 2018
38591d1
merging with l-plugin
lucerohospina Jan 29, 2018
3503bbb
basic plugin fully functional
lucerohospina Jan 30, 2018
e2e2c01
agregando comentarios
lucerohospina Jan 30, 2018
2bab961
Merge pull request #14 from lucerohospina/l-plugin
lucerohospina Jan 30, 2018
b29d741
combining styles in cardify
lucerohospina Jan 30, 2018
1053325
estructura de carpetas y archivos dado por instructores
lucerohospina Jan 30, 2018
f8b10ef
Merge pull request #15 from lucerohospina/l-plugin
lucerohospina Jan 30, 2018
540aa60
agregando funcion hover aun en proceso, anade mas comentarios segun p…
lucerohospina Jan 30, 2018
f31ba54
Merge pull request #16 from lucerohospina/l-plugin
lucerohospina Jan 30, 2018
6102116
setting up environment for merging
lucerohospina Jan 30, 2018
e07f006
merging
lucerohospina Jan 30, 2018
7f2ac01
eliminando json
lucerohospina Jan 30, 2018
18c486d
estructura de carpetas y archivos segun lo solicitado
lucerohospina Jan 30, 2018
808c0ce
Babel automatico,funcion hover y convirtiendo ES6 a js5
dayamll Jan 30, 2018
f3616b2
Cambiando README.md
dayamll Jan 30, 2018
a91f264
Añadiendo clases a las imagenes
dayamll Jan 31, 2018
4d22023
Cambiando title de las imagenes
dayamll Jan 31, 2018
535a3ef
hover funcional en modo caridfy
lucerohospina Jan 31, 2018
462b665
Agregando view home
dayamll Jan 31, 2018
68cc62a
Agregando estilos a home
dayamll Feb 1, 2018
ddb3e65
Subiendo ultimos cambios del home
dayamll Feb 1, 2018
e95e3f2
Cambiando alt de img
dayamll Feb 1, 2018
57d28b7
cambiando css de archico js a main css por buenas practicas
lucerohospina Feb 1, 2018
d3e92c7
Editando archivo README
margaritasj Feb 1, 2018
38102ec
Editando archivo README con la implementacion y uso de plugin
margaritasj Feb 1, 2018
1ebd36a
construyendo demos
lucerohospina Feb 1, 2018
8fc1d92
merging
lucerohospina Feb 1, 2018
ed41935
Realizando cambios al index y editando README
margaritasj Feb 1, 2018
a0f8db4
agregando estilo de los demos html
lucerohospina Feb 1, 2018
53fca65
acoplando cambios
lucerohospina Feb 1, 2018
d9732b0
Eliminando archivo index.html externo
margaritasj Feb 1, 2018
1dc3f32
Corrigiendo link de demo del README
margaritasj Feb 1, 2018
94acc7a
cambiando estilo del title
dayamll Feb 1, 2018
5b3fd1f
Cambiando estilos de los botones
dayamll Feb 1, 2018
6d9d9a9
Cambiando estilos de los botones hover
dayamll Feb 1, 2018
c7f7f10
Añadiendo footer al index
margaritasj Feb 1, 2018
cb80e94
Añadiendo informacion de uso y footer
margaritasj Feb 2, 2018
9d176e7
Añadiendo attributo download
margaritasj Feb 2, 2018
06a4570
Añadiendo link de descarga
margaritasj Feb 2, 2018
699d080
Cambiando comprension de archivos
margaritasj Feb 2, 2018
cd24eec
Cambiando comprension de archivos
margaritasj Feb 2, 2018
4429986
Cambiando imagen de home del README
margaritasj Feb 2, 2018
dd922d0
Cambiando imagen de demo
margaritasj Feb 2, 2018
74c2c5f
agregando estilo flex, acomoda archivos y carpetas
lucerohospina Feb 2, 2018
08eb810
fixing active buttons
lucerohospina Feb 2, 2018
cd5b275
Modificando link de github
margaritasj Feb 2, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
corrige link de nombres en readme
  • Loading branch information
lucerohospina committed Jan 27, 2018
commit bebe5c8818542539a9f5d211cd77f283c0438908
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ con el texto del atributo `alt` de la imagen.

Para efectos de organización en el trabajo colaborativo se han creado tres ramas en este repositorio. Cada desarrolladora usará la rama asignada para ella de la siguiente manera:

- _[Dayam Llerena](https://github.com/dayamll/cardify)_: [d-plugin](https://github.com/margb13/cardify/tree/d-plugin)
- _Dayam Llerena_: [d-plugin](https://github.com/margb13/cardify/tree/d-plugin)

- _[Lucero Hospina](https://github.com/lucerohospina/cardify)_: [l-plugin](https://github.com/margb13/cardify/tree/l-plugin)
- _Lucero Hospina_: [l-plugin](https://github.com/margb13/cardify/tree/l-plugin)

- _[Margarita Sutta](https://github.com/margb13/cardify)_: [m-plugin](https://github.com/margb13/cardify/tree/m-plugin)
- _Margarita Sutta_: [m-plugin](https://github.com/margb13/cardify/tree/m-plugin)

## Progreso Propuesto:

Expand Down