flow/datamad2017
1
0
Fork 0
mirror of https://github.com/medialab-prado/datamad2017.git synced 2024-12-27 13:11:22 +01:00
Code Issues Projects Releases Wiki Activity
286 commits 2 branches 7 tags 49 MiB
Commit graph

286 commits

This branch
This branch
All branches
Author SHA1 Message Date
josemolinag
834e1c26c2 Merge branch 'master' of https://github.com/medialab-prado/datamad2017 2017-10-08 13:19:25 +02:00
alay
a51ffaf064 limpieza de conflicto 2017-10-08 12:52:27 +02:00
alay
28dca6fac6 limpieza de conflicto 2017-10-08 12:49:42 +02:00
josemolinag
d42e12cf4e Merge branch 'master' of https://github.com/medialab-prado/datamad2017 2017-10-08 12:38:47 +02:00
josemolinag
7a2ea052e3 Merge branch 'master' of https://github.com/medialab-prado/datamad2017 2017-10-08 12:36:34 +02:00
alay
7eec6db91b limpieza de conflicto 2017-10-08 12:27:37 +02:00
alay
bdb941f7d2 Merge branch 'master' of https://github.com/medialab-prado/datamad2017 2017-10-08 12:22:36 +02:00
josemolinag
3866d8486a Merge branch 'master' of https://github.com/medialab-prado/datamad2017 2017-10-08 08:34:53 +02:00
josemolinag
d3edf0af84 Merge branch 'master' of https://github.com/medialab-prado/datamad2017 2017-10-08 08:31:32 +02:00
alay
1bc5873b10 Nueva entrada de blog + pequeñas correcciones 2017-10-08 05:44:46 +02:00
alay
4e94d685f2 Enlace Portal de datos abiertos 2017-10-08 05:11:40 +02:00
alay
675773e797 Ajustes 2017-10-08 04:56:12 +02:00
alay
dc96c39b71 traducción de todos los enlaces 2017-10-08 04:03:33 +02:00
alay
8fe52a1f15 Edición general 2017-10-08 03:30:28 +02:00
josemolinag
6815f4b0a4 Merge branch 'master' of https://github.com/medialab-prado/datamad2017 2017-10-07 23:37:42 +02:00
josemolinag
a73404e216 Merge branch 'master' of https://github.com/medialab-prado/datamad2017 2017-10-07 23:37:37 +02:00
josemolinag
f7baba6022 Merge branch 'master' of https://github.com/medialab-prado/datamad2017 2017-10-07 23:36:24 +02:00
alay
88e0cf6c86 Ajustes en el Home 2017-10-07 23:13:38 +02:00
josemolinag
5abcb12a3e confllicto 
Merge branch 'master' of https://github.com/medialab-prado/datamad2017
 2017-10-07 23:12:03 +02:00
josemolinag
774aa0b897 cambio nombre portada home 2017-10-07 23:09:26 +02:00
alay
70c9e16dd2 Probando 2017-10-07 23:04:17 +02:00
alay
182d20571d Traducciones 2017-10-07 23:02:19 +02:00
alay
27bb897897 Traducciones 2017-10-07 23:01:43 +02:00
josemolinag
99a0f6355d Merge branch 'master' of https://github.com/medialab-prado/datamad2017 2017-10-07 22:58:22 +02:00
alay
fb33b5c5d2 prueba poner imagen home y cambio nombre archivo hero.html por home.html 2017-10-07 22:55:47 +02:00
alay
35bc9b1517 Programa 2017-10-07 22:47:33 +02:00
alay
53ebfa00c6 Programa 2017-10-07 22:45:35 +02:00
alay
202ecf7a28 Merge branch 'master' of https://github.com/medialab-prado/datamad2017 2017-10-07 22:44:40 +02:00
alay
d1a3b3c832 logos medialab y datalab svg 2017-10-07 22:36:37 +02:00
alay
50a2b11d11 Añadida localización 2017-10-07 21:47:39 +02:00
josemolinag
ba9d407c6a algunas fotos para la web y _layouts/default.html para quitar la bolita de carga de la web, y enredar un poco en el _config.yml 2017-10-07 21:09:16 +02:00
josemolinag
8e010b2424 borro pruebajose.txt 2017-10-07 19:08:07 +02:00
josemolinag
c24faa4606 prueba, no he hecho nada 2017-10-07 19:00:33 +02:00
Abdel_95
63b6ec7c76 Please add DevFest Foumban to the list. (#97) 
* Please DevFest Foumban to the list.

* Update README.md

okay moved to the next row.
 2017-07-31 13:50:58 +03:00
Oleh Zasadnyy
6ffe3748a8 Update README.md 2017-03-09 12:58:30 +02:00
Oleh Zasadnyy
0541e1a90b Merge pull request #95 from benju69/patch-1 
Update README
 2017-02-24 16:14:43 +02:00
Benjamin Gonin
6dcf2f119a Update README 
Add Droidcon fr 2015 and Android Makers Paris 2017 to "Who is using"
 2017-02-24 14:57:29 +01:00
Said Tahsin Dane
e0f54e40ee Adjust WTM Istanbul websites 2017-01-13 23:33:19 +01:00
Oleh Zasadnyy
9b7b682a6c Merge pull request #93 from Wmitrut/master 
Add GDG Francisco Beltrão to readme
 2016-11-01 10:07:29 +02:00
wmitrut
00579d96dc updated readme 2016-10-31 22:57:41 -02:00
Oleh Zasadnyy
d64acb6805 Merge pull request #91 from webmaxru/patch-1 
Mobile Era 2016 added to "Where it's used"
 2016-10-19 11:55:29 +03:00
Maxim Salnikov
26ff158b58 Layout fixed after Mobile Era 2016 adding 2016-10-19 10:48:55 +02:00
Maxim Salnikov
9f5d713078 Mobile Era 2016 added to "Who is using" 2016-10-19 10:06:25 +02:00
Michael Prentice
99ef2985f5 Add AngularCamp as a user 2016-07-01 18:33:38 +02:00
Said Tahsin Dane
5841a7e8e6 Merge pull request #89 from reiaguilera/patch-1 
Update README.md
 2016-04-21 07:32:58 +02:00
Rei Aguilera
76d63fbd71 Update README.md 
add url template
 2016-04-21 00:26:00 +02:00
Oleh Zasadnyy
771b2e1787 Merge pull request #88 from iblancasa/change-logo 
Updating Google's logo
 2016-04-19 13:04:59 +03:00
Israel Blancas
1f9080a8c2 Updating Google's logo 2016-04-19 02:19:18 +02:00
Oleh Zasadnyy
ae55dac556 Merge pull request #86 from gdg-x/friedger-patch-1 
Add maintainers
 2016-02-11 22:49:08 +02:00
Friedger Müffke
3d5c8f0637 Update README.md 2016-02-11 21:48:36 +01:00