mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-03-02 22:26:24 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,106 Commits 39 Branches 157 Tags
9bcbfc6d81e03aafbee01e174e6fa4874e6b0c32
Commit Graph

612 Commits

Author SHA1 Message Date
Sylvia van Os
9bcbfc6d81 Hide new FAB in shortcut configure view 2021-04-05 12:20:15 +02:00
Sylvia van Os
89a40a789d Small layout fixes 2021-04-05 00:28:02 +02:00
Allan Nordhøy
bb106f185e Translated using Weblate (Norwegian Bokmål) 
Currently translated at 93.8% (137 of 146 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-04-04 14:25:37 +02:00
J. Lavoie
18c4dd4dc9 Translated using Weblate (Italian) 
Currently translated at 100.0% (146 of 146 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2021-04-04 14:25:37 +02:00
J. Lavoie
72672e99c2 Translated using Weblate (French) 
Currently translated at 100.0% (146 of 146 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2021-04-04 14:25:37 +02:00
J. Lavoie
73067d1fe8 Translated using Weblate (German) 
Currently translated at 100.0% (146 of 146 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-04-04 14:25:37 +02:00
Sylvia van Os
310228fb5e Merge branch 'master' into patch-1 2021-04-04 14:24:59 +02:00
Allan Nordhøy
5aef382b68 Spelling: fidme-export 2021-04-03 17:16:02 +00:00
Allan Nordhøy
9fa78a4ea8 Spelling: FidMe 2021-04-03 16:13:12 +00:00
solokot
b06c6bc94d Translated using Weblate (Russian) 
Currently translated at 100.0% (146 of 146 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-04-03 17:39:05 +02:00
Heimen Stoffels
d6c48bdf6e Translated using Weblate (Dutch) 
Currently translated at 100.0% (146 of 146 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-04-03 17:39:05 +02:00
Allan Nordhøy
4d11391f8a Translated using Weblate (Norwegian Bokmål) 
Currently translated at 91.0% (133 of 146 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-04-03 17:39:05 +02:00
Sylvia van Os
8b0490fdf3 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-04-03 17:38:48 +02:00
Sylvia van Os
6ec23d976b Fix grammar mistake 2021-04-03 17:38:19 +02:00
Allan Nordhøy
11ed56ee11 App strings reworked 2 2021-04-03 15:26:53 +00: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
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
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
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
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
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
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
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
solokot
60a172813f 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-25 21:29:58 +01:00
Heimen Stoffels
01025e862a 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-03-25 21:29:58 +01:00
Alessandro Mandelli
7e9c7db813 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-03-25 21:29:57 +01:00
J. Lavoie
d8b121f503 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-03-25 21:29:56 +01:00
J. Lavoie
79a143ebaf 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-03-25 21:29:56 +01:00