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 from original #1

Merged
merged 67 commits into from
May 21, 2015
Merged

Update from original #1

merged 67 commits into from
May 21, 2015

Conversation

maxehnert
Copy link
Owner

No description provided.

katspaugh and others added 30 commits March 5, 2015 17:22
update build
671a312
wring nesting in loadMediaElement
f5ff281
bump version; update build
b7c2382
Region now won't oversize the wave element
0a0e675
@katspaugh
Merge pull request #387 from RocAlayo/region-control
56b2344 
Region now won't oversize the wave element
@thijstriemstra
fix broken download url (#390)
ed0362a
@katspaugh
Merge pull request #393 from thijstriemstra/master
addd956 
fix broken download url (#390)
@nmgtn
Fixing equalizer example
33e4c32 
Filter type was not being mapped and set correctly from the EQ array.
Added listener on mouseup to body for region usability improvement.
8e4a583
@thijstriemstra
make sure the element exists before styling it
d205ec9
@katspaugh
Merge pull request #396 from nmgtn/master
09efd28 
Fixing equalizer example
@thijstriemstra
microphone plugin: add destroy method
548b9c7
@thijstriemstra
Merge remote-tracking branch 'upstream/master'
012af0c
@thijstriemstra
check earlier if element exists
881b8fc
@panda-go-panda
clear buffer in mediaelement on empty()
6e67fc3
@panda-go-panda
resolves #414; reset buffer in mediaelement
5d1ca7e
@katspaugh
Merge pull request #406 from thijstriemstra/master
625ffe1 
make sure the element exists before styling it
@katspaugh
Merge pull request #394 from bmat/region-usability
634f84a 
Added listener on mouseup to body for region usability improvement.
@panda-go-panda
resolves #367; restore normalize
6e9cc96
@panda-go-panda
Merge branch 'master' of https://github.com/katspaugh/wavesurfer.js
3af2ac0
@panda-go-panda
resolves #373 and #397; avoid scrollbar setting off the progress canvas
8d8c2bb
@panda-go-panda
resolves #405; region width on retina
0b62942
@panda-go-panda
cc #400; rm unused methods
6e3ecb1
@panda-go-panda
#405 region width on retina
ba9e8e4
@panda-go-panda
undo 881b8fc; let drawer.style throw an error if passed a null element
beacbcc
@panda-go-panda
bump version; update build
bc5f72a
@thijstriemstra
add jshint task (#409
95740c1
@thijstriemstra
also jshint for plugins
40cf2f6
@thijstriemstra
plugins: fix jshint warnings (#409)
b05a17c
@thijstriemstra
add Travis build file (#408)
ca8ff27
thijstriemstra and others added 28 commits April 1, 2015 00:37
@thijstriemstra
spectrogram plugin: fix typos
2d33977
@thijstriemstra
examples: update bootstrap css to latest version
0979564
@katspaugh
Merge pull request #424 from thijstriemstra/master
560798c 
Fixes for #422 and #306
add angular example
ceefcf2
bump version; update build
bebc43e
resolves #421; set finished state correctly
c59289a
resolves #418; cursor should be visible when progressColor is the sam…
d88f77c 
…e as waveColor
resolves #433; use the whole button to play/pause instead of the text…
7acbad3 
… inside
#379 avoid race condition caused by requestAnimationFrame
786ac62
remove obsolete option
8e8c669
add npm start; add grunt dev task; update version and build;
11a6a44
annotations example pixel ratio
df639b1
@thijstriemstra
add test suite (#427)
b9020c5
@thijstriemstra
Merge remote-tracking branch 'upstream/master'
9f28efc
@thijstriemstra
add coveralls (#427)
528e5f9
@thijstriemstra
also jshint tests (#427)
2e7af0c
@katspaugh
Merge pull request #434 from thijstriemstra/master
a58729c 
add start of test suite
subscribe to onaudioprocess only when in the playing state
b5ef291
resolves #441: canvas should have left position specified
a96738c
bump version; update build
905b49c
added isPlaying() method. Updated Readme
3794f4c
adjust isPlaying() method to use negation and adjust Readme
43c3f72
@katspaugh
Merge pull request #446 from Tidal-Wave/master
657810a 
Added isPlaying() method. Updated Readme to reflect new method.
@akreal
spectrogram plugin: fix redraw on audio reload (#381)
676863c
@akreal
spectrogram plugin: fix typo in error message
326c153
@katspaugh
Merge pull request #451 from akreal/master
18a5710 
Spectrogram plugin small update
@dbunker
Check if timeline wrapper node has parent before removing child from it
5aa033f
@katspaugh
Merge pull request #452 from dbunker/timeline_check_dom_parent
f826c16 
Check if timeline wrapper node has parent before removing child from it
maxehnert added a commit that referenced this pull request May 21, 2015
@maxehnert
Merge pull request #1 from katspaugh/master
78d863c 
Update from original
@maxehnert maxehnert merged commit 78d863c into maxehnert:master May 21, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@maxehnert @katspaugh @thijstriemstra @nmgtn @panda-go-panda @akreal @dbunker