summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2015-03-18Merge pull request #4 from rehan-vanzyl/update-scriptrehan-vanzyl36-437/+395
2015-03-18Merge pull request #3 from rehan-vanzyl/encode-cleanuprehan-vanzyl10-202/+1
2015-03-18Remove unused importsRehan van Zyl2-20/+18
2015-03-18Change update.rb script to reflect the removed encode & help activitiesRehan van Zyl34-421/+381
2015-03-18Move modified Intents.java to src/Rehan van Zyl1-2/+2
2015-03-18Remove unused intent variablesRehan van Zyl2-138/+0
2015-03-18Remove encode activity related code from other modulesRehan van Zyl8-64/+1
2015-03-17Merge pull request #2 from rehan-vanzyl/remove-encode-activityrehan-vanzyl28-2639/+0
2015-03-17Merge pull request #1 from rehan-vanzyl/remove-help-activityrehan-vanzyl40-538/+0
2015-03-17Merge branch 'remove-help-activity' into remove-encode-activityRehan van Zyl32-255/+0
2015-03-17Remove assets used by HelpActivityRehan van Zyl32-255/+0
2015-03-17Remove EncodeActivity related codeRehan van Zyl28-2639/+0
2015-03-17Remove all HelpActivity codeRehan van Zyl8-283/+0
2014-12-20Make bintray credentials optional for development.v2.0.1Ralf Kistner1-9/+11
2014-12-20Update readme.Ralf Kistner2-15/+26
2014-12-20Publish artifacts to bintray.Ralf Kistner7-38/+64
2014-12-20Update build tools and artifact ids.Ralf Kistner3-6/+6
2014-11-11Merge pull request #19 from Alberdi/patch-1Ralf Kistner1-2/+2
2014-11-11Fixed relative links on README.mdAlberdi1-2/+2
2014-11-11Update build tools.Ralf Kistner8-28/+29
2014-09-15Automatic Android SDK download.Ralf Kistner8-60/+12
2014-06-03Use the correct versions in the readme.Ralf Kistner1-3/+3
2014-06-03Release 2.0.0.v2.0.0Ralf Kistner1-2/+2
2014-05-18Add instructions for updating the project.Ralf Kistner1-0/+48
2014-05-18Update changelog.Ralf Kistner1-1/+16
2014-05-18Make custom layouts work again.Ralf Kistner9-168/+419
2014-05-18Don't display ActionBar.Ralf Kistner1-5/+2
2014-05-18Split resources between original and modified.Ralf Kistner55-3332/+471
2014-05-18Split Java source files between modified and unmodified.Ralf Kistner35-157/+879
2014-05-17Update sample project.Ralf Kistner1-0/+1
2014-05-17Update the readme with the latest multi-version changes.Ralf Kistner6-42/+81
2014-05-17IntentIntegrator chooses the version to use based on API version.Ralf Kistner2-26/+53
2014-05-17Add a "complete" barcode scanner library.Ralf Kistner240-0/+18194
2014-05-17Remove some dependencies from the integration module.Ralf Kistner1-2/+0
2014-05-17Fix and ignore some warnings.Ralf Kistner3-0/+2
2014-05-17Update zxing-android to zxing/zxing@081378fe93d985ddeb4ad39ea207164f0181ba47.Ralf Kistner52-1258/+1572
2014-05-17Minor fix for lint warnings.Ralf Kistner2-4/+4
2014-05-17Add clone of zxing-android as zxing-android-legacy.Ralf Kistner109-231/+10169
2014-05-17Move assets to zxing subfolder.Ralf Kistner30-667/+1
2014-05-17Prefix resources with zxing.Ralf Kistner53-4011/+3860
2014-05-17Merge remote-tracking branch 'origin/master' into rewriteRalf Kistner2-1/+6
2014-05-17Use ZXing core 3.0.1.Ralf Kistner1-3/+1
2014-05-17Fix IntentIntegrator to work properly without the support library.Ralf Kistner18-57/+530
2014-05-17Merge pull request #11 from martar/masterRalf Kistner2-1/+6
2014-05-17Adapt IntentIntegrator to match our needs.Ralf Kistner10-512/+212
2014-05-17Add new ZXing IntentIntegrator lib.Ralf Kistner6-1/+637
2014-05-17Explaining the cancel button resource idMarta Rylko1-1/+5
2014-05-17Update to latest build tools.Ralf Kistner3-4/+4
2014-05-17Settign porper result code upon cancelMarta Rylko1-0/+1
2014-05-17Add sample to scan from a Fragment. Fix Readme.Ralf Kistner9-6/+100