Commit graph

101 commits

Author SHA1 Message Date
Ryan Day
33b51576f3 adding contributing guidelines. bump v0.3.0 2015-08-02 05:26:51 -07:00
Ryan Day
35228d901b Merge pull request from spro/master
consistent options handling between draw and drawBitArray
2015-08-02 08:24:49 -04:00
Sean Robertson
954575ba33 consistent options handling between draw and drawBitArray 2015-08-02 02:05:39 -07:00
Ryan Day
c9de04b644 Merge pull request from DaAwesomeP/patch-1
Fix README Code Blocks
2015-05-13 09:34:42 -07:00
DaAwesomeP
4ba88e3ec9 Fix README Code Blocks 2015-05-12 20:47:02 -05:00
Ryan Day
86e48c0378 Merge pull request from sunaiwen/master
add browser field of browserify
2014-11-25 21:55:36 -08:00
sunaiwen
5ecd269518 add browser field of browserify 2014-11-26 11:47:49 +08:00
Ryan Day
6d0d6e915a fixing travis yml 2014-09-19 21:57:12 -07:00
Ryan Day
e9dbcd1022 Merge branch 'master' of github.com:soldair/node-qrcode
Conflicts:
	package.json
2014-09-19 21:55:47 -07:00
Ryan Day
caa7d3b462 Merge pull request from wemakeweb/master
fixed errors.
2014-09-19 21:51:52 -07:00
Sebastian Otto
6b07155ffd changed target version. 2014-09-14 15:10:21 +02:00
Sebastian Otto
f688972244 changed dep version
due to failing build with node v0.11.13
2014-09-14 15:07:12 +02:00
Sebastian Otto
4468820684 fixed errors. 2014-09-14 03:14:13 +02:00
Ryan Day
00e9d20903 bumping canvas version 2014-08-11 14:18:32 -07:00
Ryan Day
e3221800b6 Merge branch 'master' of github.com:soldair/node-qrcode 2014-04-22 13:04:17 -07:00
Ryan Day
a9f8e20c6a bumping for @heartnetkung pull request to expose the canvas 2014-04-22 13:03:54 -07:00
Ryan Day
21e80179cf bumping for @heartnetkung pull request to expose heartnetkung the canvas 2014-04-22 13:02:59 -07:00
Ryan Day
4589e64034 Merge branch 'master' of github.com:soldair/node-qrcode 2014-04-22 13:02:44 -07:00
Ryan Day
1e2326b022 Merge pull request from heartnetkung/master
export the required canvas
2014-04-22 10:50:03 -07:00
heartnetkung
4996db1c50 typo 2014-04-23 00:20:56 +07:00
heartnetkung
af1eddfaee export original canvas to be used with draw method, esp. Canvas.Image 2014-04-23 00:18:49 +07:00
Ryan Day
5a01f6f7c2 bumping version 2014-04-14 18:20:07 -07:00
Ryan Day
6620795614 Merge branch 'master' of github.com:soldair/node-qrcode 2014-04-14 18:19:47 -07:00
Ryan Day
4a39d2c8e2 adding note about byte length and fixing readme 2014-04-14 18:17:53 -07:00
Ryan Day
7efb5b2baa Merge pull request from RG72/patch-1
Return width of Qr code on draw
2014-04-09 20:37:57 -07:00
RG72
bba53a3ed8 Return width of Qr code on draw
Return width of Qr code on draw
2014-04-09 09:12:12 +06:00
Ryan Day
822b6f4bd4 bumping for options fix for qrcode.draw and optional margin thanks @jvanaert 2013-09-28 18:42:25 -07:00
Ryan Day
f5522ac333 Merge pull request from jvanaert/master
pass options object to draw function
2013-09-28 18:29:54 -07:00
Jeroen van Aert
35ba4568f0 allow margin property of 0 2013-09-28 23:07:58 +02:00
Jeroen van Aert
bdfb2e58fc pass options object to draw function 2013-09-28 22:53:15 +02:00
Ryan Day
06f8b95a36 bumping version to 0.2.7 fixes 2013-09-24 17:36:27 -07:00
Ryan Day
ac97515177 figured out another issue qrcoding chinese! 2013-09-24 17:35:36 -07:00
Ryan Day
50fc1eaca1 bumping version 2013-08-27 19:59:28 -07:00
Ryan Day
983fb15664 fixing browserify 2013-08-27 19:59:04 -07:00
Ryan Day
3df9ceaba9 adding support for binary/utf8 strings with bops 2013-08-27 19:36:43 -07:00
Ryan Day
42137965ba bumping version for @nathanoehlman s patch to constrain canvas version 2013-08-06 08:06:25 -07:00
Ryan Day
ae8aba11f2 Merge pull request from nathanoehlman/master
Do not use latest node-canvas version
2013-08-06 08:05:19 -07:00
Nathan Oehlman
dbb6726415 Do not use latest node-canvas version 2013-08-07 00:22:37 +10:00
Ryan Day
5514d6758c Merge pull request from drewp/master
client demo code in readme had some wrong API spellings
2013-04-07 19:45:31 -07:00
Drew Perttula
852003612f client demo code had some wrong API spellings 2013-04-07 17:50:35 -07:00
Ryan Day
ef24897a68 Merge pull request from joemccann/master
Update README to make usage and installation easier for noobs.
2013-04-01 15:30:50 -07:00
Joe McCann
2a1b891dff Final updates to the copy. 2013-03-30 11:23:33 -05:00
Joe McCann
08559fbbe7 Update README to be more readable and using to copy/paste. 2013-03-30 11:16:48 -05:00
Ryan Day
444cae399d Merge pull request from freewil/fix-global-leakage
fix global leakage
2013-01-20 19:45:32 -08:00
freewil
593fa0a666 fix global leakage 2013-01-19 07:43:50 -05:00
Ryan Day
a777a3c1fb Merge branch 'master' of github.com:soldair/node-qrcode 2012-12-29 18:20:00 -08:00
Ryan Day
be6bcd449d exposing errorCorrectLevel through main export. adding support for easy strings. 2012-12-29 18:19:28 -08:00
Ryan Day
1080e1c694 updated readme 2012-12-29 18:19:28 -08:00
Ryan Day
7686bd0286 updating readme 2012-12-29 18:19:28 -08:00
Ryan Day
13b8e71a8e bumping version and adding travis badge 2012-12-29 18:19:28 -08:00