mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-06 14:07:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,278 Commits 42 Branches 155 Tags
c5f0ee3a663d8a0ee01910bbdb9e781f989f751b
Commit Graph

1278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia van Os
c5f0ee3a66 Fix bottom sheet alignment issue 2021-07-10 13:06:00 +02:00
Sylvia van Os
a8b4b25afb Merge pull request #260 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-07-10 05:58:57 +02:00
solokot
9744ede674 Translated using Weblate (Russian) 
Currently translated at 100.0% (166 of 166 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-07-10 05:00:16 +02:00
Heimen Stoffels
43505d427d Translated using Weblate (Dutch) 
Currently translated at 100.0% (166 of 166 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-07-10 05:00:16 +02:00
Allan Nordhøy
65e54c63ef Translated using Weblate (Norwegian Bokmål) 
Currently translated at 90.9% (151 of 166 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-07-10 05:00:15 +02:00
J. Lavoie
31b306d432 Translated using Weblate (Italian) 
Currently translated at 100.0% (166 of 166 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2021-07-10 05:00:15 +02:00
J. Lavoie
25bd1de09d Translated using Weblate (French) 
Currently translated at 100.0% (166 of 166 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-07-10 05:00:15 +02:00
J. Lavoie
c82e0d82a9 Translated using Weblate (German) 
Currently translated at 100.0% (166 of 166 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-07-10 05:00:14 +02:00
Sylvia van Os
6625488d84 Merge pull request #258 from TheLastProject/feature/catimaImportExportZip 
Import and export .csv and images as .zip
 2021-07-09 22:26:13 +02:00
Sylvia van Os
a1f632ace3 Set CharSet 2021-07-09 22:20:00 +02:00
Sylvia van Os
b9ea7fd1ed Create export->import test 2021-07-09 22:08:46 +02:00
Sylvia van Os
a9568d6adb Import and export .csv and images as .zip 2021-07-08 22:27:40 +02:00
Sylvia van Os
18c5aa4707 Support for new Voucher Vault export 2021-07-08 19:59:27 +02:00
Sylvia van Os
f53c61bbec Merge pull request #245 from TheLastProject/feature/StocardImport 
Stocard import
 2021-07-08 19:41:22 +02:00
Sylvia van Os
25c9c67ca2 Make spotBugs happy 2021-07-08 19:37:04 +02:00
Sylvia van Os
2efbf664c9 Finish Stocard importing 2021-07-08 19:29:52 +02:00
Sylvia van Os
44023969a7 Merge pull request #255 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-07-08 01:38:36 +02:00
Allan Nordhøy
0e5216b010 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 90.1% (147 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-07-08 01:33:02 +02:00
Sylvia van Os
f258506936 Merge pull request #253 from TheLastProject/feature/upce 
Add UPC-E support
 2021-07-07 23:19:59 +02:00
Sylvia van Os
8bad342374 Add UPC-E support 2021-07-07 19:14:11 +02:00
Sylvia van Os
476a219bec getOrDefault requires API level 24 2021-07-06 23:36:21 +02:00
Sylvia van Os
24e19e26ba Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker into feature/StocardImport 2021-07-06 23:29:50 +02:00
Sylvia van Os
3cb16ae3e9 Update CHANGELOG 2021-07-06 23:26:50 +02:00
Sylvia van Os
c7ddf957fa Clean up unused imports 2021-07-06 23:25:55 +02:00
Sylvia van Os
0de8cd93ad Ask password when import fails with BadPassword 2021-07-06 23:25:05 +02:00
Sylvia van Os
614e5bac2d Mark Fidme and Stocard as beta 2021-07-06 22:44:02 +02:00
Sylvia van Os
e76bd9363c Make Stocard import work 2021-07-06 21:54:19 +02:00
Sylvia van Os
97c508c920 Stocard import skeleton 2021-07-06 00:20:35 +02:00
Sylvia van Os
0f178c1cac Merge pull request #250 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-07-05 09:03:10 +02:00
String E. Fighter
8eab852e1a Translated using Weblate (German) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/de/
 2021-07-05 08:33:19 +02:00
String E. Fighter
539f8846d8 Translated using Weblate (German) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-07-05 08:33:19 +02:00
Sylvia van Os
fb239b6974 Merge pull request #247 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-07-02 09:36:29 +02:00
J. Lavoie
85b553e17b Translated using Weblate (Finnish) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fi/
 2021-07-02 09:33:32 +02:00
J. Lavoie
f085f1e9e6 Translated using Weblate (Italian) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/it/
 2021-07-02 09:33:32 +02:00
J. Lavoie
56b387c725 Translated using Weblate (German) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/de/
 2021-07-02 09:33:32 +02:00
J. Lavoie
daf0cdaa71 Translated using Weblate (French) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/fr/
 2021-07-02 09:33:31 +02:00
J. Lavoie
6a7bebdbcd Translated using Weblate (Italian) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2021-07-02 09:33:31 +02:00
J. Lavoie
7f72c3bcaf Translated using Weblate (French) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-07-02 09:33:31 +02:00
J. Lavoie
52bff53756 Translated using Weblate (German) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-07-02 09:33:30 +02:00
Sylvia van Os
73743b7f1e Merge pull request #246 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-06-30 07:29:13 +02:00
solokot
acfcd3d2d2 Translated using Weblate (Russian) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-06-30 05:33:04 +02:00
Heimen Stoffels
24e8d12b73 Translated using Weblate (Dutch) 
Currently translated at 100.0% (163 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-06-30 05:33:04 +02:00
Allan Nordhøy
28068dcddc Translated using Weblate (Norwegian Bokmål) 
Currently translated at 90.1% (147 of 163 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-06-30 05:33:03 +02:00
Sylvia van Os
3e5ab76636 Update CHANGELOG 2021-06-29 22:40:36 +02:00
Sylvia van Os
3dceec8ec0 Support for password-protected zip files 2021-06-29 22:40:02 +02:00
Sylvia van Os
0cc409d087 Add Fidme test 2021-06-29 20:02:49 +02:00
Sylvia van Os
346acfa3f5 Fix CHANGELOG 2021-06-28 20:55:04 +02:00
Sylvia van Os
8d48da431e Adding and viewing front/back images (#215) 
* Adding and viewing front/back images

* Fix import and export

* Fix unit tests

* Smaller preview pictures but clickable to make big

* Implement removing image

* Add card photo direct from camera

* Read Exif rotation info from picture taken

* Fix bad copy-paste

* Refactor to use local file system

* Delete card images when deleting card

* Prepare for image-based unit tests in ViewActivityTest
 2021-06-28 20:40:52 +02:00
Sylvia van Os
b913fad847 Merge pull request #243 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-06-22 18:34:37 +02:00
IllusiveMan196
c900642f8e Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/uk/
 2021-06-22 18:33:24 +02:00