mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-26 07:48:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
692 Commits 38 Branches 157 Tags
e61d29417cbd2cb577ba0a248f7b10d9580f6187
Commit Graph

328 Commits

Author SHA1 Message Date
Sylvia van Os
1bda5410d8 Fix max db version 2020-11-06 20:17:57 +01:00
Sylvia van Os
4bbeb27714 Feature/groups (#71) 
* Basic group management

* Assign cards to groups

* Fix lint

* Fix findbugs 'dodgy code'

* Group name as unique key

* More group tests

* Import/export groups

* Implement group renaming and deleting

* Fix findBugs

* Fix chip marking in edit activity

* Group import/export tests

* Fix some state bugs

* Some last fixes

* Remove redundant if statement

* Fix findBugs

* Deduplicate code

* Cleanup

* Fix groups not showing up with new card

* Fix capture and enter button touching

* Fix dialog button look
 2020-11-06 18:12:06 +01:00
Rose Liverman
1637895866 Fix typo in Import/Export Activity 2020-11-05 22:22:24 -07:00
J. Lavoie
c4f0ab37a9 Translated using Weblate (Italian) 
Currently translated at 99.0% (108 of 109 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2020-11-03 19:26:48 +01:00
J. Lavoie
038def0114 Translated using Weblate (French) 
Currently translated at 99.0% (108 of 109 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2020-11-03 19:26:48 +01:00
Arshbeer Singh
d897f3b137 Fix Issue #56 2020-11-03 03:31:04 -08:00
Allan Nordhøy
e25d8910c5 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 96.3% (105 of 109 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2020-11-01 14:26:48 +01:00
Artem
3e79001e84 Translated using Weblate (Russian) 
Currently translated at 98.1% (104 of 106 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2020-11-01 14:26:48 +01:00
J. Lavoie
4b432ea94c Translated using Weblate (Italian) 
Currently translated at 100.0% (106 of 106 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2020-11-01 14:26:48 +01:00
J. Lavoie
78752e1cf2 Translated using Weblate (French) 
Currently translated at 100.0% (106 of 106 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2020-11-01 14:26:48 +01:00
J. Lavoie
129608befd Translated using Weblate (German) 
Currently translated at 100.0% (106 of 106 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2020-11-01 14:26:48 +01:00
Sylvia van Os
210a0c564a Add logo 2020-10-29 19:29:39 +01:00
Arshbeer Singh
3a97d6b191 Fix Issue #72 2020-10-27 13:51:20 -07:00
TheLastProject
e8b436a696 Compressed Images 2020-10-26 18:34:16 +00:00
Sylvia van Os
70251d7ea8 Fix app bypassing Android orientation confirmation 2020-10-26 18:48:57 +01:00
Sylvia van Os
fa4ab0ba59 Fix lint 2020-10-25 23:01:39 +01:00
Sylvia van Os
8880e35a7a Fix some merge issues 2020-10-25 18:14:35 +01:00
t351206
c9f3054682 New feature: Favorite cards (#70) 2020-10-25 18:01:26 +01:00
Sylvia van Os
537141fd70 Fix build 2020-10-25 18:00:18 +01:00
Sylvia van Os
f027b1f1b8 Merge remote-tracking branch 'weblate/master' 2020-10-25 17:55:54 +01:00
Allan Nordhøy
44d7c8520d Translated using Weblate (Norwegian Bokmål) 
Currently translated at 96.6% (114 of 118 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2020-10-25 17:26:45 +01:00
J. Lavoie
9d9f73fbba Translated using Weblate (Italian) 
Currently translated at 100.0% (118 of 118 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2020-10-25 17:26:44 +01:00
J. Lavoie
5c74517e13 Translated using Weblate (French) 
Currently translated at 100.0% (118 of 118 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2020-10-25 17:26:44 +01:00
J. Lavoie
ded2f003f6 Translated using Weblate (Spanish) 
Currently translated at 100.0% (118 of 118 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/es/
 2020-10-25 17:26:44 +01:00
Adolfo Jayme Barrientos
fd89caee64 Translated using Weblate (Spanish) 
Currently translated at 100.0% (118 of 118 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/es/
 2020-10-25 17:26:44 +01:00
J. Lavoie
3fd7991663 Translated using Weblate (German) 
Currently translated at 100.0% (118 of 118 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2020-10-25 17:26:43 +01:00
Sylvia van Os
45f266cc93 Cleanup 2020-10-24 14:45:14 +02:00
Sylvia van Os
a29edd90ac Support importing cards shared from loyalty-card-locker 2020-10-24 14:27:33 +02:00
Sylvia van Os
91e2b7acdd Remove no longer existing activity 2020-10-24 14:10:27 +02:00
Sylvia van Os
bcc988ff2c Fix upstream name 2020-10-23 19:25:10 +02:00
Sylvia van Os
344f7a9bc8 Fix unit tests 2020-10-22 20:11:26 +02:00
Sylvia van Os
efae7bda4c Modernize UI with FABs 2020-10-22 19:36:00 +02:00
Sylvia van Os
1cbf90a596 Remove intro 2020-10-22 18:35:33 +02:00
Sylvia van Os
9d4529b06b Initial rebrand 2020-10-22 18:15:07 +02:00
Sylvia van Os
d8776da8b6 Improve export/import dialog messages 2020-06-16 21:47:39 +02:00
Branden Archer
1fccfff338 Update translations from Transifex 2020-03-09 22:16:54 -07:00
Sylvia van Os
694e9b88d7 Fix translation inconsistency breaking Travis build 2020-03-08 20:52:38 +01:00
Sylvia van Os
6ba4804d9a Merge branch 'master' of ssh://github.com/brarcher/loyalty-card-locker into feature/choose_export_location 2020-03-08 18:10:54 +01:00
Branden Archer
3ae496427a Merge branch 'master' into master 2020-02-24 22:51:31 -08:00
Sylvia van Os
68bcd167a2 Merge branch 'master' into fix/fullscreen_leave_uncenter 2020-02-21 15:23:54 +01:00
Sylvia van Os
b7892df877 Merge branch 'master' into feature/choose_export_location 2020-02-21 15:21:50 +01:00
Sergio Paredes
bc63f3163c Merge branch 'master' into master 2020-02-04 15:25:13 +01:00
Branden Archer
b776f90b87 Update translations from Weblate 2020-02-01 16:13:14 -08:00
Sylvia van Os
6877828853 Make linter happy 2020-01-28 21:10:21 +01:00
Sylvia van Os
c94c3cb47e Choose export location 2020-01-28 21:01:33 +01:00
Sylvia van Os
454052638f Fix barcode centering 2020-01-28 17:32:57 +01:00
Sergio Paredes
1b060b26a5 Merge branch 'master' into master 2020-01-28 15:10:02 +01:00
Branden Archer
5ab3a62e16 Merge branch 'master' into fix/dark_mode_unscannable 2020-01-26 22:15:18 -08:00
Sergio
aa2ccac22b #308 Restore test check for barcode type 2020-01-27 00:53:55 +01:00
Sergio
e1f4ed65bb #308 Add missing cast from CharSequence to String 2020-01-27 00:53:55 +01:00