Commit graph

418 commits

Author SHA1 Message Date
CarmenPellicerBalsalobre
46634e348a Update colono.md 2017-06-18 12:40:57 +02:00
CarmenPellicerBalsalobre
ef7342d8ce Update colono.md 2017-06-18 12:37:56 +02:00
Luis
23b5483815 new aspect on banner 2017-06-18 12:33:06 +02:00
Luis
52ddba08e6 Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias 2017-06-18 12:28:57 +02:00
Luis
33a05fd711 adding header logo 2017-06-18 12:28:52 +02:00
guilleciro
7450711e8d Update presos.md 2017-06-18 12:23:25 +02:00
abe-
398cdc1dd8 about 2017-06-18 12:20:08 +02:00
guilleciro
97bdf4b00c Update mecanismos-expropiacion.md 2017-06-18 12:17:55 +02:00
guilleciro
ba44b4dcc5 Update mecanismos-expropiacion.md 2017-06-18 12:15:09 +02:00
Luis
542efeed17 Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias 2017-06-18 12:13:15 +02:00
Luis
d89a01e675 fix markdown link on autoritario 2017-06-18 12:13:10 +02:00
abe-
07b8441796 titulos 2017-06-18 12:12:07 +02:00
CarmenPellicerBalsalobre
10ef899a97 Update colono.md 2017-06-18 12:11:50 +02:00
Luis
70c47bbac1 adding img 100% 2017-06-18 12:10:20 +02:00
Luis
2a02166502 Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias 2017-06-18 12:07:27 +02:00
Luis
994b9fe022 blockquotes 2017-06-18 12:07:23 +02:00
abe-
ee954d9f45 titulos 2017-06-18 12:03:49 +02:00
Luis
2dc8b0457a Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias 2017-06-18 12:01:38 +02:00
Luis
71ad38b1b9 blockquotes on fixes on small devices 2017-06-18 12:01:34 +02:00
abe-
47c581d20b Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias 2017-06-18 11:59:06 +02:00
abe-
9bdbacd066 titulos 2017-06-18 11:58:57 +02:00
David Prieto
0426b9419e Update introduccion.md 2017-06-18 11:58:57 +02:00
Luis
68c25d5232 Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias 2017-06-18 11:58:10 +02:00
Luis
94d768144c slider works/shows right on mobile 2017-06-18 11:58:06 +02:00
David Prieto
17025d3d29 Update introduccion.md 2017-06-18 11:55:51 +02:00
CarmenPellicerBalsalobre
ab95e6c214 Update autoritario.md 2017-06-18 11:54:42 +02:00
Luis
7cb1a70d52 Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias 2017-06-18 11:50:37 +02:00
Luis
fe87b9ffbd year shows right 2017-06-18 11:50:32 +02:00
abe-
fadf252f3f titulos 2017-06-18 11:50:02 +02:00
Luis
6263cedc37 less map width on small devices 2017-06-18 11:42:34 +02:00
Luis
4d0c9b72cc adding jQuery touch 2017-06-18 11:39:35 +02:00
Luis
64b2a3dc37 Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias 2017-06-18 11:35:18 +02:00
Luis
a35ec30a91 mobile slider css 2017-06-18 11:35:14 +02:00
abe-
30abdb9ef9 titulo pagina contexto 2017-06-18 11:32:11 +02:00
abe-
6abbaaee41 titulo pagina contexto 2017-06-18 11:28:39 +02:00
abe-
0933504b9e titulo pagina contexto 2017-06-18 11:28:13 +02:00
David Prieto
4f55505108 Update introduccion.md 2017-06-18 11:23:22 +02:00
guilleciro
fe436915b6 Update modelos.md 2017-06-18 11:16:49 +02:00
abe-
ec6c6363c7 titulo 2017-06-18 11:10:03 +02:00
Luis
5975e21b87 Merge branch 'master' of github.com:medialab-prado/poblados-colonizacion-colonias-penitenciarias 2017-06-18 11:05:07 +02:00
Luis
91f7dd3982 fix span slider visibility 2017-06-18 11:05:01 +02:00
David Prieto
1aac7647f2 Update introduccion.md 2017-06-18 10:55:49 +02:00
abe-
691ea6aed3 titulo 2017-06-18 10:55:03 +02:00
abe-
8230fa5103 titulo 2017-06-18 10:52:50 +02:00
abe-
45c9230108 titulo 2017-06-18 10:51:37 +02:00
abe-
d8691949c7 Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias 2017-06-18 10:49:42 +02:00
guilleciro
79cb4e0e63 Update urbanismo.md 2017-06-18 10:49:27 +02:00
abe-
7ef36e01e7 text intro 2017-06-18 10:48:47 +02:00
abe-
6b32f7874c Merge branch 'master' of https://github.com/medialab-prado/poblados-colonizacion-colonias-penitenciarias 2017-06-18 10:48:15 +02:00
CarmenPellicerBalsalobre
44630e13cb Update colono.md 2017-06-18 10:45:59 +02:00
abe-
310987f895 text intro 2017-06-18 10:29:27 +02:00
CarmenPellicerBalsalobre
3b9df7d868 Update colono.md 2017-06-18 10:09:25 +02:00
CarmenPellicerBalsalobre
d2cbd0756e Update index.md 2017-06-18 10:02:17 +02:00
CarmenPellicerBalsalobre
7fbd991c23 Update mujeres.md 2017-06-18 09:47:06 +02:00
CarmenPellicerBalsalobre
6c8775fd40 Update mujeres.md 2017-06-18 09:44:48 +02:00
abe-
571e28316c nueva intrudcción 2017-06-18 07:03:53 +02:00
abe-
f58e9d2561 nueva intrudcción 2017-06-18 07:01:12 +02:00
abe-
a91de07257 nueva intrudcción 2017-06-18 06:59:20 +02:00
abe-
aa7723e000 nueva intrudcción 2017-06-18 06:55:12 +02:00
abe-
e4b6a93c15 nueva intrudcción 2017-06-18 06:52:49 +02:00
abe-
7e64859453 nueva intrudcción 2017-06-18 06:51:03 +02:00
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