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

Resync with hakimel master #8

Merged
merged 121 commits into from
May 1, 2017
Merged

Resync with hakimel master #8

Changes from 1 commit
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
ccbc7ed
resolves #1324 allow display property to be configured
mojavelinux Aug 8, 2015
338a7b0
add 'npm build' script that launch grunt
Bramas Jun 28, 2016
c1d94f1
Merge pull request #12 from hakimel/dev
rajgoel Jul 21, 2016
a652e0a
Allow switching off preview links
rajgoel Jul 21, 2016
b78cca5
Support sass extension for custom themes
opdavies Oct 16, 2016
22de402
Shift `dependencies` to `devDependencies`.
bnjmnt4n Dec 8, 2016
441a26c
Allow background images without protocols to have query hashes/parame…
bnjmnt4n Dec 11, 2016
6831f6c
#1770, resume playback for paused media.
Dec 12, 2016
54bfad6
#1770, fixed function name.
Dec 12, 2016
da40eaf
#1770, added second argument for setAttribute
Dec 12, 2016
962c6c1
#1770, set 'data-paused-by-reveal' attribute only for the media eleme…
Dec 13, 2016
5f76234
support complex markdown
ccqgithub Dec 23, 2016
4afd854
Remove 'history: true' from index.html
pkubowicz Jan 15, 2017
a38207f
wait for in-slide video/audio to load before playing, reuse same auto…
hakimel Jan 16, 2017
f9e5467
prevent autoplaying backgrounds from playing if slide is hidden
hakimel Jan 17, 2017
84090b8
fix race condition by updating backgrounds after slide visibility
hakimel Jan 17, 2017
941b86b
works with video, defaults to (same as for images)
hakimel Jan 18, 2017
98de932
remove unused argument
hakimel Jan 19, 2017
20238ee
make backgrounds (iframes) interactive when the foreground is empty
hakimel Jan 19, 2017
e8164c1
2017
hakimel Jan 20, 2017
cb16f27
Merge pull request #1768 from demoneaux/background-images
hakimel Jan 23, 2017
08e6cc5
Merge pull request #1794 from pkubowicz/index-history
hakimel Jan 23, 2017
a6ecbfa
merge info links in index
hakimel Jan 23, 2017
d4133f0
fix empty pages in pdf exports (closes #1804)
hakimel Jan 24, 2017
934c2e9
additional fix for empty pages in pdf exports #1804
hakimel Jan 24, 2017
84202fa
adjust pdf margins instead of heights to fix #1804
hakimel Jan 25, 2017
cd36c92
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Jan 25, 2017
c018d04
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Jan 30, 2017
fa01fa3
typo
hakimel Jan 30, 2017
3617eac
note about showNotes in PDF exports #1800
hakimel Jan 30, 2017
37f3da6
Merge branch 'patch-2' of https://github.com/ccqgithub/reveal.js into…
hakimel Jan 31, 2017
02a6b05
fix markdown typo, update comment #1780
hakimel Jan 31, 2017
eada86c
recommend using textarea wrapper for inline markdown #1780
hakimel Jan 31, 2017
581da02
Merge pull request #1764 from demoneaux/package-json
hakimel Jan 31, 2017
981a8b9
Merge pull request #1728 from opdavies/sass-extension
hakimel Jan 31, 2017
7daa0e0
make background videos work on ipad #1778
hakimel Jan 31, 2017
dc159f2
Merge pull request #1644 from rajgoel/dev
hakimel Jan 31, 2017
c49f76d
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Jan 31, 2017
f496613
improved fragment notes support #1636
hakimel Jan 31, 2017
2c9e226
warning about cube/page being deprecated #1774
hakimel Feb 1, 2017
cc43ff2
Merge branch 'master' of https://github.com/Bramas/reveal.js into dev
hakimel Feb 1, 2017
8a0dca2
Merge branch 'issue-1324' of https://github.com/mojavelinux/reveal.js…
hakimel Feb 2, 2017
9f99ac8
adjust comment for display config value #1325
hakimel Feb 2, 2017
bede9a2
added toggleHelp function
Frazer Feb 5, 2017
2a1303f
added override parameter to toggleHelp function
Frazer Feb 7, 2017
adc3261
update deserialize regex to work with decimals
hakimel Feb 8, 2017
1749f0d
Merge pull request #1816 from Frazer/patch-1
hakimel Feb 9, 2017
5ad66f3
docs for #1816 and remove showHelp
hakimel Feb 9, 2017
909efab
fix readme conflict
hakimel Feb 14, 2017
313a23b
merge autoplay conflict #1771
hakimel Feb 14, 2017
bef8109
Merge branch 'master' of github.com:hakimel/reveal.js into dev
hakimel Feb 15, 2017
fa70a7a
phantom export throws error if reveal.js isn't present
hakimel Feb 15, 2017
1cee899
fix overview rendering issues in latest chrome #1649
hakimel Feb 17, 2017
da23d68
allow configuration of which view slide number appears on - fixes #1791
malcomio Feb 17, 2017
95bca84
correct config name in README
malcomio Feb 17, 2017
5565d08
note about deploying multiplex server with now #1830
hakimel Feb 20, 2017
8f7e4bf
Merge branch 'slidenum' of https://github.com/malcomio/reveal.js into…
hakimel Feb 20, 2017
b143e59
tweaks to showSlideNumber config #1833
hakimel Feb 20, 2017
7e6fb9e
avoid npe on iframe postMessage
hakimel Mar 14, 2017
9a7c7ce
print-pdf using callback iso timer
riezebosch Mar 14, 2017
34f3773
print-pdf layout slide contents to fit stretch elements
riezebosch Mar 14, 2017
d9dd9a9
Fix video background autoplay on iOS
astone13 Mar 18, 2017
a0a3b4f
add autoPlayMedia config option, overrides individual autoplay settings
hakimel Mar 23, 2017
3ea7e2f
allow fullscreen for background iframes
hakimel Mar 30, 2017
2584a6d
new cli and in-browser pdf printing compatible fix for #1804
hakimel Apr 4, 2017
c3e96f1
make pdf page height offset configurable
hakimel Apr 4, 2017
9495b64
replace cdn.mathjax.org with cdnjs
christianp Apr 5, 2017
1babc8d
Merge pull request #1866 from christianp/mathjax-cdn
hakimel Apr 7, 2017
8ec5e00
Merge pull request #1843 from riezebosch/pdf-print-callback
hakimel Apr 7, 2017
30f2af0
Merge pull request #1844 from riezebosch/pdf-print-stretch
hakimel Apr 7, 2017
d1d44cf
formatting
hakimel Apr 7, 2017
2289b92
Merge pull request #1851 from astone123/master
hakimel Apr 7, 2017
9bbd5f2
formatting
hakimel Apr 7, 2017
eac3799
clarify meaning of getProgress() value
aspiers Apr 16, 2016
d75afd6
expose getPastSlideCount() via public API
aspiers Apr 16, 2016
40912ac
clarify getTotalSlides() returns the number of slides
aspiers Apr 16, 2016
ef9cbbb
add new getSlides() API
aspiers Apr 16, 2016
eb23e58
Allow popup window access to Reveal API
aspiers Apr 16, 2016
a161aca
extract time display code into new _displayTime() function
aspiers Apr 16, 2016
89b0c5a
use opacity for muted clock elements
aspiers Apr 16, 2016
b1b4ee2
don't mute minutes when hours is unmuted
aspiers Apr 16, 2016
1eada3b
avoid deleting existing classes when muting time elements
aspiers Apr 16, 2016
933eba8
round decreasing timers to mirror increasing timers
aspiers Apr 16, 2016
9c7fda4
don't show negative signs inside minutes/seconds elements
aspiers Apr 16, 2016
921a605
document clock and timer in speaker notes window
aspiers Apr 16, 2016
715cf0b
optionally display pacing advice based on slide timings
aspiers Apr 16, 2016
0c3d89b
minor tweak for #1564
hakimel Apr 21, 2017
8e93a1d
3.5.0
hakimel Apr 26, 2017
fb6a1be
* updated big picture slide
Apr 28, 2017
b138c14
* update big picture svg
Apr 28, 2017
51d582b
* added styles for codelistings
Apr 29, 2017
84a0aff
* added version number to html source
Apr 29, 2017
7524301
* updated status badge
Apr 29, 2017
1f232ba
* bugfix as suggested in https://goo.gl/W1XnSk
Apr 29, 2017
c74eb8a
* changed circle badges in readme
Apr 29, 2017
cafd513
* optimized Dockerfile to leverage docker caching
Apr 29, 2017
e07bcae
* added key ‘v’ to toggle display of GIT sha in upper right corner
Apr 29, 2017
ab912dc
* added PS_VERSION_NUMBER to big picture slide
Apr 29, 2017
9665c5a
* removed unneeded files
Apr 29, 2017
99f8501
* added link to github project on tldr
Apr 29, 2017
e469062
* changed port for k8-service
Apr 29, 2017
2873cb2
wip
Apr 29, 2017
3e863b6
* finetuning deployment
Apr 29, 2017
1c7ab04
debug
Apr 29, 2017
95832dd
* editorial finetuning
Apr 29, 2017
ec500a5
* extended deploy script to update dyndns with public cluster ip address
Apr 29, 2017
9ab5a3c
* added shell scripts for starting and stopping the kubernetes (k8) c…
Apr 29, 2017
3985e7f
* huge commit. The best. No seriously, it’s way to big and it can eas…
Apr 29, 2017
a1d8727
* added seniority
Apr 29, 2017
6f15af4
* extended collaboration slide
Apr 29, 2017
e904248
* added samples for collaboration
Apr 30, 2017
a0b8228
* replaced slide bgnd by collage
Apr 30, 2017
b621f68
* modified collage
Apr 30, 2017
98b546c
* tweakd tldr slide
Apr 30, 2017
6e36c24
* replaced the bgnd image on the collaboration slide - new one has so…
Apr 30, 2017
5e160fe
* ignoring .vscode folder
Apr 30, 2017
f6b33f8
Merge branch 'master' of https://github.com/hakimel/reveal.js into ch…
Apr 30, 2017
8c4365b
* added data-timing values for every slide
Apr 30, 2017
1f59c19
* changed the way how the schema image is built into the slide
May 1, 2017
db839ff
* windows millenium. and why you may never have heard of it
May 1, 2017
3637645
Merge branch 'master' of https://github.com/chriwu/ps-tec-2017 into c…
May 1, 2017
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
Prev Previous commit
Next Next commit
Merge branch 'master' of github.com:hakimel/reveal.js into dev
  • Loading branch information
@hakimel
hakimel committed Feb 15, 2017
commit bef8109506b3aa06d7835661ecd7ec3d35c7c6e0

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.