Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update 02.06.2016 #2

Merged
merged 93 commits into from
Jun 2, 2016
Merged

Update 02.06.2016 #2

Changes from 2 commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
f79210c
Add support for custom notes.html file
danieltdt Mar 5, 2015
a96caba
Fixed last header having a border-bottom
flying-sheep May 3, 2015
cee6485
Gruntfile.js: watch tasks restructured
jzgdev Jul 2, 2015
8bbc297
add option to mute background videos
oslego Sep 19, 2015
bcfd0aa
bug fix - when the first section has a background-video, the vido do …
alexbatista Sep 29, 2015
b0d6e55
improvement on spaces and indentation
alexbatista Sep 29, 2015
92a6996
Improvement of code. Now none flag is used, but the readyState proper…
alexbatista Sep 29, 2015
28e0190
Merge branch 'master' of https://github.com/alexbatista/reveal.js
alexbatista Sep 29, 2015
e258db0
UPDATED - Improvement of code. Now none flag is used, but the readySt…
alexbatista Sep 30, 2015
c1cb328
UPDATED - Improvement on spaces and indentation
alexbatista Sep 30, 2015
ec119e7
UPDATED - Improvement on spaces and indentation
alexbatista Sep 30, 2015
625831b
format note content when creating slide
jetzhliu Oct 19, 2015
43f0d08
fixed loading
teawithfruit Nov 2, 2015
c0afa01
Add autoSlideRight option
MichiK Nov 18, 2015
4a45557
Add a more flexible autoSlideMethod option
MichiK Nov 19, 2015
a398a02
Fix build error
MichiK Nov 19, 2015
bbe38ad
Merge pull request #1437 from der-michik/autoslide-direction
hakimel Nov 19, 2015
0cd4e2c
Merge branch 'dev' of github.com:hakimel/reveal.js into dev
hakimel Nov 19, 2015
c8319b9
add autoSlideMethod to default config
hakimel Nov 19, 2015
0e763c7
2x playback controls for retina displays
hakimel Nov 19, 2015
6949ebc
tweak
hakimel Nov 19, 2015
d457b92
Added 4 fragment transitions effect.
kewitz Nov 22, 2015
2909440
Clean version of the new transitions.
kewitz Nov 22, 2015
b496646
add option to mute background videos (updated)
oslego Dec 3, 2015
d06981c
Merge branch 'muted-video' of github.com:oslego/reveal.js into muted-…
oslego Dec 3, 2015
91c6db7
update to highlight.js 9.0.0
hakimel Dec 14, 2015
fcb4b05
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Jan 4, 2016
fb00a5d
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Jan 8, 2016
b7644a3
expose version number through #1451
hakimel Jan 8, 2016
3bb7cf5
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Jan 8, 2016
76faecc
Merge branch 'fragments' of https://github.com/kewitz/reveal.js into dev
hakimel Jan 8, 2016
ee87784
add new fragment styles to readme #1445
hakimel Jan 8, 2016
ddd0e85
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Jan 8, 2016
52aec94
center help overlay with flexbox
hakimel Jan 8, 2016
4ee6769
tweaked fragment examples
hakimel Jan 8, 2016
06cdd9b
include speaker view keyboard shortcut when applicable #1466
hakimel Jan 8, 2016
a5750f0
merge conflict
hakimel Jan 8, 2016
8ec529d
rebuild css
hakimel Jan 8, 2016
daa5f03
Merge branch 'patch-2' of https://github.com/teawithfruit/reveal.js i…
hakimel Jan 8, 2016
c0ea2cd
same code format
hakimel Jan 8, 2016
3d33d27
tweak implementation of #1376
hakimel Jan 8, 2016
993526f
fix broken iframe in backgrounds example
hakimel Jan 8, 2016
3df2129
Merge branch 'patch-1' of https://github.com/danieltdt/reveal.js into…
hakimel Jan 8, 2016
19a69b2
code format
hakimel Jan 8, 2016
fba12ab
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Jan 11, 2016
12acf08
Merge branch 'jetzhliu-patch-1' of https://github.com/jetzhliu/reveal…
hakimel Jan 11, 2016
fdb7517
merge #1220
hakimel Jan 11, 2016
d0bb69d
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Jan 11, 2016
191dbe6
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Jan 22, 2016
219a600
Change ".video" to ".reveal .video"
LaurentTreguier Feb 17, 2016
acc4009
use css to scale slides up in safari
hakimel Feb 29, 2016
0eb2d81
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Mar 4, 2016
9eb56f8
Remove unused dependencies.
bnjmnt4n Mar 6, 2016
6d0b520
Fix query parameter issue in notes plugin.
bnjmnt4n Mar 6, 2016
e3d681e
Merge pull request #1521 from demoneaux/unused-dependencies
hakimel Mar 7, 2016
db46896
Merge pull request #1522 from demoneaux/notes-fix
hakimel Mar 7, 2016
7cee887
Merge branch 'patch-1' of https://github.com/LaurentTreguier/reveal.j…
hakimel Mar 7, 2016
ac2a3ff
Make PDF export section less OS X specific.
bnjmnt4n Mar 7, 2016
922677a
fix notes regex #1522 #1392
hakimel Mar 9, 2016
8e3a7f0
notes plugin no longer syncs overview mode #1446
hakimel Mar 9, 2016
ef137fd
server notes plugin no longer syncs overview mode #1446
hakimel Mar 9, 2016
0c5ce1e
Merge pull request #1523 from demoneaux/readme-fix
hakimel Mar 9, 2016
0dbdd8a
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Mar 10, 2016
1a5f299
update headjs to v1.0.3
booi Mar 16, 2016
2625a92
add 'shuffle' config value and API method #1506 #1089
hakimel Mar 20, 2016
3d09691
new empty template at index.html, move old index to demo.html #1526
hakimel Mar 20, 2016
4e416fd
remove unintentionally added file
hakimel Mar 20, 2016
00b9c2b
minor tweaks
hakimel Mar 20, 2016
37ac67d
Table of contents added in README.md
ducin Apr 2, 2016
520fa49
generalize scroll offset prevention
hakimel Apr 7, 2016
8789baa
Merge pull request #1545 from ducin/master
hakimel Apr 7, 2016
f98b5cc
Update README.md
hakimel Apr 7, 2016
eca7113
Update README.md
hakimel Apr 7, 2016
07c2355
support for standalone multiplexing
hakimel Apr 7, 2016
f85a1e9
remove test content
hakimel Apr 7, 2016
492e2e2
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Apr 7, 2016
d6406e4
new multiplex server courtesy of now.sh (closes #1377)
hakimel Apr 7, 2016
e83e275
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Apr 7, 2016
a63c8ca
Fixes #1549, now UA match is limiting out MS Edge and Chrome detectio…
Apr 8, 2016
2dc546f
Fix watching for markdown files
0xR Apr 9, 2016
0fedfbe
Merge branch 'update-headjs' of https://github.com/booi/reveal.js int…
hakimel Apr 10, 2016
5a7ac78
lazy load iframe in demo
hakimel Apr 10, 2016
87b24dd
merge conflict
hakimel Apr 10, 2016
a6507af
widen watch for html files, required for updates to demo.html
hakimel Apr 10, 2016
cb092e6
Merge branch 'dev' of github.com:hakimel/reveal.js into dev
hakimel Apr 10, 2016
5dd9067
overview now works with percentage based width/height #1247
hakimel Apr 13, 2016
f0ee41a
Merge branch '1549' of https://github.com/RopoMen/reveal.js into dev
hakimel Apr 13, 2016
1efa524
readme tweak for #1535
hakimel Apr 13, 2016
fc3e4d7
change introduction
hakimel Apr 18, 2016
539e774
3.3.0
hakimel Apr 18, 2016
87b0823
Simplify full setup
ad-si Apr 24, 2016
3d49b1d
Merge pull request #1571 from adius/patch-1
hakimel Apr 29, 2016
a8c4109
Update README.md
hakimel May 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion plugin/markdown/markdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@
* of external markdown documents.
*/
(function( root, factory ) {
if( typeof exports === 'object' ) {
if (typeof define === 'function' && define.amd) {
root.marked = require( './marked' );
root.RevealMarkdown = factory( root.marked );
root.RevealMarkdown.initialize();
} else if( typeof exports === 'object' ) {
module.exports = factory( require( './marked' ) );
}
else {
Expand Down