316 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
abe-	bbdfe99bb7	mapa parcelas	2017-06-17 15:48:45 +02:00
abe-	dd48b7ab1d	mapa parcelas	2017-06-17 15:47:20 +02:00
abe-	6b049db043	mapa parcelas	2017-06-17 15:46:45 +02:00
abe-	0632f6e289	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 15:46:13 +02:00
abe-	974fd276ad	mapa parcelas	2017-06-17 15:46:01 +02:00
Luis	46fae5f24d	back to OpenSans	2017-06-17 15:42:32 +02:00
Luis	3ee7863159	testing CrimsonText	2017-06-17 15:41:19 +02:00
Luis	f7c5d5572a	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 15:39:43 +02:00
Luis	a9afea8fff	testing PlayfairDisplay font	2017-06-17 15:39:39 +02:00
abe-	8195e535fa	mapa parcelas	2017-06-17 15:39:16 +02:00
abe-	6d55f77f50	mapa parcelas	2017-06-17 15:33:12 +02:00
Luis	69145ad3c7	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 15:32:29 +02:00
Luis	b7b39f605c	move custom css to changes.scss stylesheet	2017-06-17 15:28:37 +02:00
abe-	a15f1392b8	mapa parcelas	2017-06-17 15:28:20 +02:00
abe-	c2f8f2e577	parcelas error touppercase	2017-06-17 15:26:46 +02:00
abe-	dc5e6ffebf	parcelas error touppercase	2017-06-17 15:25:59 +02:00
abe-	7b877ec7af	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 15:22:51 +02:00
abe-	375f00b6ea	parcelas error touppercase	2017-06-17 15:22:40 +02:00
guilleciro	9eea3b6f0c	Update modelos.md	2017-06-17 15:20:15 +02:00
abe-	bc3b35f5c3	parcelas error touppercase	2017-06-17 15:15:56 +02:00
abe-	eba62c9b1d	parcelas error touppercase	2017-06-17 15:14:02 +02:00
Luis	38d325ac6d	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 14:09:21 +02:00
Luis	0f61ce6557	changes.scss test	2017-06-17 14:09:18 +02:00
guilleciro	1b9dc7597c	Update modelos.md	2017-06-17 14:03:32 +02:00
CarmenPellicerBalsalobre	d5c31b50d0	Update mujeres.md	2017-06-17 13:58:04 +02:00
guilleciro	8298b98bcd	Update modelos.md	2017-06-17 13:57:02 +02:00
abe-	5b37788724	lista colonos	2017-06-17 13:51:46 +02:00
Luis	61003fb5b3	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 13:50:00 +02:00
Luis	dd40871042	new width column	2017-06-17 13:49:56 +02:00
CarmenPellicerBalsalobre	e7afc9cce1	Update mujeres.md	2017-06-17 13:46:30 +02:00
CarmenPellicerBalsalobre	2ce09d1ae7	Update mujeres.md	2017-06-17 13:45:53 +02:00
abe-	8bd9596fac	img mujeres	2017-06-17 13:42:11 +02:00
CarmenPellicerBalsalobre	74c9db3bd8	Update colono.md	2017-06-17 13:35:39 +02:00
CarmenPellicerBalsalobre	c798bb948a	Update colono.md	2017-06-17 13:33:40 +02:00
abe-	9b22130643	rename mapa.html	2017-06-17 13:28:16 +02:00
David Prieto	5ed47ac81b	Update index.md	2017-06-17 13:24:39 +02:00
abe-	f8e7591dfd	index.md	2017-06-17 13:23:43 +02:00
abe-	63e9d34c7c	index.md	2017-06-17 13:21:52 +02:00
abe-	39c692ec8d	mapa.html	2017-06-17 13:19:49 +02:00
Luis	581d0f65a1	resizing iFrames to 100%	2017-06-17 13:18:25 +02:00
abe-	0aee348b5b	resize imgs	2017-06-17 13:16:19 +02:00
CarmenPellicerBalsalobre	02d65fa3da	Update colono.md	2017-06-17 12:58:24 +02:00
guilleciro	227ed56200	Update presos.md	2017-06-17 12:56:17 +02:00
CarmenPellicerBalsalobre	0501b3a3b2	Update colono.md	2017-06-17 12:54:31 +02:00
abe-	b193d6e0e0	css	2017-06-17 12:50:20 +02:00
CarmenPellicerBalsalobre	f56901728a	Update colono.md	2017-06-17 12:50:02 +02:00
abe-	51617fabb0	css	2017-06-17 12:42:22 +02:00
abe-	e7ed3be9ca	css	2017-06-17 12:38:28 +02:00
abe-	cd3487b7d5	css	2017-06-17 12:34:51 +02:00
guilleciro	a933f737d7	Update presos.md	2017-06-17 12:16:30 +02:00