mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-18 20:08:01 -05:00
Code Issues Packages Projects Releases Wiki Activity
3,605 Commits 43 Branches 156 Tags
googleAndroidStudioBugReport
Commit Graph

3605 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia van Os
4f9f318960 Merge pull request #264 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-07-11 19:14:42 +02:00
solokot
5dcfcf0ad0 Translated using Weblate (Russian) 
Currently translated at 100.0% (169 of 169 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-07-11 19:10:51 +02:00
Heimen Stoffels
eb809974c4 Translated using Weblate (Dutch) 
Currently translated at 100.0% (169 of 169 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-07-11 19:10:51 +02:00
Allan Nordhøy
815b037be7 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 89.9% (152 of 169 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-07-11 19:10:51 +02:00
Sylvia van Os
3eff150835 Implement flashlight toggle on scan 2021-07-11 19:10:38 +02:00
Sylvia van Os
e191e8bbe6 Update supported type list 2021-07-11 16:16:14 +02:00
Sylvia van Os
5aaf135325 Update screenshots 2021-07-11 16:14:18 +02:00
Sylvia van Os
6fd4f617e5 Fix .csv import fallback 2021-07-11 15:52:22 +02:00
Sylvia van Os
621e4ce162 Merge pull request #259 from comradekingu/patch-6 
App strings reworked 4
 2021-07-11 13:40:31 +02:00
Sylvia van Os
bf07e8935f Merge pull request #262 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-07-11 13:37:41 +02:00
Sylvia van Os
e69d6a453b Consistent phrasing 2021-07-11 13:35:53 +02:00
Gediminas Murauskas
579c2fc640 Translated using Weblate (Lithuanian) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/lt/
 2021-07-11 13:32:42 +02:00
solokot
ba870481dd Translated using Weblate (Russian) 
Currently translated at 100.0% (167 of 167 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-07-11 13:32:42 +02:00
Heimen Stoffels
0c10936e75 Translated using Weblate (Dutch) 
Currently translated at 100.0% (167 of 167 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-07-11 13:32:42 +02:00
Gediminas Murauskas
26cf4250ad Translated using Weblate (Lithuanian) 
Currently translated at 31.7% (53 of 167 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/lt/
 2021-07-11 13:32:42 +02:00
Sylvia van Os
a8d5f38d5c Update privacy policy URL 2021-07-11 13:32:32 +02:00
Sylvia van Os
5e1bac4bcf Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-07-11 13:31:15 +02:00
Sylvia van Os
6df8b7b1ea Generate catima.app share links 2021-07-11 13:31:03 +02:00
Sylvia van Os
964c603405 Only list new format 2021-07-11 12:31:51 +02:00
Sylvia van Os
f64eea6470 Update app/src/main/res/values/strings.xml 
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
 2021-07-11 12:31:22 +02:00
Sylvia van Os
aa97ad49d2 Create CNAME 2021-07-11 12:20:33 +02:00
Sylvia van Os
6221da72f8 Delete CNAME 2021-07-11 05:48:05 +02:00
Sylvia van Os
fe8ec38bf3 Create CNAME 2021-07-11 00:42:20 +02:00
Sylvia van Os
7324353d74 Use location hash instead of query parameters in share URL for increased privacy 2021-07-10 18:33:54 +02:00
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
Allan Nordhøy
8dff8d392e Fixes to import dialogs 2021-07-08 22:07:47 +00:00
Allan Nordhøy
b10d50d5a0 Revert accidental deletion 2021-07-08 22:05:38 +00:00
Allan Nordhøy
0b54d87f4f App strings reworked 4 2021-07-08 20:47:35 +00: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