mirror/Android
1
0 Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-09-20 13:54:48 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,089 Commits 31 Branches 165 Tags
9fa78a4ea85015df08bb74f7359f52ce94f51424
Commit Graph
1089 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Allan Nordhøy 9fa78a4ea8 Spelling: FidMe 2021-04-03 16:13:12 +00:00
Allan Nordhøy 11ed56ee11 App strings reworked 2 2021-04-03 15:26:53 +00:00
Sylvia van Os 4ded73f78e Merge pull request #183 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-04-03 15:15:08 +02:00
J. Lavoie 588f8ef677 Translated using Weblate (Korean) 
Currently translated at 64.8% (94 of 145 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ko/
 2021-04-03 15:12:10 +02:00
solokot 3d70095862 Translated using Weblate (Russian) 
Currently translated at 100.0% (145 of 145 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-04-03 15:12:10 +02:00
J. Lavoie 410309ebd2 Translated using Weblate (Polish) 
Currently translated at 68.2% (99 of 145 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/pl/
 2021-04-03 15:12:10 +02:00
Heimen Stoffels b9e646a25d Translated using Weblate (Dutch) 
Currently translated at 100.0% (145 of 145 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-04-03 15:12:10 +02:00
J. Lavoie 81c1ec9199 Translated using Weblate (Italian) 
Currently translated at 100.0% (145 of 145 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2021-04-03 15:12:10 +02:00
J. Lavoie 4498d08afb Translated using Weblate (French) 
Currently translated at 100.0% (145 of 145 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-04-03 15:12:09 +02:00
J. Lavoie 963789db25 Translated using Weblate (German) 
Currently translated at 100.0% (145 of 145 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-04-03 15:12:09 +02:00
Sylvia van Os 902fbc505d Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-04-03 15:11:54 +02:00
Sylvia van Os 9889678e53 Add note on unsupported barcode type 2021-04-03 15:11:22 +02:00
Sylvia van Os ac551ed93f Remove migration guides as the app now tells you in the import screen 2021-04-03 14:36:09 +02:00
Sylvia van Os ec63931396 Merge pull request #180 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-04-03 10:22:08 +02:00
solokot d29d6ddf4a Translated using Weblate (Russian) 
Currently translated at 100.0% (145 of 145 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-04-03 08:39:48 +02:00
J. Lavoie 38aac76144 Translated using Weblate (Russian) 
Currently translated at 100.0% (145 of 145 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-04-03 08:39:48 +02:00
Sylvia van Os 30de0a8266 Make spotbugs happy 2021-04-01 18:16:04 +02:00
Sylvia van Os 0016b40256 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-04-01 18:01:49 +02:00
Sylvia van Os aa3588dbfe Fix unit tests 2021-04-01 18:01:31 +02:00
Sylvia van Os bf7ddc023d Merge pull request #179 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-04-01 17:49:48 +02:00
solokot e50cf66bca Translated using Weblate (Russian) 
Currently translated at 100.0% (151 of 151 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-04-01 17:48:30 +02:00
Heimen Stoffels 85c30185e8 Translated using Weblate (Dutch) 
Currently translated at 100.0% (151 of 151 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-04-01 17:48:30 +02:00
Sylvia van Os 5bce259445 Simplify font sizing 2021-04-01 17:48:17 +02:00
Sylvia van Os 8504109399 Merge pull request #178 from TacoTheDank/master 
A few miscellaneous improvements
 2021-04-01 14:54:52 +02:00
Sylvia van Os e182857e1b Merge pull request #177 from TheLastProject/feature/differentBarcodeValueThanCardId 
Support setting a different barcode value than card ID
 2021-04-01 14:34:30 +02:00
Sylvia van Os 981c0b9ca6 Support setting a different barcode value than card ID 2021-04-01 13:26:57 +02:00
TacoTheDank 925f62b633 Use FragmentContainerView for SettingsActivity 2021-03-31 22:56:02 -04:00
TacoTheDank cceb1207ae Update libraries 2021-03-31 22:30:55 -04:00
TacoTheDank 2e633b19dc Update gradle plugins, rearrange libraries 2021-03-31 22:23:04 -04:00
TacoTheDank b8b1074a46 Update gradle wrapper 2021-03-31 22:18:57 -04:00
TacoTheDank bea65793f0 Add wrapper validation action, update upload-artifact to v2 2021-03-31 22:18:47 -04:00
Sylvia van Os 252efabdc6 Increase versioncode for forgotten translation update v1.12 2021-03-30 18:51:32 +02:00
Sylvia van Os 018efaeebb Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-03-30 18:46:14 +02:00
Sylvia van Os 56522b42e2 Release 1.12 2021-03-30 18:45:54 +02:00
Sylvia van Os 122a80f29c Merge pull request #176 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-03-29 20:58:07 +02:00
Samantaz Fox 9363a31a77 Translated using Weblate (French) 
Currently translated at 100.0% (148 of 148 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-03-29 20:57:13 +02:00
Sylvia van Os 21f3c58e32 Merge pull request #175 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-03-29 17:43:08 +02:00
solokot 205f7bb59d Translated using Weblate (Russian) 
Currently translated at 100.0% (148 of 148 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-03-29 17:26:59 +02:00
Heimen Stoffels 1cc0f11a5d Translated using Weblate (Dutch) 
Currently translated at 100.0% (148 of 148 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-03-29 17:26:59 +02:00
Sylvia van Os d2168f4d91 Merge pull request #174 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-03-28 15:57:57 +02:00
Sylvia van Os ba46e2a0b8 Fix Weblate's incorrect escaping 2021-03-28 15:33:56 +02:00
solokot 6fb102d9b5 Translated using Weblate (Russian) 
Currently translated at 100.0% (145 of 145 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-03-28 15:32:04 +02:00
J. Lavoie 83b3d5d31c Translated using Weblate (Spanish) 
Currently translated at 86.2% (125 of 145 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/es/
 2021-03-28 15:32:04 +02:00
Sylvia van Os c93b7527ad Merge pull request #173 from TheLastProject/feature/import-local-image 
Added ability to import a barcode from a local image
 2021-03-28 15:31:59 +02:00
Sylvia van Os 07bfc95bf9 Update CHANGELOG 2021-03-28 15:25:23 +02:00
Sylvia van Os d34554ac07 Split up code more 2021-03-28 15:20:54 +02:00
Sylvia van Os 63754798ef Fix error toasts not showing 2021-03-26 19:48:17 +01:00
Sylvia van Os 9ca4b7fbe1 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker into feature/import-local-image 2021-03-25 21:35:28 +01:00
Sylvia van Os 4d6021ad8c Merge pull request #171 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-03-25 21:32:26 +01:00
Alessandro Mandelli f76df0d252 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-03-25 21:29:58 +01:00