Commit graph

442 commits

Author SHA1 Message Date
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
CarmenPellicerBalsalobre
7a2610275a Update autoritario.md 2017-06-16 12:25:12 +02:00
CarmenPellicerBalsalobre
d4c1791d61 Update contexto.md 2017-06-16 12:23:59 +02:00
CarmenPellicerBalsalobre
3f807c265e Update autoritario.md 2017-06-16 12:23:13 +02:00
CarmenPellicerBalsalobre
19161b2c11 Update contexto.md 2017-06-16 12:16:04 +02:00
abe-
4a508d82a7 Update index.md 2017-06-16 11:52:23 +02:00
abe-
806f75ea67 Update index.md 2017-06-16 11:50:23 +02:00
abe-
6d3c5a346b Update index.md 2017-06-16 11:49:05 +02:00
abe-
d32bacf21f Update index.md 2017-06-16 11:48:27 +02:00
abe-
1eadde9edf Update index.md 2017-06-16 11:47:44 +02:00
abe-
8b9aab6314 icon 2017-06-15 14:09:12 +02:00
abe-
dc9b1c418d icon 2017-06-15 14:07:18 +02:00
abe-
d156ff5465 icon 2017-06-15 13:58:36 +02:00
abe-
a76fff067b icon 2017-06-15 13:57:04 +02:00
abe-
a0b4315847 icon 2017-06-15 13:56:05 +02:00
abe-
09019c1607 icon 2017-06-15 13:51:39 +02:00
abe-
208fd12294 icon 2017-06-15 01:42:19 +02:00
abe-
1ae0a911a6 icon 2017-06-15 01:35:26 +02:00
abe-
cd0fad7906 sliders 2017-06-13 02:59:58 +02:00
abe-
ea4e137e9b sliders 2017-06-13 02:59:14 +02:00
abe-
671e22d59c sliders 2017-06-13 02:58:55 +02:00
abe-
ffb660d99b sliders 2017-06-13 02:57:35 +02:00
abe-
af8f3a36da sliders 2017-06-13 02:56:28 +02:00
abe-
b7bc206b1c sliders 2017-06-13 02:55:07 +02:00
abe-
05fd6c4261 sliders 2017-06-13 02:52:39 +02:00
abe-
fe9f25fd04 sliders 2017-06-13 02:48:19 +02:00
abe-
4928cb5b4c sliders 2017-06-13 02:46:33 +02:00
abe-
006b44ad5d sliders 2017-06-13 02:45:20 +02:00
abe-
ff3532f649 sliders 2017-06-13 02:14:22 +02:00
abe-
9d835844b2 sliders 2017-06-13 02:13:15 +02:00
abe-
02a8042f12 sliders 2017-06-13 02:12:25 +02:00
abe-
f9d7900bbd sliders 2017-06-13 02:10:59 +02:00
abe-
ca5cf60c73 sliders 2017-06-13 02:10:01 +02:00
abe-
1bcc125651 sliders 2017-06-13 02:04:00 +02:00
abe-
2c38284123 sliders 2017-06-13 02:01:38 +02:00
abe-
7d0592315d sliders 2017-06-13 01:59:24 +02:00
abe-
81fac0f580 sliders 2017-06-13 01:31:30 +02:00
abe-
1880e496fc sliders 2017-06-13 01:29:26 +02:00
abe-
dc920a919d sliders 2017-06-13 01:27:49 +02:00
abe-
5b02f97b55 sliders 2017-06-13 01:26:39 +02:00
abe-
1fa5e96cc3 sliders 2017-06-13 01:25:16 +02:00
abe-
41de5f1d41 sliders 2017-06-13 01:17:02 +02:00
abe-
c1997191a8 sliders 2017-06-13 01:03:06 +02:00
abe-
89825cba62 sliders 2017-06-13 01:01:17 +02:00
abe-
1e65392f9c sliders 2017-06-13 01:00:24 +02:00
abe-
d02aa19f9f sliders 2017-06-13 00:57:53 +02:00
abe-
1ce4976d7f sliders 2017-06-13 00:52:26 +02:00
abe-
b449420ebd sliders 2017-06-13 00:49:02 +02:00
abe-
9208bd921a sliders 2017-06-13 00:44:19 +02:00
abe-
1cffc33eed graficos 2017-06-09 01:31:13 +02:00
abe-
bfda76dcba secciones 2017-06-02 13:53:45 +02:00
abe-
e7a36253f6 secciones 2017-06-02 13:52:18 +02:00
abe-
890b705541 secciones 2017-06-02 13:50:25 +02:00
abe-
182641b958 secciones 2017-06-02 13:30:59 +02:00
abe-
3dec8126e8 secciones 2017-06-02 13:26:43 +02:00
abe-
1f57cf52c7 secciones 2017-06-02 13:25:23 +02:00
abe-
7703f5c021 secciones 2017-06-02 13:24:47 +02:00
abe-
eca7d7f915 secciones 2017-06-02 13:23:25 +02:00
abe-
d45eeb8700 enlaces pages 2017-06-02 13:15:58 +02:00
abe-
dde4e40e4d pages 2017-06-01 19:34:09 +02:00
abe-
daaa709d32 pages 2017-06-01 19:30:09 +02:00
abe-
76a4d2bedd pages 2017-06-01 19:28:22 +02:00
abe-
cb65a98ae1 pages 2017-06-01 19:21:10 +02:00
abe-
7227335345 pages 2017-06-01 19:10:02 +02:00
abe-
a9402fa868 pages 2017-06-01 19:09:06 +02:00
abe-
826ba95ae0 pages 2017-06-01 19:07:42 +02:00
abe-
6c53d97acf pages 2017-06-01 19:05:50 +02:00
abe-
b6966a83fd pages 2017-06-01 19:01:14 +02:00
abe-
575546d7b2 pages 2017-06-01 18:59:01 +02:00
abe-
f520fa3b73 pages 2017-06-01 18:56:23 +02:00
abe-
39ee80b8de pages 2017-06-01 18:49:27 +02:00
abe-
274bee06c6 pages 2017-06-01 18:48:03 +02:00
abe-
fcc1781ad0 pages 2017-06-01 18:33:54 +02:00
abe-
dcbe1087dd pages 2017-06-01 14:56:26 +02:00
abe-
e3d4d1e74c pages 2017-06-01 14:54:19 +02:00
abe-
bfa2801f94 pages 2017-06-01 14:54:00 +02:00
abe-
e35e1f81e4 pages 2017-06-01 14:52:49 +02:00
abe-
8202b3b004 pages 2017-06-01 14:52:18 +02:00
abe-
0170063a7b pages 2017-06-01 14:50:55 +02:00
abe-
9c32065178 pages 2017-06-01 14:45:16 +02:00
abe-
0f8d039e82 pages 2017-06-01 14:43:08 +02:00
abe-
8e693e1737 pages 2017-06-01 14:40:40 +02:00
abe-
aa377e4161 pages 2017-06-01 14:38:09 +02:00
abe-
4515cc39f2 pages 2017-06-01 14:27:55 +02:00
abe-
a4d91fa44d pages 2017-06-01 14:27:13 +02:00
abe-
e1c4569564 pages 2017-06-01 14:23:40 +02:00
abe-
6083585639 pages 2017-06-01 14:19:48 +02:00
abe-
6b8747d517 pages 2017-06-01 14:18:32 +02:00
abe-
cf11811a55 pages 2017-06-01 14:13:05 +02:00
abe-
5f08523a44 pages 2017-06-01 12:40:25 +02:00
abe-
4639507658 pages 2017-06-01 12:39:46 +02:00
abe-
7fd488fac4 pages 2017-06-01 12:36:10 +02:00
abe-
55689c442e pages 2017-06-01 12:33:00 +02:00
abe-
d8ddc5efc2 pages 2017-06-01 12:15:29 +02:00
abe-
86f7e0d74f pages 2017-06-01 12:12:19 +02:00
abe-
ebcd5ade92 pages 2017-06-01 12:07:17 +02:00
abe-
f4fbf02a0e pages 2017-06-01 12:04:23 +02:00
abe-
5c6c81b956 pages 2017-06-01 12:03:04 +02:00
abe-
876ece5964 pages 2017-06-01 12:02:10 +02:00
abe-
739faa9ca4 pages 2017-06-01 11:54:26 +02:00
abe-
869819611c pages 2017-06-01 11:52:59 +02:00
abe-
495460e50f pages 2017-06-01 11:44:23 +02:00
abe-
6ca1f7baf9 pages 2017-06-01 11:39:10 +02:00
abe-
c1f2c3d23f pages 2017-06-01 11:35:33 +02:00
abe-
1fdff25527 pages 2017-06-01 11:27:38 +02:00
abe-
ab461c2375 pages 2017-06-01 11:24:22 +02:00
abe-
27407bd199 test pages 2017-06-01 10:30:56 +02:00
abe-
0e4d312ab4 inicio github pages 2017-06-01 10:15:27 +02:00