Permalink
Switch branches/tags
Nothing to show
Commits on Jan 12, 2016
  1. Merge pull request #78 from lboening/patch-1

    jeromeetienne committed Jan 12, 2016
    Add correct punctuation
Commits on Jan 4, 2016
  1. Add correct punctuation

    lboening committed Jan 4, 2016
    Changed dont to don't
Commits on Apr 15, 2015
  1. Merge pull request #69 from PeterDaveHello/patch-1

    jeromeetienne committed Apr 15, 2015
    Use https here to prevent to warning from browser
Commits on Jun 15, 2014
  1. Merge pull request #58 from matcarey/master

    jeromeetienne committed Jun 15, 2014
    #57 Added basic bower config.
  2. Added basic bower config.

    matcarey committed Jun 15, 2014
Commits on Nov 12, 2013
  1. Merge pull request #44 from evgeni/master

    jeromeetienne committed Nov 12, 2013
    set DOCTYPE or IE9 won't render the canvas examples
Commits on Mar 30, 2013
Commits on Jul 18, 2012
  1. Merge pull request #26 from jgoldberg/master

    jeromeetienne committed Jul 18, 2012
    .noConflict() compliance: only reference $, not jQuery, inside the closure
Commits on Jul 17, 2012
Commits on Apr 13, 2012
Commits on Mar 27, 2012
  1. Merge branch 'fix-gray-lines' of https://github.com/ljos/jquery-qrcode

    jeromeetienne committed Mar 27, 2012
    Conflicts:
    	src/jquery.qrcode.js
  2. Merge pull request #19 from ljos/colours

    jeromeetienne committed Mar 27, 2012
    Made it possible to change colour.
Commits on Mar 26, 2012
  1. Fixed gray lines in between blocks.

    ljos committed Mar 26, 2012
    The distance between the highest point the next point can be and the
    lowest point the current can be is calculated and then it fills from
    the closest integer to the current point.
    
    Conflicts:
    
    	src/jquery.qrcode.js
Commits on Feb 13, 2012
Commits on Nov 11, 2011
  1. Merge pull request #12 from tttp/master

    jeromeetienne committed Nov 11, 2011
    Added the doc for size param
  2. with a new line, so markdown formats it properly

    xavier dutoit
    xavier dutoit committed Nov 11, 2011
  3. add the size param example

    xavier dutoit
    xavier dutoit committed Nov 11, 2011
Commits on Sep 29, 2011
Commits on Sep 27, 2011
Commits on Apr 7, 2011
  1. bug fi in deployment

    jeromeetienne committed Apr 7, 2011
    	modified:   Makefile
    	modified:   README.md
  2. README.md improvment

    jeromeetienne committed Apr 7, 2011
  3. better makefile

    jeromeetienne committed Apr 7, 2011
  4. more work

    jeromeetienne committed Apr 7, 2011
  5. more work

    jeromeetienne committed Apr 7, 2011
  6. more work

    jeromeetienne committed Apr 7, 2011
  7. more work

    jeromeetienne committed Apr 7, 2011
  8. first commit

    jeromeetienne committed Apr 7, 2011