Commit Graph

1741 Commits

Author SHA1 Message Date
Hakim El Hattab
e0e98a2275 Merge branch 'searchplugin' of https://github.com/razor-1/reveal.js 2013-03-08 19:39:21 -05:00
Hakim El Hattab
7dd2a10b34 remove extra whitespace in css 2013-03-08 19:33:34 -05:00
Hakim El Hattab
b855142f65 remove extra whitespace 2013-03-08 19:31:36 -05:00
Hakim El Hattab
4faaccdf8d fix grunt jshint config 2013-03-08 19:29:15 -05:00
Hakim El Hattab
29348178bc denote language in code samples 2013-03-08 19:24:58 -05:00
Hakim El Hattab
46f98ff483 cut back on spacing 2013-03-08 19:23:14 -05:00
Hakim El Hattab
999ac52256 print port when multiplex server starts (#98) 2013-03-08 19:22:17 -05:00
Hakim El Hattab
cc869cb629 update multiplex setup instructions (#98) 2013-03-08 19:16:29 -05:00
Hakim El Hattab
825fe51de9 add Reveal.getConfig(), replace use of window.globals (#98) 2013-03-08 19:05:58 -05:00
Hakim El Hattab
2bd5e8b65b merge in multiplex (#98) 2013-03-08 18:49:28 -05:00
David Banham
4963f15ab3 Prevent users from accidentally using common credentials 2013-03-09 10:16:44 +11:00
David Banham
580a72c444 Bring multiplex up to date 2013-03-08 12:43:18 +11:00
David Banham
61c229a4f9 Merge branch 'master' of https://github.com/hakimel/reveal.js
Conflicts:
	README.md
	index.html
	js/reveal.js
	package.json
	plugin/speakernotes/client.js
2013-03-08 10:29:54 +11:00
Hakim El Hattab
16f9749db5 scope error (#300) 2013-03-05 09:48:42 -05:00
Hakim El Hattab
d237c22fc0 blindfolded attempt at ie10 touch (#300) 2013-03-05 09:47:08 -05:00
Jon Snyder
329ae0fd43 include search button icon
embed a generic search button icon.
2013-03-04 16:42:23 -08:00
Hakim El Hattab
03237ac9af Merge branch 'searchplugin' of https://github.com/razor-1/reveal.js into dev 2013-03-04 17:58:07 -05:00
Hakim El Hattab
034016e330 merge two new themes, slight adjustments to said themes 2013-03-04 17:54:59 -05:00
Hakim El Hattab
55e16f4cb9 Merge branch 'solarized' of https://github.com/asmod3us/reveal.js into dev 2013-03-04 17:34:45 -05:00
Hakim El Hattab
ee7d36a044 fix error in how touch support was detected 2013-03-04 17:30:28 -05:00
Hakim El Hattab
0926be9781 better null check for stack (closes #354) 2013-03-04 17:01:49 -05:00
Hakim El Hattab
3bae233289 fix rotues check when loop is active 2013-03-04 16:55:39 -05:00
Hakim El Hattab
d5bf12275c better choice of fallback fonts (closes #328) 2013-03-04 16:37:26 -05:00
Hakim El Hattab
6a0ce3c5e9 add grunt sass theme task 2013-03-04 16:34:47 -05:00
Hakim El Hattab
2abf6678fa fix minor inconsistency in left/right nav when first/last slides are vertical 2013-03-04 16:17:01 -05:00
Hakim El Hattab
3a8e6dd4ba Merge branch 'patch-1' of https://github.com/ynonp/unix2-bash-scripts-slides into dev 2013-03-04 16:11:26 -05:00
Hakim El Hattab
a9bef856b0 note about post-startup configuration 2013-03-04 16:06:04 -05:00
Hakim El Hattab
7db0d9c17d enable pos-startup config of autoSlide 2013-03-04 15:59:44 -05:00
ynonp
34afc564cd Update markdown.js
Allow HTML tags in external markdown files
2013-03-01 18:47:26 +02:00
Hakim El Hattab
7081f901da fix a few typos (closes #352) 2013-03-01 11:13:46 -05:00
Hakim El Hattab
eeed287265 format tweak 2013-02-28 17:03:44 -05:00
Ben Houston
2767254d33 fixing an initialization bug when turning off controls and progress in initialization. 2013-02-28 13:05:06 -08:00
asmod3us
49ada91eb1 Merge remote-tracking branch 'upstream/master' into solarized 2013-02-28 17:28:07 +01:00
Hakim El Hattab
d2b6ed4726 force layout after configuration changes 2013-02-27 17:17:32 -05:00
Hakim El Hattab
ed5ada0bd6 Merge branch 'dev' of github.com:hakimel/reveal.js into dev 2013-02-27 17:08:15 -05:00
Hakim El Hattab
65cbe25a02 attempt n2 to fix grunt in travis ci build 2013-02-27 17:07:31 -05:00
Hakim El Hattab
7af90a2d8a attempt to fix grunt in travis ci build 2013-02-27 17:03:28 -05:00
Hakim El Hattab
d7b92c9c65 update main window when current slide changes in notes (closes #343) 2013-02-27 16:55:42 -05:00
Hakim El Hattab
c2ab30b87e replace classList.toggle( ..., force ) as it's broken in ff 2013-02-27 16:55:14 -05:00
Hakim El Hattab
4c57ad918b dispatch event when paused/resumed (closes #336) 2013-02-27 16:41:45 -05:00
Hakim El Hattab
68fa39f083 Merge branch 'patch-1' of https://github.com/asmod3us/reveal.js into dev 2013-02-27 15:40:53 -05:00
Hakim El Hattab
c438ba6516 example external markdown in readme (#329) 2013-02-27 15:32:47 -05:00
Hakim El Hattab
7cc0c8787d add note about external markdown in readme (#329) 2013-02-27 15:05:56 -05:00
Hakim El Hattab
f9f17be014 merge external markdown support, move example to plugin (#329) 2013-02-27 15:01:30 -05:00
Hakim El Hattab
3321e8b600 Merge branch 'slidifyMarkdown' of https://github.com/webpro/reveal.js into dev 2013-02-27 14:20:26 -05:00
Hakim El Hattab
2e8e73a847 fragment sorting tweaks, sort attribute is now called data-fragment-index (#342) 2013-02-27 13:41:29 -05:00
Hakim El Hattab
25f26bdc15 Merge branch 'sort_fragments' of https://github.com/jaberg/reveal.js into dev 2013-02-27 13:25:28 -05:00
Hakim El Hattab
3f740c8553 merge grunt update to 0.4 (#350) 2013-02-27 13:20:24 -05:00
Hakim El Hattab
9f1c5a0cea Merge branch 'upgrade-to-grunt-0.4' of https://github.com/boazsender/reveal.js into dev 2013-02-27 13:13:54 -05:00
Boaz Sender
14105feb10 upgrading to grunt 0.4. resolves #349. 2013-02-27 09:23:40 -05:00