Commit Graph
135 Commits
Author SHA1 Message Date
Branden Archer 4580ee8017 Update the "Locker" name to "Keychain"
The icon on the application is no longer a locker, so the
Locker part of the name no longer makes sense. Changing it
to Keychain, as it may make more sense.
2017-01-16 22:44:11 -05:00
Branden Archer d76a6d79d7 Merge pull request #76 from brarcher/select-import-file
Select import file, allow exported file to be sent
2017-01-16 22:30:54 -05:00
Branden Archer b38e035fb6 Allow sending newly exported data
With this change once data is exported it can be sent to
another application.

Translation contributions:
Clonewayx: cs
PanderMusubi: nl
pbeckmann: de
Airon90: it
arno-github : fr

# Conflicts:
#	app/src/main/res/values-it/strings.xml
2017-01-16 22:23:08 -05:00
Branden Archer eeb41376c5 Add ability to select file to import
To date the only way to import a file is to hope the exported file
is in the correct location. To remove this requirement, this change
checks if there are any activities available on the system which
can look in the file system. If there are, new options for
importing data will be available.

In addition, the import/export activity's layout was updated,
adding more explanation.

Translation contributions:
Clonewayx: cs
PanderMusubi: nl
pbeckmann: de
Airon90: it
arno-github : fr
2017-01-16 22:23:08 -05:00
Branden Archer 89f649e5ef Correct TAG name 2017-01-16 22:23:08 -05:00
Branden Archer 4bde8f49b1 update gradle and android plugin 2017-01-16 22:23:08 -05:00
Branden Archer 87c1bbdbf4 Merge pull request #80 from arno-github/arno-github-patch-4
New french strings update
2016-12-10 11:17:16 -05:00
arno-github 7029818789 Update strings.xml 2016-12-10 15:10:41 +01:00
arno-github b64c29bf96 Update french strings 2016-12-10 14:30:13 +01:00
arno-github 24317f4d99 Update strings.xml 2016-12-10 14:26:20 +01:00
arno-github b9d3699038 Update strings.xml 2016-12-10 14:21:19 +01:00
arno-github ed3c9ceb50 Update strings.xml 2016-12-10 14:13:03 +01:00
arno-github 0a938628cb Update strings.xml 2016-12-10 11:53:44 +01:00
arno-github 5720da1581 Merge pull request #1 from arno-github/arno-github-patch-1
Create strings.xml
2016-12-10 11:52:03 +01:00
arno-github 5393903872 Create strings.xml 2016-12-10 11:50:20 +01:00
Branden Archer 8e0a4b978d Merge pull request #75 from betsythefc/master
Icon V2
2016-12-06 21:53:07 -05:00
betsythefc df21c2577d Improved icon with keyring hole 2016-12-05 20:47:52 -08:00
betsythefc a7d5b6fa0c New icon V2 2016-12-05 11:35:40 -08:00
betsythefc b49501e66a Merge remote-tracking branch 'brarcher/master' 2016-12-05 11:30:54 -08:00
Branden Archer 65d0f57358 Merge pull request #62 from techwebpd/patch-1
Lithuanian strings.xml
2016-12-03 11:35:32 -05:00
Branden Archer 927ac61912 Merge branch 'master' into patch-1 2016-12-03 11:29:52 -05:00
Branden Archer fd2b84f318 Remove string that did not need translating. 2016-12-03 11:29:44 -05:00
betsythefc ed4afed538 New Icon 2016-12-02 11:19:18 -08:00
Branden Archer 007427023b Merge pull request #70 from brarcher/changelog
Create CHANGELOG.md
2016-11-22 22:44:13 -05:00
Branden Archer b4ff68eddb Create CHANGELOG.md
Per-request from:
https://github.com/brarcher/loyalty-card-locker/issues/48
2016-11-22 22:35:49 -05:00
Branden Archer 151b81daa7 Merge pull request #69 from brarcher/pre-v0.8
Update for release v0.8
v0.8
2016-11-22 22:21:35 -05:00
Branden Archer c090af1c7d Update for release v0.8 2016-11-22 22:13:29 -05:00
Branden Archer 54a0f89821 Merge pull request #66 from lgasp/patch-1
Small update to italian translation
2016-11-06 15:07:58 -05:00
lgasp f01058d5b8 Update strings.xml 2016-11-05 11:19:48 +01:00
lgasp e01c77681b proposing less confusing trnalsation fo r button
"Scan code" is translated as "salva tessera" that corresponds to English "save card",  that is similar to the button " save" on the same screen.
"Scansione codice"is a more literal, and hopefully more clear, translational
2016-11-04 19:48:54 +01:00
Branden Archer c49ecdca56 Merge pull request #57 from pbeckmann/master
Add a german translation.
2016-11-02 14:37:18 -04:00
Peer Beckmann b7672e5247 Merge branch 'master' into master 2016-11-01 09:50:18 +01:00
techwebpd 71777a74fd Lithuanian strings.xml
lithuanian translation
2016-10-28 16:28:19 +03:00
Branden Archer bebab039d7 Merge pull request #60 from brarcher/screenshots
Simplify screenshots in README.md
2016-09-12 00:10:06 -04:00
Branden Archer 588a573878 Simplify screenshots in README.md 2016-09-11 23:56:32 -04:00
Branden Archer a9bbf8fb65 Merge pull request #59 from brarcher/screenshots
Add screenshots to README.md
2016-08-28 15:44:22 -04:00
Branden Archer 175135d695 Add screenshots to README.md
Requested in:
https://github.com/brarcher/loyalty-card-locker/issues/56
2016-08-28 15:30:23 -04:00
Branden Archer 9f08d07a6a Merge pull request #58 from Clonewayx/patch-1
Czech translation
2016-08-27 13:49:07 -04:00
Clonewayx 07f50b1544 Update and rename strings.xml to strings.xml
remove untranslatable line
2016-08-27 18:04:00 +02:00
Clonewayx 584064a4a2 Czech translation 2016-08-27 06:58:12 +02:00
Peer Beckmann 484f357a82 Add a german translation. 2016-08-25 19:57:55 +02:00
Branden Archer e32b40a024 Merge pull request #55 from brarcher/delete-confirmation
Delete confirmation
2016-07-22 08:04:15 -04:00
Branden Archer 010b88d477 Attempt to force travis builds on non-container infrastructure
There is an issue with running the travis builds. The root
cause is unknown. Attempting to use the non-container
version of the infrastructure to see if the issue persists.
2016-07-22 07:56:23 -04:00
Branden Archer fe0bb7b870 Add a confirmation before deleting card
https://github.com/brarcher/loyalty-card-locker/issues/53
2016-07-22 07:56:22 -04:00
Branden Archer 925f780599 Merge pull request #54 from brarcher/screen-brightness
Adjust brightness to its maximum when displaying a card
2016-07-20 00:04:42 -04:00
Branden Archer 9492d206d9 Adjust brightness to its maximum when displaying a card
Some users have mentioned that a barcode scanner has the best
success when the screen is at its brightest. To enable the best
results, the screen brightness will now be adjusted to its
maximum when displaying a loyalty card.

https://github.com/brarcher/loyalty-card-locker/issues/21
2016-07-19 23:42:36 -04:00
Branden Archer a32415b4d2 Reduce the number of cards tested in import/export tests
There is no need to have so many cards tested in the test, just
a few will do to prove the point.
2016-07-19 23:41:31 -04:00
Branden Archer 5965b82251 Merge pull request #51 from brarcher/pre-v0.7
Update for release v0.7
v0.7
2016-07-14 16:00:10 -04:00
Branden Archer a5650e6382 Update for release v0.7 2016-07-14 15:37:35 -04:00
Branden Archer 6befc99ccc Merge pull request #50 from brarcher/id-to-clipboard
Copy card id to clipboard
2016-07-14 14:56:20 -04:00