Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: horaci/waveformjs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: superdefault/waveformjs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 8 files changed
  • 8 contributors

Commits on Jun 19, 2012

  1. blah

    @leemartin
    leemartin committed Jun 19, 2012
    Configuration menu
    Copy the full SHA
    2baf928 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of heroku.com:waveform 

    Conflicts:
	views/index.haml
    @leemartin
    leemartin committed Jun 19, 2012
    Configuration menu
    Copy the full SHA
    16314ff View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2012

  1. blah

    @leemartin
    leemartin committed Jun 26, 2012
    Configuration menu
    Copy the full SHA
    ab13e46 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of heroku.com:waveform 

    Conflicts:
	views/index.haml
    @leemartin
    leemartin committed Jun 26, 2012
    Configuration menu
    Copy the full SHA
    145cb25 View commit details
    Browse the repository at this point in the history

  3. Removed dot from github link on the left side

    @horaci
    horaci committed Jun 26, 2012
    Configuration menu
    Copy the full SHA
    f3c6f7a View commit details
    Browse the repository at this point in the history

  4. cleaned up layout

    @leemartin
    leemartin committed Jun 26, 2012
    Configuration menu
    Copy the full SHA
    e28bdff View commit details
    Browse the repository at this point in the history

  5. added examples to side nav

    @leemartin
    leemartin committed Jun 26, 2012
    Configuration menu
    Copy the full SHA
    aeaffb8 View commit details
    Browse the repository at this point in the history

  6. fixed nav link

    @leemartin
    leemartin committed Jun 26, 2012
    Configuration menu
    Copy the full SHA
    e91550d View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2012

  1. fixing #update to use interpolate option when passed

    @jwagener
    jwagener committed Jun 27, 2012
    Configuration menu
    Copy the full SHA
    398b401 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of heroku.com:waveform

    @jwagener
    jwagener committed Jun 27, 2012
    Configuration menu
    Copy the full SHA
    87eef4f View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2012

  1. Merge pull request #1 from horaci/patch-1 

    Removed dot from github link on the left side
    @paulosman
    paulosman committed Aug 20, 2012
    Configuration menu
    Copy the full SHA
    d16a888 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2013

  1. Change domain to www.* 

    Fixes #10
    @gerrit
    gerrit committed Jul 29, 2013
    Configuration menu
    Copy the full SHA
    320e5d7 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2013

  1. fixed warning in firefox

    @AaronGhent
    AaronGhent committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    4e264eb View commit details
    Browse the repository at this point in the history

  2. Merge pull request #11 from AaronGhent/master 

    [Firefox] Fixed warning
    @sferik
    sferik committed Aug 28, 2013
    Configuration menu
    Copy the full SHA
    1c08328 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2013

  1. Update rmagick 

    Impossible to install the old version on my computer. Need to install it fix the bug.
    jgoyon committed Nov 13, 2013
    Configuration menu
    Copy the full SHA
    fc9b992 View commit details
    Browse the repository at this point in the history

  2. Replace Memcache (Couchbase memcached) vendor 

    Memcache has been shutdown yesterday and breaks the app.
Memcachier is a memecache vendor available on heroku.  Replace the old vendor by a new one.
 - [Heroku doc](https://devcenter.heroku.com/articles/memcachier#ruby)
 - [Memcachier gem](https://github.com/memcachier/memcachier-gem)
Use memcachier to handle the config.
    jgoyon committed Nov 13, 2013
    Configuration menu
    Copy the full SHA
    c65712c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:soundcloud/waveformjs

    jgoyon committed Nov 13, 2013
    Configuration menu
    Copy the full SHA
    80e761b View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2014

  1. Fix bug in JSONP module 

    dont reassign jsonp variable
generate better unique name
    @gerrit
    gerrit committed Jan 16, 2014
    Configuration menu
    Copy the full SHA
    bd2fc27 View commit details
    Browse the repository at this point in the history

  2. declare Ruby version in Gemfile

    @gerrit
    gerrit committed Jan 16, 2014
    Configuration menu
    Copy the full SHA
    4aefd14 View commit details
    Browse the repository at this point in the history

  3. Version bump

    @gerrit
    gerrit committed Jan 16, 2014
    Configuration menu
    Copy the full SHA
    c14bbd9 View commit details
    Browse the repository at this point in the history
Loading