457 commits

Author	SHA1	Message	Date
abe-	01e9555b2d	nueva intrudcción	2017-06-18 06:50:07 +02:00
abe-	0a530c9d9c	nueva intrudcción	2017-06-18 06:48:37 +02:00
abe-	67033e0131	nueva intrudcción	2017-06-18 06:46:36 +02:00
abe-	1742cc25c8	nueva intrudcción	2017-06-18 06:41:30 +02:00
abe-	a1e8b7488c	nueva intrudcción	2017-06-18 06:37:13 +02:00
abe-	575fe3f623	nueva intrudcción	2017-06-18 06:28:26 +02:00
abe-	194d3aedb9	nueva intrudcción	2017-06-18 06:25:42 +02:00
abe-	b83dbef318	nueva intrudcción	2017-06-18 06:22:34 +02:00
abe-	83d0fb4c58	Delete index.html	2017-06-18 04:36:11 +02:00
abe-	fad52c4d5d	timeline	2017-06-18 04:33:09 +02:00
abe-	86af12f449	timeline	2017-06-18 04:28:50 +02:00
abe-	acb86c18d2	timeline	2017-06-18 04:25:33 +02:00
abe-	ef1cb617dc	changes.css : header	2017-06-18 01:28:48 +02:00
abe-	3873ea7f2d	changes.css : header	2017-06-18 01:22:25 +02:00
abe-	df20de671c	changes.css : header	2017-06-18 01:20:39 +02:00
abe-	123a94fb24	exprociacion graf 2D	2017-06-18 01:17:49 +02:00
abe-	1e5247cdc8	exprociacion graf 2D	2017-06-18 00:49:49 +02:00
abe-	611fc46561	menu	2017-06-18 00:33:58 +02:00
CarmenPellicerBalsalobre	f23c084a6d	Update colono.md	2017-06-17 21:49:56 +02:00
abe-	72783abf22	parcelas	2017-06-17 21:45:56 +02:00
abe-	5d9f176e22	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 21:42:35 +02:00
abe-	4b4f7c2a24	parcelas	2017-06-17 21:42:24 +02:00
CarmenPellicerBalsalobre	baa055df94	Update mujeres.md	2017-06-17 21:39:35 +02:00
abe-	5fce82e65a	parcelas	2017-06-17 21:38:04 +02:00
abe-	6efb6054b0	parcelas	2017-06-17 21:36:31 +02:00
abe-	14101a68df	parcelas	2017-06-17 21:31:24 +02:00
abe-	b5e7f6a88f	parcelas	2017-06-17 21:11:39 +02:00
abe-	88e150e425	parcelas	2017-06-17 21:09:33 +02:00
abe-	5d92532f0f	parcelas	2017-06-17 21:07:44 +02:00
abe-	aa396b8025	parcelas	2017-06-17 21:06:33 +02:00
abe-	a330ab2e2e	parcelas	2017-06-17 21:04:19 +02:00
abe-	ae86def9f8	parcelas	2017-06-17 20:56:25 +02:00
CarmenPellicerBalsalobre	4178be0ecd	Update mujeres.md	2017-06-17 20:36:24 +02:00
CarmenPellicerBalsalobre	e28a6954c2	Update mujeres.md	2017-06-17 20:26:57 +02:00
Fernando Blat	b58547dc10	ignore sass cache	2017-06-17 20:24:17 +02:00
Fernando Blat	59812988fc	Delete old/	2017-06-17 20:23:33 +02:00
Fernando Blat	0aeba3c38c	Delete and ignore site	2017-06-17 20:22:06 +02:00
CarmenPellicerBalsalobre	2212137e42	Update mujeres.md	2017-06-17 19:54:18 +02:00
CarmenPellicerBalsalobre	f3d7d72ae2	Update mujeres.md	2017-06-17 19:52:36 +02:00
David Prieto	4dafe37244	Update introduccion.md	2017-06-17 19:47:01 +02:00
David Prieto	317a92ce8b	Update introduccion.md	2017-06-17 19:43:53 +02:00
CarmenPellicerBalsalobre	b20ddcad7e	Update mujeres.md	2017-06-17 19:41:09 +02:00
CarmenPellicerBalsalobre	2dad7b5106	Update mujeres.md	2017-06-17 19:40:20 +02:00
CarmenPellicerBalsalobre	3f1b96acf7	Update mujeres.md	2017-06-17 19:39:56 +02:00
CarmenPellicerBalsalobre	029d8f6e9b	Update mujeres.md	2017-06-17 19:37:03 +02:00
CarmenPellicerBalsalobre	2facfedf8b	Update mujeres.md	2017-06-17 19:36:41 +02:00
CarmenPellicerBalsalobre	147a068523	Update mujeres.md	2017-06-17 19:34:56 +02:00
Luis	3a0372b4a1	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 19:33:41 +02:00
Luis	b044042890	adding OpenSans to menu	2017-06-17 19:33:37 +02:00
abe-	53c22c39f9	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 19:15:04 +02:00
abe-	57d764385e	introduccion.md	2017-06-17 19:14:26 +02:00
CarmenPellicerBalsalobre	ee7813375e	Update mujeres.md	2017-06-17 19:14:15 +02:00
abe-	c93e1bf78c	background p5s	2017-06-17 19:11:36 +02:00
Luis	a2c09e2aa1	link color	2017-06-17 19:03:07 +02:00
Luis	e3d0542ee3	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 18:39:07 +02:00
Luis	3bf1825751	new menu design on small devices	2017-06-17 18:39:03 +02:00
abe-	c689d822c5	parcelas + img modelos	2017-06-17 18:27:59 +02:00
Luis	a06d69f06d	fix menu css	2017-06-17 18:15:48 +02:00
Luis	b4eabaa5c5	Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 18:10:58 +02:00
Luis	fabc2f8000	fix css	2017-06-17 18:10:53 +02:00
CarmenPellicerBalsalobre	e7e805ce12	Update mujeres.md	2017-06-17 18:10:16 +02:00
abe-	f4f8e1061b	parcelas + img modelos	2017-06-17 18:09:53 +02:00
CarmenPellicerBalsalobre	d7d155b940	Update mujeres.md	2017-06-17 18:07:01 +02:00
abe-	1da3a203ff	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 18:02:07 +02:00
abe-	a5d9111df7	parcelas + img modelos	2017-06-17 18:01:56 +02:00
CarmenPellicerBalsalobre	397c58a576	Update mujeres.md	2017-06-17 18:01:36 +02:00
abe-	9245c48e7e	parcelas + img modelos	2017-06-17 18:00:37 +02:00
abe-	8db97c8699	Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias	2017-06-17 17:58:09 +02:00
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	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
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
abe-	4d4816913c	mapa parcelas	2017-06-17 15:52:01 +02:00
abe-	0e0a34b40b	mapa parcelas	2017-06-17 15:49:19 +02:00
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
CarmenPellicerBalsalobre	9b4de7c52f	Update colono.md	2017-06-17 12:04:13 +02:00
abe-	690f8593e2	Update mecanismos-expropiacion.md	2017-06-17 11:40:08 +02:00
abe-	89f7cb3cbe	Update mecanismos-expropiacion.md	2017-06-17 11:39:16 +02:00
abe-	991e607bea	leaflet	2017-06-17 11:18:33 +02:00
CarmenPellicerBalsalobre	0b7793eed9	Update colono.md	2017-06-17 11:17:12 +02:00
CarmenPellicerBalsalobre	e736d879d7	Update colono.md	2017-06-17 11:09:29 +02:00
CarmenPellicerBalsalobre	044f3a57e8	Update colono.md	2017-06-17 11:06:15 +02:00
CarmenPellicerBalsalobre	fa0e57d33f	Update colono.md	2017-06-17 10:48:55 +02:00
abe-	3b2337da69	subtitle	2017-06-17 03:20:45 +02:00
abe-	16cbb8384b	subtitle	2017-06-17 03:08:17 +02:00
abe-	e463363019	subtitle	2017-06-17 03:06:55 +02:00
abe-	a510c06e7e	subtitle	2017-06-17 03:01:43 +02:00
abe-	42ac2b4e8f	subtitle	2017-06-17 02:58:16 +02:00
abe-	f78a3f7ca0	subtitle	2017-06-17 02:57:38 +02:00
abe-	dc868e960b	subtitle	2017-06-17 02:56:38 +02:00
abe-	97e812e34e	subtitle	2017-06-17 02:55:56 +02:00
abe-	13e74c0481	subtitle	2017-06-17 02:55:24 +02:00
abe-	b7a8d5394e	subtitle	2017-06-17 02:49:04 +02:00
abe-	a0e7436fff	subtitle	2017-06-17 00:59:18 +02:00
abe-	e0150870a6	subtitle	2017-06-17 00:52:20 +02:00
CarmenPellicerBalsalobre	27020d5615	Update colono.md	2017-06-16 19:23:27 +02:00
CarmenPellicerBalsalobre	4da80f0f1f	Update colono.md	2017-06-16 19:10:53 +02:00
abe-	8de3f41fd5	presos timeline	2017-06-16 18:29:47 +02:00
abe-	d89ea4b0de	presos timeline	2017-06-16 18:13:32 +02:00
abe-	d09b115e0f	presos timeline	2017-06-16 18:13:05 +02:00
abe-	fde8568496	presos timeline	2017-06-16 17:57:25 +02:00
abe-	92ba357bbf	presos timeline	2017-06-16 17:14:17 +02:00
CarmenPellicerBalsalobre	215964a52d	Update autoritario.md	2017-06-16 14:55:25 +02:00
CarmenPellicerBalsalobre	10c94be9bf	Update autoritario.md	2017-06-16 12:33:50 +02:00
CarmenPellicerBalsalobre	84ba5f5537	Update autoritario.md	2017-06-16 12:32:58 +02:00
CarmenPellicerBalsalobre	656cd51534	Update autoritario.md	2017-06-16 12:26:39 +02:00
CarmenPellicerBalsalobre	16727e93a4	Update autoritario.md	2017-06-16 12:26:03 +02:00