Commit Graph

2634 Commits

Author SHA1 Message Date
Hakim El Hattab
a5750f03c0 merge conflict 2016-01-08 13:58:35 +01:00
Hakim El Hattab
06cdd9b7cd include speaker view keyboard shortcut when applicable #1466 2016-01-08 13:49:06 +01:00
Hakim El Hattab
4ee6769e0f tweaked fragment examples 2016-01-08 11:05:59 +01:00
Hakim El Hattab
52aec94800 center help overlay with flexbox 2016-01-08 10:58:13 +01:00
Bjoern Kimminich
7621e1085d added retire.js to build process
-allows security vulnerability check in used npm-dependencies and own scripts
-execute with ```grunt retire```
2016-01-08 10:51:35 +01:00
Hakim El Hattab
ddd0e85f41 Merge branch 'master' of github.com:hakimel/reveal.js into dev 2016-01-08 10:49:40 +01:00
Hakim El Hattab
c3919756f1 resolve conflict 2016-01-08 10:48:10 +01:00
Hakim El Hattab
ee877845d8 add new fragment styles to readme #1445 2016-01-08 10:41:20 +01:00
Hakim El Hattab
76faeccd3e Merge branch 'fragments' of https://github.com/kewitz/reveal.js into dev 2016-01-08 10:39:02 +01:00
Hakim El Hattab
3bb7cf528c Merge branch 'master' of github.com:hakimel/reveal.js into dev 2016-01-08 10:37:51 +01:00
Hakim El Hattab
2a86465434 tweak to pdf print isntructions 2016-01-08 10:35:25 +01:00
Hakim El Hattab
1450d21595 Merge pull request #1450 from Quintasan/fix-printing-readme
Chromium users need to check Background graphics option when printing.
2016-01-08 10:29:45 +01:00
Hakim El Hattab
b7644a3bf7 expose version number through #1451 2016-01-08 10:26:53 +01:00
Hakim El Hattab
fb00a5d613 Merge branch 'master' of github.com:hakimel/reveal.js into dev 2016-01-08 10:25:44 +01:00
Hakim El Hattab
1d6848a782 merge conflict 2016-01-08 10:21:35 +01:00
Hakim El Hattab
19a801799a Merge pull request #1472 from vicapow/master
Add the grunt-cli as a dependency instead of assuming global grunt.
2016-01-08 10:14:34 +01:00
Victor Powell
4881281ea1 Add the grunt-cli as a dependency instead of assuming global grunt. 2016-01-06 13:01:58 -08:00
Hakim El Hattab
fcb4b05de7 Merge branch 'master' of github.com:hakimel/reveal.js into dev 2016-01-04 09:31:46 +01:00
Hakim El Hattab
e448cf8cd1 Merge pull request #1459 from appleboy/patch-1
remove redundant spaces.
2016-01-04 09:31:12 +01:00
Hakim El Hattab
c2298865cb Merge pull request #1467 from ismith/spelling_fix
Fix spelling error in print-pdf plugin
2016-01-04 09:30:36 +01:00
Hakim El Hattab
18b644cf8f ©️ ©️ ©️ ©️ ©️ closes #1469 2016-01-04 09:29:55 +01:00
Ian Smith
5da75aef01 Fix spelling error in print-pdf plugin 2015-12-27 12:35:13 -06:00
Bjoern Kimminich
de4efa5d19 updated to mustache 2.2.1
prevents XSS vulnerability (see https://github.com/janl/mustache.js/pull/388)
2015-12-21 23:17:53 +01:00
Bjoern Kimminich
5abf5001a8 ignoring IntelliJ IDEA files 2015-12-21 23:02:57 +01:00
Hakim El Hattab
91c6db71ca update to highlight.js 9.0.0 2015-12-14 09:49:05 +01:00
Bo-Yi Wu
07affa2750 remove redundant spaces. 2015-12-08 14:14:42 +08:00
Razvan Caliman
d06981c60c Merge branch 'muted-video' of github.com:oslego/reveal.js into muted-video 2015-12-03 09:47:23 +00:00
Razvan Caliman
b49664621f add option to mute background videos (updated) 2015-12-03 09:43:32 +00:00
Michał Zając
de4406f26c Chromium users need to check Background graphics option when printing. 2015-11-30 10:46:21 +01:00
Leonardo Kewitz
2909440fde Clean version of the new transitions. 2015-11-22 18:52:42 -02:00
Leonardo Kewitz
d457b9270a Added 4 fragment transitions effect. 2015-11-22 18:34:25 -02:00
Hakim El Hattab
6949ebc762 tweak 2015-11-19 15:44:50 +01:00
Hakim El Hattab
0e763c7171 2x playback controls for retina displays 2015-11-19 15:39:29 +01:00
Hakim El Hattab
c8319b9b1a add autoSlideMethod to default config 2015-11-19 15:35:12 +01:00
Hakim El Hattab
0cd4e2c84f Merge branch 'dev' of github.com:hakimel/reveal.js into dev 2015-11-19 15:30:43 +01:00
Hakim El Hattab
bbe38ad263 Merge pull request #1437 from der-michik/autoslide-direction
Add an option to auto-slide right only
2015-11-19 15:30:35 +01:00
MichiK
a398a02edb Fix build error 2015-11-19 13:51:22 +01:00
MichiK
4a45557b57 Add a more flexible autoSlideMethod option
Auto-sliding will now use the method specified in the config if it is
a function or default to navigateNext.
2015-11-19 13:00:01 +01:00
Hakim El Hattab
bef2722eed simplify condition #1434 2015-11-19 10:38:52 +01:00
Hakim El Hattab
31550d09e4 Merge pull request #1434 from mikemellor11/master
stops parallax failing if only the single horizontal slide and multiple vertical
2015-11-19 09:51:37 +01:00
MichiK
c0afa01e6a Add autoSlideRight option
When the autoSlideRight config option is active, the auto-sliding
will always navigate to the right and never down even if slides are
present there. This allows hidden "bonus slides" in presentations
which can be displayed as needed but won't show up automatically.
2015-11-18 22:00:35 +01:00
Hakim El Hattab
833622edcd update parallax background docs #1436 2015-11-18 10:36:48 +01:00
Mike Mellor
3e42929f90 check for 0 division, stops parallax failing if only the single horizontal slide and multiple vertical 2015-11-13 15:13:30 +00:00
Riceball LEE
16ebf2a783 * [bug] the markdown plugin can not render highlight codes for marked.setOptions(highlight) 2015-11-11 07:37:08 +00:00
Riceball LEE
6952931451 * update marked.js version to 0.3.5 2015-11-10 21:40:46 +00:00
Hakim El Hattab
822a9c937c 3.2.0 2015-11-09 17:07:06 +01:00
Hakim El Hattab
d022113eea Merge pull request #1362 from GuGuss/patch-1
Update the theme README.md
2015-11-09 16:54:32 +01:00
Hakim El Hattab
bb7ab5f94e Merge pull request #1381 from lordsutch/master
Fix text being cut off in Chrome when printing.
2015-11-09 16:51:05 +01:00
Hakim El Hattab
a5181e4372 Merge pull request #1391 from rohithpr/notes-key-binding
Fixed #1379 - config keyboard now disables 's' key
2015-11-09 16:47:21 +01:00
Hakim El Hattab
50f9896362 update highlight.js 8.6 -> 8.9.1 #1385 2015-11-09 16:46:08 +01:00