db46896613
Merge pull request #1522 from demoneaux/notes-fix
...
Fix query parameter issue in notes plugin.
2016-03-07 08:53:27 +01:00
6d0b52026a
Fix query parameter issue in notes plugin.
...
Closes #1392 .
2016-03-06 18:28:08 +08:00
9eb56f8146
Remove unused dependencies.
2016-03-06 16:52:02 +08:00
12acf08ca5
Merge branch 'jetzhliu-patch-1' of https://github.com/jetzhliu/reveal.js into dev
2016-01-11 10:05:42 +01:00
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
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
06cdd9b7cd
include speaker view keyboard shortcut when applicable #1466
2016-01-08 13:49:06 +01:00
fcb4b05de7
Merge branch 'master' of github.com:hakimel/reveal.js into dev
2016-01-04 09:31:46 +01:00
5da75aef01
Fix spelling error in print-pdf plugin
2015-12-27 12:35:13 -06:00
91c6db71ca
update to highlight.js 9.0.0
2015-12-14 09:49:05 +01:00
16ebf2a783
* [bug] the markdown plugin can not render highlight codes for marked.setOptions(highlight)
2015-11-11 07:37:08 +00:00
6952931451
* update marked.js version to 0.3.5
2015-11-10 21:40:46 +00:00
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
50f9896362
update highlight.js 8.6 -> 8.9.1 #1385
2015-11-09 16:46:08 +01:00
215617740d
server notes sync slide changes both ways, fixes #1425
2015-11-09 16:24:09 +01:00
43f0d08155
fixed loading
2015-11-02 10:37:16 +01:00
fc792e704c
remove remotes.io plugin, service no longer exists #1411
2015-10-26 09:22:46 +01:00
625831b993
format note content when creating slide
...
In html content, marked allow `Inline-Level Grammar` but not `Block-Level Grammar`, so when I write following:
```
note:
* a
* b
* c
```
it become:
```html
<p><em> a
</em> b</p>
<ul>
<li>c</li>
</ul>
```
unbelievable!
2015-10-19 19:50:43 +08:00
dd8f95d9a9
Fixed #1379 - config keyboard now disables 's' key
2015-10-09 00:14:02 +05:30
c1a7e83d75
multiplexing work with socket.io 1.0+ #1281 #1276
2015-09-29 10:38:34 +02:00
b16bc6fc2e
speaker notes work with socket.io 1.0 #1375
2015-09-29 10:07:21 +02:00
9bcd1484bc
notes defined in data-notes attributes retain preformatted whitespace
2015-09-25 09:41:05 +02:00
d44125d789
tweaks for #1200
2015-07-07 12:15:43 +02:00
399d4f652d
Merge branch 'master' of https://github.com/bfritscher/reveal.js into dev
2015-07-07 12:06:22 +02:00
852fea4133
Merge pull request #1205 from gothma/mathjax-md
...
Allow tex parsing in <code> tags
2015-07-07 11:50:08 +02:00
adf1a24f0a
Merge branch 'master' of github.com:hakimel/reveal.js into dev
2015-06-25 10:02:21 +02:00
6ec6ac2cb4
Merge pull request #1250 from kfuglsang/highlightjs-86
...
Updated to Highlightjs 8.6 with all languages supported.
2015-06-25 09:57:03 +02:00
50e1463a57
Removed leap motion plugin from main project
2015-06-15 19:42:24 -05:00
5dd2dd9f0b
Allows to specify PORT from env on multiplex plugin
2015-06-10 18:23:20 +01:00
0563835fc0
Updated to Highlightjs 8.6 with all languages supported.
2015-06-02 22:18:36 +02:00
0cb4d10504
Allow tex parsing in <code> tags
...
Just using $ as delimiter in markdown document fails since the markdown
parser unknown to the dollar syntax will try to interpret underscores.
Putting the $ delimented formula in backticks will cause the markdown
parser to put the tex-code with the $ delimiters into a code block.
The texcode will then be unchanged. This patch allows for mathJax to
interpret and automagically display the tex-formulas.
2015-04-16 13:24:23 +02:00
a0cc104a0c
Merge branch 'query-params' of https://github.com/FND/reveal.js into dev
2015-04-12 17:07:59 +02:00
9645a763c3
handle the </script> end bug inside code markdown
...
by changing the tag before html is parsed and restoring it before markdown parsing
2015-04-12 15:15:57 +02:00
4052389c58
support query parameters within notes plugin
2015-04-02 07:06:03 +02:00
0428365041
Merge branch 'patch-1' of https://github.com/drzax/reveal.js into dev
2015-03-25 14:16:12 +01:00
e38b1d38f8
Merge pull request #1166 from callahad/update-marked
...
update marked to 0.3.3
2015-03-25 14:02:22 +01:00
60457d21b4
alt+zoom only works on slide content #1151
2015-03-25 13:57:00 +01:00
7a03e238f0
Attribute values should be quoted
2015-03-16 20:44:23 +10:00
dfb39b4c96
Bumped Marked to v0.3.3
...
Compressed with `uglifyjs lib/marked.js --comments="/Copyright/" --mangle --compress`
Used Marked v0.3.3 as of chjj/marked@2b5802f258
2015-03-16 03:13:50 -05:00
7baa8ec1fe
updated md slide separator regex #929
...
see https://github.com/hakimel/reveal.js/issues/929#issuecomment-80738837
2015-03-16 08:54:58 +01:00
f79210c6c1
Add support for custom notes.html file
...
It would be nice if we could define a custom notes.html file.
Actually, I'm used to compile my js files before releasing my app and, using selectors like `script[src$="notes.js"]`, doesn't work :(
So, what do you think about it?
2015-03-05 18:54:34 -03:00
44548ba357
add global flag back in for whitespace removal, without it most of the content in example.html does not work #682
2015-01-22 08:46:14 +01:00
f032df8f13
default to https mathjax #1103
2015-01-20 09:11:09 +01:00
8524af73f6
zoom plugin now works for scaled presentations
2014-12-10 20:09:03 +01:00
cef19486b8
better handling of overflowing speaker notes #1017
2014-10-16 13:09:54 +02:00
f28b380fac
prevent auto-sliding in notes frames #1004
2014-09-28 17:13:49 +02:00
0aad39f755
dont open notes when S is pressed inside of notes window #991
2014-09-27 16:19:39 +02:00
80fc214af1
update highlight.js to 8.2
2014-09-11 11:37:36 +02:00
062918b5e2
update highlight.js to 8.1
2014-07-22 10:29:00 +02:00
b558f74299
zoom viewport is centered on target element #900
2014-05-19 09:26:49 +02:00
3eb7038a15
sync server-side speaker notes after notes window opens
2014-05-04 10:10:21 +02:00
4c5b15d0b9
update server side notes to match client side plugin
2014-05-04 09:32:00 +02:00
fa6187072e
clicking on notes timer now resets it #779
2014-05-04 08:13:09 +02:00
ebb9a689a0
updates to phantom pdf print script, arguments for width/height
2014-04-29 10:24:13 +02:00
1e5ca748a4
enable reveal.js keyboard shortcuts anywhere in notes window
2014-04-26 11:36:03 +02:00
37ebe0732c
skip transitions in notes window for better main window performance
2014-04-22 15:05:06 +02:00
f396b9b871
limit how often the notes window updates presentation states
2014-04-22 14:50:50 +02:00
c02d185cfd
notes code format tweaks
2014-04-22 14:14:21 +02:00
ce05138f9a
dont toggle paused/overview modes needlessly when setting state
2014-04-22 14:06:58 +02:00
3795ef1599
update style of notes plugin to match Slides
2014-04-20 10:26:00 +02:00
5b18c1f308
notes plugin now operates entirely through window.postMessage, adding support for file protocol
2014-04-19 10:54:26 +02:00
11ea0aa3e1
postmessage plugin is now part of reveal.js core
2014-04-18 13:56:51 +02:00
c87d7db930
code format tweak
2014-04-06 10:18:38 +02:00
2eb3d082ce
Merge branch 'xhr-local' of https://github.com/malyw/reveal.js into dev
2014-04-06 10:16:46 +02:00
2901abccde
Merge pull request #682 from tentacode/patch-1
...
Indentation issue when using code in a markdown slide
2014-04-06 09:56:54 +02:00
873f2dbc96
Mark xhr.status=0 as successful
2014-04-02 13:02:39 +03:00
75247a8860
Mark xhr.status=0 as successful
2014-04-02 12:59:36 +03:00
b8157a1e91
Merge branch 'master' of https://github.com/jdfitzgerald/reveal.js into dev
2014-03-25 16:42:55 +01:00
71f1780b50
fixed two minor bugs, a twohanded gesture may not have a direction, and if autoCenter is of, the tipPosition was in the wrong scope
2014-03-05 15:20:30 +01:00
d939c4790e
updated highlight.js to v8.0
2014-02-28 16:22:36 +00:00
015468c3a2
renamed markdown attributes for clarity and consistency: data-vertical -> data-separator-vertical, data-notes -> data-separator-notes
2014-02-17 21:15:02 +01:00
a22d00ab25
server side notes plugin now supports input via data-notes attribute
2014-02-17 20:16:21 +01:00
9a9ce672b7
add example of markdown slide and element attributes
2013-12-02 12:20:48 +01:00
f2097417da
Simpler default syntax for markdown attributes.
...
- on slides: .slide x=y
- on elements: .element x=y
Those are detected in html comment, in order to not be visible
if a markdown is edited in an html editor.
2013-11-30 23:12:40 +01:00
13da34cc6b
Removes console.log calls.
2013-11-30 23:12:40 +01:00
d52eb599d1
Fix previous element selection.
2013-11-30 23:12:39 +01:00
8ad633e4f3
Fix element attributes, except for multi-line.
2013-11-30 23:12:39 +01:00
3330c2a764
Remove section attribute implementation.
2013-11-30 23:12:38 +01:00
dd9fa3e22b
First refactoring
2013-11-30 23:12:38 +01:00
e947f0f216
add zoomKey option for #700
2013-11-26 09:00:04 -05:00
e0dccd85be
Merge branch 'feature/more-languages' of https://github.com/haf/reveal.js into dev
2013-11-17 17:20:49 -05:00
e7e941b663
add code slide to markdown example #682
2013-11-07 08:03:22 -05:00
4b0fe47bb6
Add slide attributes for single slide section case.
2013-11-06 11:06:03 +01:00
2cdd1afe85
Remove console.log debugs, and fix tabs
2013-11-04 16:31:51 +01:00
492a094955
Fix default separator pattern for attribute in slide.
2013-11-04 16:31:47 +01:00
83ee2eb00e
Fix markdown.js slideAttributesSeparator selection.
2013-11-04 16:31:33 +01:00
d6b8e4a246
Rebased on dev, and following contribution guideline.
2013-11-04 16:31:29 +01:00
ec72e8cbc7
Fix markdown vertical wrapping section element generation.
2013-11-04 16:31:25 +01:00
e1b11e737e
Make sure a pattern doesn't include space.
2013-11-04 16:31:22 +01:00
f6445a04a0
Fix bug on data attributes for first vertical slide.
...
The first slide of a vertical stack see some data attributes ignored.
Mainly the data-transition one.
Repeat all data-attributes on the wrapping section element.
Ignore any other attributes (like 'id="xxx"'), in order to not
mess with internal links (by repeating twice an id).
2013-11-04 16:31:18 +01:00
c51ab74d72
Add attributes in markdown for slide generation.
...
By default, look for <!-- slide-attributes: xxxx -->.
Whatever 'xxx' is will be added to the section attributes.
You can define your own pattern with 'data-attributes'.
For instance 'data-attributes="^\s*?-- (.*?)$"':
that will be added to the options.
The 'attributes' section is removed from the content of the slide,
so the final markdown doesn't reflect them.
That also means you can add those attributes *anywhere* in the slide
But that allows for *any* attribute to be added for a specifc slide,
like:
- id="plan", for allowing internal link (issue #430 )
- data-background="#ff0000"
- data-transition="fade"
You list those attributes on a single line, like
- (default):
` <!-- id="plan" data-background="#ff0000" -->`
- or, with an alternative data-attributes pattern:
` -- id="plan" data-background="#ff0000"`
Again, that line is remove from the final content.
2013-11-04 16:31:15 +01:00
80aadaf74e
Removing global flag for replacing whitespaces
2013-10-31 14:02:34 +01:00
d844195be1
format tweaks markdown.js, remove extra image asset
2013-10-28 09:06:43 -04:00
a87ce95794
Add 'data-element-attributes' attr. to 'section'.
...
By default '{\\\.\s*?([^}]+?)}'.
2013-10-27 22:49:43 +01:00
7aa93af0ca
Cleanup code, remove console log debugs.
2013-10-27 22:49:43 +01:00
28198b2ff0
Add attributes extracted from an attribute.
...
Allows to add attributes to element of an attribute which contains
the attribute pattern.
2013-10-27 22:49:42 +01:00
d20760f40d
Uses the right method setAttribute.
...
Works better, and the html elements get their attributes.
2013-10-27 22:49:42 +01:00
0bc3a836fc
First implem for adding classes to enclosing elts.
...
Extra text representing classes is detected and correctly removed.
Adding attributes isn't working yet.
2013-10-27 22:49:41 +01:00
c7077cf798
configure notes presentation through query string to avoid flicker
2013-10-22 09:21:49 -04:00
942724238f
better check for arrays in markdown plugin
2013-10-11 22:05:43 -04:00
8f3b14193e
Merge branch 'patch-1' of https://github.com/webpro/reveal.js into dev
2013-10-11 21:51:57 -04:00
275efa061a
Property 'length' is not a variable.
2013-09-29 11:34:17 +02:00
059311923b
serve remotes js from s3 #611
2013-09-19 23:36:39 -04:00
1fb85d4df6
Merge branch 'master' of https://github.com/drhuettl/reveal.js
2013-09-15 11:53:09 -04:00
c28e023c32
update comment
2013-09-15 11:52:40 -04:00
45ad161930
prevent unintended slide change event
...
This prevents the upcoming slide on the notes page from triggering
slidechanged events. I believe this fixes issue 578, as well.
2013-09-14 23:54:32 -05:00
a3f10e0b0f
make sure remotes works without notes plugin being loaded #607
2013-09-14 11:12:21 -04:00
c453bc4770
markdown plugin can now process slides that are added at runtime
2013-09-06 08:40:43 -04:00
ef9168c7c4
fix issue with notes on last slide of external markdown #589
2013-09-06 08:24:03 -04:00
6f5ed2f90e
supporting same languages as highlight.js
2013-09-05 10:45:50 +02:00
a0f0371fb1
configure notes window presentations to hide needless UI
2013-08-29 09:28:38 -04:00
d9c9474938
markdown refactoring #507
2013-08-27 09:11:43 -04:00
571fb67864
fix bug where markdown notes in last slide would not parse #574
2013-08-24 16:13:24 -04:00
7e629936e5
always use 'i' as iterator
2013-08-24 11:06:52 -04:00
7f85c21386
markdown refactoring; comments, renamed functions, shorter argument lists
2013-08-24 10:39:15 -04:00
1c5da37ca6
more markdown plugin refactoring
2013-08-24 10:03:34 -04:00
4350c0024f
standardize way of declaring functions
2013-08-23 17:51:20 -04:00
b968dfef15
update markdown plugin formatting to match reveal.js core
2013-08-23 17:49:19 -04:00
631a237b36
merge support for notes when using external markdown
2013-08-20 22:32:19 -04:00
c9853233ae
rename math plugin config option
2013-08-18 14:13:55 -04:00
2bed5833ca
remove pointless .call()
2013-08-16 09:30:22 -04:00
b17e285164
mathjax plugin updates #531
2013-08-13 08:53:41 -04:00
e7ee8858a2
remove unused code
2013-08-13 00:10:14 -04:00
3e23b8b690
make mathjax host a config option, revamp script loading, fragment examples #531
2013-08-12 23:15:19 -04:00
3901904057
comments and failesafes for #531
2013-08-12 23:01:35 -04:00
69f7c0c693
updates to mathjax plugin, incl more examples #531
2013-08-12 22:42:14 -04:00
9984cb1f21
limit scope of mathjax rerender #531
2013-08-12 09:27:23 -04:00
1748a29ff3
first version of mathjax plugin #531
2013-08-12 09:21:38 -04:00
32818e0149
move leap styles to js #554
2013-08-11 16:37:17 -04:00
e135f136c1
merge in leap plugin #554
2013-08-08 10:23:02 -04:00
b2c6ccc912
Minor update
...
Made sure all vars are declared with the var keyword.
modified: plugin/leap/leap.js
2013-08-07 22:40:07 -05:00
1e1919274c
Removed redundant code
...
modified: plugin/leap/leap.js
2013-08-07 22:07:02 -05:00
bd543e5cee
Various updates
...
Enhanced the pointer.
Cleaned up the code.
Added additional optional parameters.
Updated documentation.
modified: README.md
modified: index.html
modified: plugin/leap/leap.js
2013-08-07 21:53:31 -05:00
1d895bad61
Docs and updates
...
Updated README.md to mention the leap plugin.
Removed leap settings from index.html.
Better variable naming in leap.js
modified: README.md
modified: index.html
modified: plugin/leap/leap.js
2013-08-06 00:11:58 -05:00
36a4f56f62
Minor updates
...
modified: css/reveal.min.css
modified: plugin/leap/leap.js
2013-08-05 23:36:07 -05:00
32865b43f8
Put the timing code back in.
...
Occasionally gestures were fired twice. This helps prevent that.
modified: plugin/leap/leap.js
2013-08-05 22:49:39 -05:00
dbcbc7aa69
Added pointer and tweaked the code
...
modified: css/reveal.css
modified: css/reveal.min.css
modified: plugin/leap/leap.js
2013-08-05 22:41:04 -05:00
a06c84e42a
Removed timing code.
...
When used correctly, the 1/2 second delay is uncessary and may yield undesireable results.
modified: plugin/leap/leap.js
2013-08-05 12:43:07 -05:00
0e7bc4091e
Minor updates
...
Changed invert to naturalSwipe
Removed invert rule from index.html
Ensured that left/right swipes only work with 1 hand present
modified: index.html
modified: plugin/leap/leap.js
2013-08-04 20:27:47 -05:00
70cade3732
Updates to leap.js and index.html
...
Added timing code to limit gesture calls.
Added gesture to access the overview.
index.html includes the leap plugin
2013-08-04 20:22:34 -05:00
af5acd1aa2
Added gestures
...
Left, right, up, and down gestures.
Optional invert for gestures.
2013-08-03 22:36:11 -05:00
b2980a705b
Added leap.min.js and comments.
2013-08-03 22:33:31 -05:00
fe90f2b8c7
Merge branch 'bug/markdown' of https://github.com/snowyu/reveal.js into dev
2013-07-31 08:37:53 -04:00
efbcab57f7
* [bug] fixed render markdown file error like this:
...
```html
<section data-markdown>
<script type="text/template">
</script>
</section>
```
2013-07-31 07:12:29 +08:00
53f1f110c8
ensure notes window fragment states are mirrored in main window #538
2013-07-26 10:03:59 -04:00
03385d7245
simplify client side notes plugin
2013-07-26 09:48:21 -04:00
4c491e5ecc
highlight charset option for external md in readme #537
2013-07-24 23:35:28 -04:00
3ca598473b
updated markdown example with data-charset
2013-07-23 17:34:23 +02:00
ce0facf7b2
added custom charset support for external markdown file
2013-07-23 17:31:30 +02:00
245efee894
Support for notes within markdown
2013-06-25 12:15:22 +01:00
7e8ee5340e
update phanomjs pdf printing to work with latest pdf css
2013-06-18 21:55:23 -04:00
5655b5f467
semi-correction #470
2013-06-09 19:17:31 +02:00
8393efe8e9
serve notes/multiple index document as html ( closes #470 )
2013-06-09 17:07:14 +02:00
f5a379b8a1
merge notes timer rounding fix
2013-06-09 16:51:35 +02:00
28d370f2af
Use Math.floor instead of parseInt to avoid problems with very small numbers like 2e-10
2013-06-02 11:02:53 +02:00
b67889049a
viewport meta to fit notes window on ipad
2013-05-19 17:01:52 -04:00
d1a97b379f
float fix in notes-server plugin
2013-05-19 16:42:36 -04:00
db4eb20bc3
merge notes float fix and support for multiple fragments with same index
2013-05-05 18:44:10 -04:00
88eb0af776
Allow override of HTML escaping in code blocks
...
This way, authors can use HTML for special formatting.
2013-05-05 16:19:08 +02:00
f157aec1de
Merge branch 'remotes-plugin-natural-bindings' of https://github.com/toy/reveal.js into dev
2013-05-04 15:03:19 -04:00
352ec7e9ad
remotes plugin more natural bindings: tap — next, zoom-out — activate overview, zoom-in — deactivate overview
2013-05-04 02:27:55 +02:00
0cbe741afd
remove lang prefix from marked.js to fix highlight issue
2013-05-02 18:42:12 +03:00
39b53a7b3c
minify marked #433
2013-05-02 09:18:28 -04:00
beda5f4881
merge showdown to marked migration
2013-05-02 09:09:33 -04:00
1219564e05
Added clear:left to notes DIV
...
Resolves an issue where the first label (e.g., first bullet or first
number) of a list would wrap to the right side of the window and be
hidden under the clock element.
2013-05-02 12:02:46 +12:00
381da383d9
Replace the ShowDown Markdown engine with marked
2013-05-01 23:10:31 +03:00
b649c19af9
Moved my code to auto escape html to the right place
2013-05-01 14:44:53 -05:00
f210e7b1b5
avoid errors in old ie from code highlighting
2013-04-28 14:12:31 -04:00
a764c21cd1
add support for data-trim attribute on code elements ( closes #419 )
2013-04-27 15:50:33 -04:00
07d0ed8ba6
note included languages in highlight.js build #421
2013-04-27 15:22:37 -04:00
889692e26a
support code highlighting of a few more common languages #421
2013-04-27 13:22:08 -04:00
914a12e9cf
forward all attributes for markdown slides ( #413 )
2013-04-20 09:16:41 -04:00
6536d8467f
Added support for data-state in section when using external markdown files.
2013-04-20 12:45:11 +02:00
70b7ce360c
return current fragment index through getIndices, replaces getCurrentFragmentIndex #395
2013-04-16 08:59:35 -04:00
5181f6e17f
Merge branch 'master' of https://github.com/ainformatico/reveal.js into dev
2013-04-15 09:01:45 -04:00
87894e5503
fix prevents loading remote plugin several times when notes are enabled
2013-04-08 16:18:34 +02:00
c12b780736
broadcasting fragments state in multiplex plugin ( #394 )
2013-04-06 13:19:34 +02:00
433c7a66cd
Merge branch 'md-error-handling' of https://github.com/jakubholynet/reveal.js into dev
2013-03-30 21:54:30 -04:00
f6487dc312
More verbose error slide (HTTP necessary)
2013-03-24 23:30:50 +01:00
8fd28a9185
Better error reporting for external Markdown files
...
1. Show an alert when loading the file throws an exception
2. Whenever the status isn't success (2xx) - upon exception or e.g.
"file not found" - replace the section's content with information
about the failure (instead of being silent about it and showing
a blank slide).
We need to inform the user something went wrong, not just be silent
about it. An experienced developer, upon seing a blank slide, will
likely check the javascript console - but the rest will profit from
being told about the problem (and solution) explicitely.
2013-03-24 18:06:44 +01:00
ccaadaad45
Error check to prevent exception from Cipher
2013-03-11 09:25:26 +11:00
75ffa604d8
remove unused file ( closes #360 )
2013-03-10 11:57:08 -04:00
523989a21c
Remove unessecary file
2013-03-10 14:00:21 +11:00
13046a0337
merge search plugin, adjust styles
2013-03-08 19:48:30 -05:00
e0e98a2275
Merge branch 'searchplugin' of https://github.com/razor-1/reveal.js
2013-03-08 19:39:21 -05:00
999ac52256
print port when multiplex server starts ( #98 )
2013-03-08 19:22:17 -05:00
825fe51de9
add Reveal.getConfig(), replace use of window.globals ( #98 )
2013-03-08 19:05:58 -05:00
2bd5e8b65b
merge in multiplex ( #98 )
2013-03-08 18:49:28 -05:00
580a72c444
Bring multiplex up to date
2013-03-08 12:43:18 +11:00
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
329ae0fd43
include search button icon
...
embed a generic search button icon.
2013-03-04 16:42:23 -08:00
03237ac9af
Merge branch 'searchplugin' of https://github.com/razor-1/reveal.js into dev
2013-03-04 17:58:07 -05:00
34afc564cd
Update markdown.js
...
Allow HTML tags in external markdown files
2013-03-01 18:47:26 +02:00
d7b92c9c65
update main window when current slide changes in notes ( closes #343 )
2013-02-27 16:55:42 -05:00
68fa39f083
Merge branch 'patch-1' of https://github.com/asmod3us/reveal.js into dev
2013-02-27 15:40:53 -05:00
f9f17be014
merge external markdown support, move example to plugin ( #329 )
2013-02-27 15:01:30 -05:00
3321e8b600
Merge branch 'slidifyMarkdown' of https://github.com/webpro/reveal.js into dev
2013-02-27 14:20:26 -05:00
f095af212e
Update plugin/markdown/markdown.js
...
Use textContent instead of innerHTML to prevent encoding of certain characters in Markdown code blocks.
2013-02-26 16:06:18 +01:00
Hakim El Hattab
Benjamin Tan
Ian Smith
Riceball LEE
teawithfruit
Liu Zhanhong
rohithpr
RC028552
pierreozoux
Kenneth Fuglsang
Martin Goth
Boris Fritscher
FND
Simon Elvery
Dan Callahan
Daniel Teixeira
Sergey Gospodarets
Gijs Koot
J.D. Fitz.Gerald
VonC
Gabriel Pillet
Lars Kappert
Donald R. Huettl
Henrik
Hakim El Hattab
Rory Hardy
sun16
Emile 'iMil' Heitor
Adam Hepton
Thomas Rosenau
Eric Weikl
Ivan Kuchin
Amit Kotlovski
Nigel Stanger
Raymond Camden
Martin Kurtsson
Alejandro El Informático
tkaczmarzyk
Jakub Holy
David Banham
Jon Snyder
ynonp
asmod3us