Commit Graph

  • 5960f03f9b Merge pull request #82 from brarcher/pre-v0.9 v0.9 Branden Archer 2017-01-16 23:07:37 -05:00
  • b1df0c0baf Update for release v0.9 Branden Archer 2017-01-16 22:53:21 -05:00
  • bfb131c811 Merge pull request #81 from brarcher/keychain Branden Archer 2017-01-16 22:50:36 -05:00
  • 4580ee8017 Update the "Locker" name to "Keychain" Branden Archer 2017-01-16 22:44:11 -05:00
  • d76a6d79d7 Merge pull request #76 from brarcher/select-import-file Branden Archer 2017-01-16 22:30:54 -05:00
  • b38e035fb6 Allow sending newly exported data Branden Archer 2017-01-16 22:06:13 -05:00
  • eeb41376c5 Add ability to select file to import Branden Archer 2017-01-16 22:05:14 -05:00
  • 89f649e5ef Correct TAG name Branden Archer 2016-12-05 22:43:13 -05:00
  • 4bde8f49b1 update gradle and android plugin Branden Archer 2016-12-04 15:17:30 -05:00
  • 87c1bbdbf4 Merge pull request #80 from arno-github/arno-github-patch-4 Branden Archer 2016-12-10 11:17:16 -05:00
  • 7029818789 Update strings.xml arno-github 2016-12-10 15:10:41 +01:00
  • b64c29bf96 Update french strings arno-github 2016-12-10 14:30:13 +01:00
  • 24317f4d99 Update strings.xml arno-github 2016-12-10 14:26:20 +01:00
  • b9d3699038 Update strings.xml arno-github 2016-12-10 14:21:19 +01:00
  • ed3c9ceb50 Update strings.xml arno-github 2016-12-10 14:13:03 +01:00
  • 0a938628cb Update strings.xml arno-github 2016-12-10 11:53:44 +01:00
  • 5720da1581 Merge pull request #1 from arno-github/arno-github-patch-1 arno-github 2016-12-10 11:52:03 +01:00
  • 5393903872 Create strings.xml arno-github 2016-12-10 11:50:20 +01:00
  • 8e0a4b978d Merge pull request #75 from betsythefc/master Branden Archer 2016-12-06 21:53:07 -05:00
  • df21c2577d Improved icon with keyring hole betsythefc 2016-12-05 20:47:52 -08:00
  • a7d5b6fa0c New icon V2 betsythefc 2016-12-05 11:35:40 -08:00
  • b49501e66a Merge remote-tracking branch 'brarcher/master' betsythefc 2016-12-05 11:30:54 -08:00
  • 65d0f57358 Merge pull request #62 from techwebpd/patch-1 Branden Archer 2016-12-03 11:35:32 -05:00
  • 927ac61912 Merge branch 'master' into patch-1 Branden Archer 2016-12-03 11:29:52 -05:00
  • fd2b84f318 Remove string that did not need translating. Branden Archer 2016-12-03 11:29:44 -05:00
  • ed4afed538 New Icon betsythefc 2016-12-02 11:19:18 -08:00
  • 007427023b Merge pull request #70 from brarcher/changelog Branden Archer 2016-11-22 22:44:13 -05:00
  • b4ff68eddb Create CHANGELOG.md Branden Archer 2016-11-22 22:35:49 -05:00
  • 151b81daa7 Merge pull request #69 from brarcher/pre-v0.8 v0.8 Branden Archer 2016-11-22 22:21:35 -05:00
  • c090af1c7d Update for release v0.8 Branden Archer 2016-11-22 22:13:29 -05:00
  • 54a0f89821 Merge pull request #66 from lgasp/patch-1 Branden Archer 2016-11-06 15:07:58 -05:00
  • f01058d5b8 Update strings.xml lgasp 2016-11-05 11:19:48 +01:00
  • e01c77681b proposing less confusing trnalsation fo r button lgasp 2016-11-04 19:48:54 +01:00
  • c49ecdca56 Merge pull request #57 from pbeckmann/master Branden Archer 2016-11-02 14:37:18 -04:00
  • b7672e5247 Merge branch 'master' into master Peer Beckmann 2016-11-01 09:50:18 +01:00
  • 71777a74fd Lithuanian strings.xml techwebpd 2016-10-28 16:28:19 +03:00
  • bebab039d7 Merge pull request #60 from brarcher/screenshots Branden Archer 2016-09-12 00:10:06 -04:00
  • 588a573878 Simplify screenshots in README.md Branden Archer 2016-09-11 23:56:32 -04:00
  • a9bbf8fb65 Merge pull request #59 from brarcher/screenshots Branden Archer 2016-08-28 15:44:22 -04:00
  • 175135d695 Add screenshots to README.md Branden Archer 2016-08-28 15:30:23 -04:00
  • 9f08d07a6a Merge pull request #58 from Clonewayx/patch-1 Branden Archer 2016-08-27 13:49:07 -04:00
  • 07f50b1544 Update and rename strings.xml to strings.xml Clonewayx 2016-08-27 18:04:00 +02:00
  • 584064a4a2 Czech translation Clonewayx 2016-08-27 06:58:12 +02:00
  • 484f357a82 Add a german translation. Peer Beckmann 2016-08-25 19:51:52 +02:00
  • e32b40a024 Merge pull request #55 from brarcher/delete-confirmation Branden Archer 2016-07-22 08:04:15 -04:00
  • 010b88d477 Attempt to force travis builds on non-container infrastructure Branden Archer 2016-07-20 10:53:20 -04:00
  • fe0bb7b870 Add a confirmation before deleting card Branden Archer 2016-07-19 23:47:51 -04:00
  • 925f780599 Merge pull request #54 from brarcher/screen-brightness Branden Archer 2016-07-20 00:04:42 -04:00
  • 9492d206d9 Adjust brightness to its maximum when displaying a card Branden Archer 2016-07-19 23:42:36 -04:00
  • a32415b4d2 Reduce the number of cards tested in import/export tests Branden Archer 2016-07-15 17:53:18 -04:00
  • 5965b82251 Merge pull request #51 from brarcher/pre-v0.7 v0.7 Branden Archer 2016-07-14 16:00:10 -04:00
  • a5650e6382 Update for release v0.7 Branden Archer 2016-07-14 15:37:35 -04:00
  • 6befc99ccc Merge pull request #50 from brarcher/id-to-clipboard Branden Archer 2016-07-14 14:56:20 -04:00
  • 0e124b2550 Allow long-click of card to copy id to clipboard Branden Archer 2016-06-20 21:46:57 -04:00
  • 06a7db0e6d Update Android gradle plugin to 2.1.2 Branden Archer 2016-07-14 09:22:04 -04:00
  • f2f56b06dd Merge pull request #47 from brarcher/back-button Branden Archer 2016-05-26 23:12:22 -04:00
  • 518f339c7a Let pushing back button in menu end import/export activity Branden Archer 2016-05-24 07:52:01 -04:00
  • bbe6ec3741 Merge pull request #46 from brarcher/pre-v0.6 v0.6 Branden Archer 2016-05-23 09:08:06 -04:00
  • 18310fdd25 Update for release v0.6 Branden Archer 2016-05-23 08:52:27 -04:00
  • 19bd64c48c Merge pull request #44 from brarcher/manual-barcode-entry Branden Archer 2016-05-23 08:51:28 -04:00
  • c86819fc74 Allow user to enter a barcode manually Branden Archer 2016-05-23 08:43:52 -04:00
  • 8edc9ce5fd Set barcode image visibility upon completion Branden Archer 2016-05-21 22:52:57 -04:00
  • a3a5a3a8db Remove GlobalLayoutListener when no longer needed Branden Archer 2016-05-21 22:50:57 -04:00
  • 793247a48c Remove unused context Branden Archer 2016-05-21 22:50:21 -04:00
  • 2f86de4c1b Protect against unexpected failures when encoding barcodes Branden Archer 2016-05-21 22:50:06 -04:00
  • 0aa1804258 Allow home button to back out to previous activity Branden Archer 2016-05-21 22:44:40 -04:00
  • 1c8ef34b8a Remove unneeded parentActivtyName attributes Branden Archer 2016-05-21 22:43:54 -04:00
  • 3fd45af7d9 Add dependency on Guava Branden Archer 2016-05-21 22:41:38 -04:00
  • 227af54de7 Merge pull request #43 from brarcher/datamatrix-scaling Branden Archer 2016-05-21 18:46:57 -04:00
  • b89c5eb91c Change padding of card list on main screen Branden Archer 2016-05-21 18:31:31 -04:00
  • cecec15762 Scale barcodes to ImageView's size without filtering Branden Archer 2016-05-21 18:26:21 -04:00
  • dc4a41088c Generate barcode after ImageView size is known Branden Archer 2016-05-21 18:23:08 -04:00
  • b91d4c934a Generate barcode in an AsyncTask Branden Archer 2016-05-21 18:21:53 -04:00
  • b8d4eaacad Merge pull request #42 from brarcher/min-sdk-11 Branden Archer 2016-05-17 18:23:11 -04:00
  • 0a7d5d89cf Reduce min SDK version to 11 Branden Archer 2016-05-17 14:30:40 -04:00
  • 7bbcc52ba6 Remove usage of emulator in Travis-CI Branden Archer 2016-05-16 20:55:37 -04:00
  • 14972c9cc9 Merge pull request #40 from brarcher/pre-v0.5 v0.5 Branden Archer 2016-05-16 21:15:18 -04:00
  • 213d1f64a6 Update for release v0.5 Branden Archer 2016-05-16 21:06:29 -04:00
  • f4f22055fc Merge pull request #38 from brarcher/import-export Branden Archer 2016-05-16 21:00:38 -04:00
  • b99704a3d8 Add an About page Branden Archer 2016-05-16 19:02:48 -04:00
  • 715d726ea3 Update Gradle to 2.10 Branden Archer 2016-05-12 22:56:53 -04:00
  • 8b887a2ee9 Update Gradle Android plugin to 2.0.0 Branden Archer 2016-05-12 22:56:44 -04:00
  • 0248df532a Use gradle wrapper script on Travis-CI Branden Archer 2016-05-12 23:17:02 -04:00
  • 8c83b85cea Request external storage permission if necessary Branden Archer 2016-05-12 23:13:12 -04:00
  • b8f3d891ea Allow user to import/export cards to/from CSV on external storage Branden Archer 2016-05-12 22:56:15 -04:00
  • 20338eb09b Add task for importing/exporting Branden Archer 2016-05-12 22:54:18 -04:00
  • ce272fe7f1 Add ability to import/export cards to/from CSV Branden Archer 2016-05-12 22:53:52 -04:00
  • fb34fb7451 Add call for writing card entry to specific id Branden Archer 2016-05-12 22:51:51 -04:00
  • 7b2d022e92 Merge pull request #35 from brarcher/gradle-wrappers Branden Archer 2016-04-22 09:27:49 -04:00
  • 283858a6e3 Add wrapper scripts and instructions for building Branden Archer 2016-04-22 08:58:11 -04:00
  • d46b3c0810 Merge pull request #31 from brarcher/note-translation Branden Archer 2016-04-12 09:04:54 -04:00
  • a2ff1a9e05 Update Italian translation for note Branden Archer 2016-04-12 08:58:05 -04:00
  • b2e333c379 Merge pull request #30 from brarcher/pre-v0.4 v0.4 Branden Archer 2016-04-09 22:26:30 -04:00
  • 2b058ee766 Update for release v0.4 Branden Archer 2016-04-09 22:21:23 -04:00
  • fc3302219e Merge pull request #29 from brarcher/note-field Branden Archer 2016-04-09 22:18:35 -04:00
  • e0a77e9628 display store and note on card summary view Branden Archer 2016-04-09 22:11:20 -04:00
  • f6f749de1c Use multi exception catch for idential exceptions Branden Archer 2016-03-20 17:57:00 -04:00
  • 61dec10e74 Do not overwrite store field when capturing barcode Branden Archer 2016-03-20 17:56:35 -04:00
  • 9306e1a3d9 Add ability to store a note with loyalty card Branden Archer 2016-03-20 17:56:11 -04:00
  • 62e4fa402c split parts of test into separate methods Branden Archer 2016-03-20 17:46:50 -04:00