Commit Graph

1737 Commits

Author SHA1 Message Date
fba12abd6a Merge branch 'master' of github.com:hakimel/reveal.js into dev 2016-01-11 10:05:25 +01:00
3c46733a54 Merge pull request #1476 from prtksxna/patch-1
Remove rebase conflict in README.md
2016-01-11 10:02:40 +01:00
7eca84254e Remove rebase conflict in README.md 2016-01-11 05:19:28 +05:30
19a69b2c89 code format 2016-01-08 14:33:34 +01:00
3df2129bd6 Merge branch 'patch-1' of https://github.com/danieltdt/reveal.js into dev 2016-01-08 14:32:03 +01:00
993526ff67 fix broken iframe in backgrounds example 2016-01-08 14:18:53 +01:00
3d33d27b86 tweak implementation of #1376 2016-01-08 14:16:42 +01:00
c0ea2cd980 same code format 2016-01-08 14:02:16 +01:00
daa5f031bf Merge branch 'patch-2' of https://github.com/teawithfruit/reveal.js into dev 2016-01-08 14:00:50 +01:00
8ec529d767 rebuild css 2016-01-08 13:59:12 +01:00
a5750f03c0 merge conflict 2016-01-08 13:58:35 +01:00
06cdd9b7cd include speaker view keyboard shortcut when applicable #1466 2016-01-08 13:49:06 +01:00
4ee6769e0f tweaked fragment examples 2016-01-08 11:05:59 +01:00
52aec94800 center help overlay with flexbox 2016-01-08 10:58:13 +01:00
ddd0e85f41 Merge branch 'master' of github.com:hakimel/reveal.js into dev 2016-01-08 10:49:40 +01:00
c3919756f1 resolve conflict 2016-01-08 10:48:10 +01:00
ee877845d8 add new fragment styles to readme #1445 2016-01-08 10:41:20 +01:00
76faeccd3e Merge branch 'fragments' of https://github.com/kewitz/reveal.js into dev 2016-01-08 10:39:02 +01:00
3bb7cf528c Merge branch 'master' of github.com:hakimel/reveal.js into dev 2016-01-08 10:37:51 +01:00
2a86465434 tweak to pdf print isntructions 2016-01-08 10:35:25 +01:00
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
b7644a3bf7 expose version number through #1451 2016-01-08 10:26:53 +01:00
fb00a5d613 Merge branch 'master' of github.com:hakimel/reveal.js into dev 2016-01-08 10:25:44 +01:00
1d6848a782 merge conflict 2016-01-08 10:21:35 +01:00
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
4881281ea1 Add the grunt-cli as a dependency instead of assuming global grunt. 2016-01-06 13:01:58 -08:00
fcb4b05de7 Merge branch 'master' of github.com:hakimel/reveal.js into dev 2016-01-04 09:31:46 +01:00
e448cf8cd1 Merge pull request #1459 from appleboy/patch-1
remove redundant spaces.
2016-01-04 09:31:12 +01:00
c2298865cb Merge pull request #1467 from ismith/spelling_fix
Fix spelling error in print-pdf plugin
2016-01-04 09:30:36 +01:00
18b644cf8f ©️ ©️ ©️ ©️ ©️ closes #1469 2016-01-04 09:29:55 +01:00
5da75aef01 Fix spelling error in print-pdf plugin 2015-12-27 12:35:13 -06:00
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
5abf5001a8 ignoring IntelliJ IDEA files 2015-12-21 23:02:57 +01:00
91c6db71ca update to highlight.js 9.0.0 2015-12-14 09:49:05 +01:00
07affa2750 remove redundant spaces. 2015-12-08 14:14:42 +08:00
d06981c60c Merge branch 'muted-video' of github.com:oslego/reveal.js into muted-video 2015-12-03 09:47:23 +00:00
b49664621f add option to mute background videos (updated) 2015-12-03 09:43:32 +00:00
de4406f26c Chromium users need to check Background graphics option when printing. 2015-11-30 10:46:21 +01:00
2909440fde Clean version of the new transitions. 2015-11-22 18:52:42 -02:00
d457b9270a Added 4 fragment transitions effect. 2015-11-22 18:34:25 -02:00
6949ebc762 tweak 2015-11-19 15:44:50 +01:00
0e763c7171 2x playback controls for retina displays 2015-11-19 15:39:29 +01:00
c8319b9b1a add autoSlideMethod to default config 2015-11-19 15:35:12 +01:00
0cd4e2c84f Merge branch 'dev' of github.com:hakimel/reveal.js into dev 2015-11-19 15:30:43 +01:00
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
a398a02edb Fix build error 2015-11-19 13:51:22 +01:00
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
bef2722eed simplify condition #1434 2015-11-19 10:38:52 +01:00
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
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