318 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
abe-	d2847df950	parcelas + img modelos	2017-06-17 17:56:20 +02:00
CarmenPellicerBalsalobre	55eea29f69	Update mujeres.md	2017-06-17 17:56:18 +02:00
CarmenPellicerBalsalobre	e415816dc5	Update mujeres.md	2017-06-17 17:55:42 +02:00
Luis	92302e2335	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 17:53:44 +02:00
Luis	a45b64dda8	fix css	2017-06-17 17:53:33 +02:00
abe-	ce6f8a4d4b	parcelas + img modelos	2017-06-17 17:50:05 +02:00
abe-	dcbf59f343	parcelas + img modelos	2017-06-17 17:48:34 +02:00
guilleciro	a2d5012b1d	Update urbanismo.md	2017-06-17 17:39:47 +02:00
David Prieto	0be0714d15	Update contexto.md	2017-06-17 17:39:10 +02:00
David Prieto	e40c7a1f6d	Update contexto.md	2017-06-17 17:38:13 +02:00
David Prieto	fb841db03e	Update contexto.md	2017-06-17 17:35:54 +02:00
David Prieto	2cbcbcd82e	Update contexto.md	2017-06-17 17:32:47 +02:00
David Prieto	b7256e4540	Update contexto.md	2017-06-17 17:27:39 +02:00
Fernando Blat	cafdeed8c2	Gemfiles	2017-06-17 17:24:58 +02:00
abe-	de5c8e23e8	parcelas	2017-06-17 17:20:15 +02:00
abe-	25d24585b8	parcelas	2017-06-17 17:18:45 +02:00
CarmenPellicerBalsalobre	15592127d7	Update mujeres.md	2017-06-17 17:14:09 +02:00
Luis	418a812bbd	fix css breakpoints	2017-06-17 17:13:58 +02:00
Luis	83f82033a1	wrapper	2017-06-17 17:11:33 +02:00
Luis	8da3fe41da	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 17:08:32 +02:00
Luis	1392025c8d	padding wrapper	2017-06-17 17:08:28 +02:00
abe-	ec42e4d1ea	parcelas	2017-06-17 17:07:10 +02:00
Luis	ea8767e8c3	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 17:06:14 +02:00
Luis	807dfc5590	wrapper padding on small devices	2017-06-17 17:06:09 +02:00
abe-	204b97b023	parcelas	2017-06-17 17:06:06 +02:00
abe-	e1a4d5311e	parcelas	2017-06-17 16:56:52 +02:00
Luis	20c5d3a831	bigger font size	2017-06-17 16:54:08 +02:00
Luis	5f546e3f96	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 16:52:49 +02:00
Luis	298332576d	new font-size	2017-06-17 16:52:45 +02:00
abe-	beee75294e	parcelas	2017-06-17 16:48:25 +02:00
Luis	52c76bdc06	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 16:42:06 +02:00
Luis	a140f4fa54	new margin on headers	2017-06-17 16:42:00 +02:00
abe-	de58e3f336	parcelas	2017-06-17 16:41:37 +02:00
abe-	87c9d001e4	parcelas	2017-06-17 16:38:17 +02:00
abe-	a260bcab63	parcelas	2017-06-17 16:34:49 +02:00
CarmenPellicerBalsalobre	acc9ff4e16	Update mujeres.md	2017-06-17 16:30:51 +02:00
CarmenPellicerBalsalobre	6569808ea5	Update mujeres.md	2017-06-17 16:23:16 +02:00
CarmenPellicerBalsalobre	a8a73d5e7f	Update mujeres.md	2017-06-17 16:20:43 +02:00
Fernando Blat	47d28eb498	Control callback	2017-06-17 16:16:49 +02:00
Fernando Blat	1ac24f0a57	Fix CSS reference	2017-06-17 16:12:46 +02:00
Luis	caeeb5f44b	new margin on titles	2017-06-17 16:12:19 +02:00
Luis	501b19c7ff	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 16:09:31 +02:00
Luis	ef174080a5	new map height	2017-06-17 16:09:26 +02:00
guilleciro	79d5bb8617	Update colono.md	2017-06-17 16:01:23 +02:00
Fernando Blat	f333107ce5	Fix error token	2017-06-17 15:59:12 +02:00
Luis	939a42f2e8	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 15:58:29 +02:00
Luis	0c4f989ac4	testing PT Serif	2017-06-17 15:58:25 +02:00
abe-	54c232c3a0	mapa parcelas.js	2017-06-17 15:55:51 +02:00
Luis	33dd302376	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 15:55:24 +02:00
Luis	a72456b693	testing PT Sherif	2017-06-17 15:55:15 +02:00