Commit Graph

1754 Commits

Author SHA1 Message Date
Hakim El Hattab 7439a45b9b Merge branch 'shift-space' of https://github.com/remybach/reveal.js into dev 2013-03-17 08:04:02 -04:00
Hakim El Hattab 864d37f821 remove extra whitespace 2013-03-17 07:51:31 -04:00
Hakim El Hattab 5ba8440dca merge conflict 2013-03-17 07:50:57 -04:00
Hakim El Hattab d2cf21028e add missing theme readme 2013-03-17 07:34:33 -04:00
Hakim El Hattab 470a2f6fdc Merge pull request #367 from wtw/patch-1
Fixed some typos in the documentation
2013-03-16 21:22:34 -07:00
wtw 5d3d6d6056 Fixed some typos in the documentation 2013-03-15 11:32:20 +01:00
David Banham b8556751bf Load socket.io client lib from CDN
Based on user feedback, it was very non-obvious that if using an
web server other than multiplex/index.js it would be necessary to
upload the socket.io client libs. This negates that problem.
2013-03-15 10:02:10 +11:00
Amir Nissim 5d26e1618f bugfix - continue autoslide after resume 2013-03-11 12:46:02 +02:00
David Banham ccaadaad45 Error check to prevent exception from Cipher 2013-03-11 09:25:26 +11:00
Hakim El Hattab 75ffa604d8 remove unused file (closes #360) 2013-03-10 11:57:08 -04:00
Remy Bach 9138e4bc20 Add shift+space functionality 2013-03-10 11:26:24 +00:00
David Banham 523989a21c Remove unessecary file 2013-03-10 14:00:21 +11:00
Hakim El Hattab 13046a0337 merge search plugin, adjust styles 2013-03-08 19:48:30 -05:00
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