Commit Graph

8 Commits

Author SHA1 Message Date
Ryan VanderMeulen
879108f360 Merge inbound to m-c. a=merge 2014-07-30 17:13:20 -04:00
J. Ryan Stinnett
2d9af097ce Bug 1044108 - Part 2: Disable QR decoder on Fennec for now. r=paul,gps 2014-07-30 14:32:00 +02:00
J. Ryan Stinnett
9b38b1f5f6 Bug 1044108 - Part 1: Beautify QR decoder, keep only Mozilla and license comments. r=paul 2014-07-30 14:32:00 +02:00
Nathan Froyd
4246e6b6ea Bug 1044162 - part 1 - make EXTRA_{PP_,}JS_MODULES communicate their installation path; r=mshal
This patch makes EXTRA_{PP_,}JS_MODULES similar in functionality to
TESTING_JS_MODULES: we indicate the path relative to
$(FINAL_TARGET)/modules with an appropriate hierarchy of paths.
2014-07-25 13:40:07 -04:00
Mike Hommey
20d181268e Bug 1043820 - Remove PARALLEL_DIRS. r=gps 2014-07-29 08:57:59 +09:00
J. Ryan Stinnett
fc9e25d041 Bug 1021744 - QR Decoder: Leave globals alone, get chrome window. r=paul 2014-07-24 12:16:00 +02:00
J. Ryan Stinnett
d2ecf8ad90 Bug 1004701 - Add QR decoder library. r=paul
Imports the JS QR Code reader library[1].

This library was ported to JavaScript by Lazar Laszlo <lazarsoft@gmail.com>.
The port is made available under the Apache 2.0 license.

This library is based on the Java ZXing project[2] by the ZXing team.  It is
also made available under the Apache 2.0 license.

[1]: https://github.com/jryans/jsqrcode
[2]: https://github.com/zxing/zxing

--HG--
rename : toolkit/devtools/qrcode/encoder/moz.build => toolkit/devtools/qrcode/decoder/moz.build
rename : toolkit/devtools/qrcode/qrcode.js => toolkit/devtools/qrcode/index.js
2014-05-09 12:50:00 -04:00
J. Ryan Stinnett
83b3ba489f Bug 1003620 - Add QR encoder library. r=paul
Imports the QR Code Generator library[1].

The original author is Kazuhiko Arase <arase@d-project.com>.

A copy of the library's MIT license is included.

[1]: https://github.com/kazuhikoarase/qrcode-generator

--HG--
rename : toolkit/devtools/moz.build => toolkit/devtools/qrcode/encoder/moz.build
rename : toolkit/devtools/moz.build => toolkit/devtools/qrcode/moz.build
2014-05-01 13:28:00 +02:00