Commit graph

25 commits

Author SHA1 Message Date
João Batista
9c2123aba7 problem solved 2012-08-05 13:47:02 +02:00
João Batista
30b038c98e georg code added 2012-08-05 12:33:57 +02:00
João Batista
d0dfdefb73 Merge branch 'master' of https://github.com/FranciscoPinto/cern-summer-webfest 2012-08-05 12:05:44 +02:00
Francisco Pinto
e371110c89 Merge branch 'master' of https://github.com/FranciscoPinto/cern-summer-webfest 2012-08-05 12:05:32 +02:00
Francisco Pinto
45cdb3b119 Merge branch 'master' of https://github.com/FranciscoPinto/cern-summer-webfest 2012-08-05 12:04:53 +02:00
João Batista
7f253fcb0e Merge branch 'master' of https://github.com/FranciscoPinto/cern-summer-webfest
Conflicts:
	js/javascript.js
2012-08-05 12:04:05 +02:00
João Batista
30c1f19b13 Loads the slides (ugly still) 2012-08-05 12:00:11 +02:00
Carsten Burgard
4cb251e0c4 Merge branch 'master' of github.com:FranciscoPinto/cern-summer-webfest 2012-08-05 11:55:50 +02:00
Carsten Burgard
d2c522fdb4 formatted content 2012-08-05 11:55:25 +02:00
virtualbox
894caac8cd ajout feynmangraph 2012-08-05 11:33:45 +02:00
Francisco Pinto
156142e557 Added modal dialog example ("read more") 2012-08-05 11:17:41 +02:00
Carsten Burgard
e617b20f9e changed chapter titles 2012-08-05 10:53:04 +02:00
Carsten Burgard
cf1fe2d3d8 added physics content -- readmore -- initial commit 2012-08-05 10:52:19 +02:00
Carsten Burgard
1bdb4472d8 added physics content -- initial commit 2012-08-05 10:51:33 +02:00
João Batista
2b45ee3bfa Merge branch 'master' of https://github.com/FranciscoPinto/cern-summer-webfest 2012-08-05 10:29:59 +02:00
João Batista
6cfc171aeb Pre full text part 2012-08-05 10:29:21 +02:00
Francisco Pinto
ac51f0ac52 Animation example 2012-08-05 10:06:28 +02:00
Francisco Pinto
685eedf0ad Arrow keys now work for navigation 2012-08-04 23:40:44 +02:00
João Batista
658e4cf22f Added json filelist parding to follow 2012-08-04 23:17:03 +02:00
João Batista
33cf792520 Navigation and topbar merged 2012-08-04 22:44:30 +02:00
Francisco Pinto
c6477bdb79 Starfield + nav 2012-08-04 20:58:10 +02:00
João Batista
6841056981 Navigation much better: still much work to do 2012-08-04 20:01:10 +02:00
João Batista
e1115ca8c7 pre remove boostrap thing 2012-08-04 17:09:24 +02:00
João Batista
538ae9a36d Folder structure WIP 2012-08-04 15:24:29 +02:00
João Batista
7e17eadb26 Base html site 2012-08-04 14:39:15 +02:00