Commit graph

3124 commits

Author SHA1 Message Date
slepmog deb288bb94 Merge pull request #1 from zxing/master
Synch this repo with zxing
2015-03-01 21:44:08 +03:00
Sean Owen a6e466e419 Merge pull request #317 from Matrix44/patch-6
Update strings.xml
2015-02-24 11:38:34 +00:00
Sean Owen 8475bf6fd2 Remove system-dependent line separator logic in BitMatrix 2015-02-23 16:08:44 +00:00
Sean Owen 68755c5250 Merge pull request #313 from rospus/patch-1
Fixed little typo and restored Data Matrix instead of italian's literal ...
2015-02-17 19:34:16 +00:00
Alessandro Fanna a1b4461600 Fixed little typo and restored Data Matrix instead of italian's literal translation
Line 80: restitiuta > restituita
Line 100: Matrice dati > Data Matrix (currently in Italy this 2d barcode is known with its english name and shouldn't be translated ;-)
2015-02-17 20:32:51 +01:00
Sean Owen 914de38855 French fix from Guillaume Cottenceau 2015-02-17 09:56:06 +00:00
Sean Owen a443654896 Point apps to 3.2.1-SNAPSHOT 2015-02-15 15:27:24 +00:00
Matrix44 5b665e4134 Update strings.xml
Updated translation. Please do not use automatic translation!

Thanky you,
Laurent
2015-02-15 16:05:17 +01:00
Sean Owen e063996740 Spanish fix from Alejandro Tedin 2015-02-15 13:39:14 +00:00
Sean Owen f8ba81f2ae Merge pull request #312 from ChristianBecker/patch-1
Fixed typo in 3.2.0 release date
2015-02-15 13:38:12 +00:00
Christian Becker a577f5c213 Fixed typo in 3.2.0 release date 2015-02-15 14:37:34 +01:00
Sean Owen e4bb497942 [maven-release-plugin] prepare for next development iteration 2015-02-15 12:48:15 +00:00
Sean Owen adfc4097ad [maven-release-plugin] prepare release zxing-3.2.0 2015-02-15 12:48:10 +00:00
Sean Owen f7605ed040 4.7.3 bug fix : null HistoryManager 2015-02-15 00:02:12 +00:00
Sean Owen bcf8d8396d Merge pull request #309 from Solvoj/master
Minor corrections on Spanish translation (Android)
2015-02-12 20:04:56 +00:00
Miguel E. Hernández Cuervo 5ac949d25a Merge branch 'master' of https://github.com/zxing/zxing 2015-02-12 14:39:37 -05:00
Miguel E. Hernández Cuervo 8dc99203e7 Updated Spanish (Android) 2015-02-12 12:56:42 -05:00
Sean Owen 2399d9913b Update maven android plugin to new groupID 2015-02-12 14:58:04 +00:00
Sean Owen d276d6aef0 Merge pull request #308 from Solvoj/master
A small correction on Spanish translation
2015-02-12 14:42:32 +00:00
Sean Owen 1838823773 Updates for release 3.2.0 2015-02-12 14:41:35 +00:00
Sean Owen 289d3d2999 Updates for 4.7.2 2015-02-12 14:41:17 +00:00
Sean Owen 4eb2896eea Work around enum + proguard + dex problem 2015-02-12 14:41:00 +00:00
Miguel E. Hernández Cuervo 82861cd85d Merge branch 'master' of https://github.com/zxing/zxing 2015-02-12 09:08:25 -05:00
Miguel E. Hernández Cuervo 2c3e04e7ac Corrected Spanish "<history_empty_detail>". 2015-02-12 08:58:43 -05:00
Sean Owen 625d9b77d7 Additional fix for issue #300 (HT micjahn) 2015-02-06 21:39:28 +00:00
Sean Owen 4b02337709 Issue #300 : simplify X12 encodation at end of input stream to fix unlatch issue. HT micjahn 2015-02-04 07:45:35 -06:00
Sean Owen 4c4b782ad9 Credit fakhri626 for Indonesian update 2015-02-01 19:48:28 +00:00
Sean Owen f3c896ad99 Merge pull request #303 from fakhri626/patch-1
Update strings.xml with new Indonesian translations
2015-02-01 19:45:45 +00:00
fakhri626 ef74bb6a2c Update strings.xml 2015-02-01 20:15:02 +07:00
Sean Owen 6a41126e03 Proguard 5.2 2015-01-30 20:36:20 +00:00
Sean Owen 894ab95ea0 Closes issue #302 : incorrectly remembers state from Intent after processing 2015-01-30 20:35:37 +00:00
Sean Owen c02bf4ca8e Fix javadoc 8 error 2015-01-30 18:18:32 +00:00
Sean Owen 3ef50066db Remove explicit Central ref; move jarsigner config to pluginManagement 2015-01-30 17:11:07 +00:00
Sean Owen 563294b36e Fix unescaped quote in new translation and make translator escape quotes going forward 2015-01-30 17:08:37 +00:00
Sean Owen 9c4b8ed860 Update documentation of exported CSV format 2015-01-25 10:35:41 +00:00
Sean Owen 88c8f78a4f Follow up with translations for #296 2015-01-24 11:10:52 +00:00
Sean Owen 31f551e78f Update plugins and generates hashes in build 2015-01-24 10:55:19 +00:00
Sean Owen 500fe2f68f Merge pull request #296 from MicheleMas/master
Added the ability to disable history saving
2015-01-24 11:54:01 +01:00
MicheleMas f244a29c49 The history preference is now loaded at construction time 2015-01-23 15:12:11 +01:00
MicheleMas b783feae47 Fixed a typo in the IT strings.xml 2015-01-23 11:54:40 +01:00
MicheleMas 7c79a96bb0 Now history can be disabled 2015-01-23 11:40:25 +01:00
Sean Owen 71d83953bd Merge pull request #290 from shifucun/master
Fix PDF417 numeric encoding grouping index check
2015-01-16 04:33:51 +00:00
Bo Xu cfeb6758db Fix PDF417 numeric encoding grouping index check 2015-01-15 12:01:49 -08:00
Sean Owen bb8f6f84a2 Add notes on newer modules 2015-01-11 16:20:01 +00:00
Sean Owen aa341a9f39 Update note on jruby 2015-01-11 16:18:32 +00:00
Sean Owen 0fc1a267c0 Tiny fixes from coverity; fix SuppressWarnings for deprecation; just one Java 7 build now 2015-01-11 16:15:14 +00:00
Sean Owen 61f7f9f196 Update plugins, deps 2015-01-08 09:53:32 +00:00
Sean Owen b1dabda5cf Introduce NO_REQUESTED_CAMERA 2015-01-08 09:52:44 +00:00
Sean Owen ccdaf97e1b Merge pull request #283 from mertemin/patch-1
Removing unnecessary code from CameraManager
2015-01-08 09:49:51 +00:00
Mert Emin Kalender 8846890006 Remove unused open function from OpenCameraInterface 2015-01-08 00:16:44 -08:00