mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-02 20:17:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
723 Commits 39 Branches 152 Tags
91c2efbdfc13bb09fe092d48e8b94c1b93fa2d8a
Commit Graph

723 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia van Os
91c2efbdfc Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker into feature/iconFriendlyEditUI 2020-11-10 18:28:56 +01:00
Sylvia van Os
462f77e26f Merge pull request #94 from weblate/weblate-catima-catima 
Translations update from Weblate
 2020-11-10 18:28:17 +01:00
Sylvia van Os
0aa1f8b7dd Translated using Weblate (Dutch) 
Currently translated at 100.0% (115 of 115 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2020-11-10 18:27:07 +01:00
Allan Nordhøy
0f9509c0e5 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 98.2% (113 of 115 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2020-11-10 18:27:07 +01:00
Sylvia van Os
95d497c7bd Fix build 2020-11-10 18:26:54 +01:00
Sylvia van Os
d760fbd3cb Merge pull request #93 from comradekingu/patch-3 
Strings reworked
 2020-11-10 18:00:07 +01:00
Sylvia van Os
ad82492f63 Update app/src/main/res/values/strings.xml 
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
 2020-11-10 17:59:46 +01:00
Allan Nordhøy
e84a23c58e Spelling: Try changing your search 2020-11-10 12:14:17 +00:00
Allan Nordhøy
67cbb34425 Spelling: Didn't find anything 2020-11-10 12:09:16 +00:00
Allan Nordhøy
0c4fed5c50 Spelling: Grouped 2020-11-10 12:03:28 +00:00
Allan Nordhøy
e1a72a948d Requested changes made 2020-11-10 12:01:58 +00:00
Allan Nordhøy
50d9205aef Spelling: Font size for card titles 2020-11-10 09:18:25 +00:00
Allan Nordhøy
9093c88e23 Strings reworked 2020-11-10 09:17:16 +00:00
Sylvia van Os
3c793fe54f Fix logic and unit tests 2020-11-09 22:31:35 +01:00
Sylvia van Os
a8960eb506 Initial edit UI changes 2020-11-09 21:34:29 +01:00
Sylvia van Os
7913e95abf Merge pull request #91 from weblate/weblate-catima-catima 
Translations update from Weblate
 2020-11-09 18:12:21 +01:00
Sylvia van Os
fac7b76798 Translated using Weblate (Dutch) 
Currently translated at 100.0% (115 of 115 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2020-11-09 18:10:03 +01:00
mondstern
aa9c4b81b4 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 99.1% (114 of 115 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2020-11-09 18:10:03 +01:00
J. Lavoie
5b3fc845f9 Translated using Weblate (Italian) 
Currently translated at 100.0% (115 of 115 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/it/
 2020-11-09 18:10:03 +01:00
J. Lavoie
c8c7498dc9 Translated using Weblate (French) 
Currently translated at 100.0% (115 of 115 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/fr/
 2020-11-09 18:10:03 +01:00
J. Lavoie
712763969c Translated using Weblate (German) 
Currently translated at 100.0% (115 of 115 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2020-11-09 18:10:03 +01:00
Vancha March
d3f1e0d80b Translated using Weblate (Dutch) 
Currently translated at 100.0% (115 of 115 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2020-11-09 18:10:03 +01:00
mondstern
e8ab92d8c1 Translated using Weblate (Dutch) 
Currently translated at 100.0% (115 of 115 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2020-11-09 18:10:03 +01:00
Sylvia van Os
e0e4ba0012 Fix build 2020-11-08 20:09:26 +01:00
Sylvia van Os
cb4cede2da Rename nb_NO for consistency 2020-11-08 19:23:44 +01:00
Sylvia van Os
7bfdb3a8c3 Merge pull request #87 from weblate/weblate-catima-catima 
Translations update from Weblate
 2020-11-08 05:46:41 +01:00
Allan Nordhøy
c4210da1a5 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 100.0% (3 of 3 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/nb_NO/
 2020-11-08 01:26:54 +01:00
Allan Nordhøy
e082f45333 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 93.9% (108 of 115 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2020-11-08 01:26:54 +01:00
Sylvia van Os
d10c8668b6 Fix crash detected by Google Play Console pre-launch report v1.0.1 2020-11-07 11:34:35 +01:00
Sylvia van Os
a766a25f6a Fix unit test 2020-11-06 21:13:57 +01:00
Sylvia van Os
daa2f4137c Forgot to update CHANGELOG 2020-11-06 20:28:52 +01:00
Sylvia van Os
e61d29417c Release Catima 1.0 v1.0 2020-11-06 20:25:46 +01:00
Sylvia van Os
cc1be04cf7 Update CHANGELOG 2020-11-06 20:19:12 +01:00
Sylvia van Os
e0ed5bd11c Update screenshots 2020-11-06 20:18:28 +01:00
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
Sylvia van Os
c04f2c6785 Use longer en-US title 2020-11-06 18:09:52 +01:00
Sylvia van Os
70fa8ff11c Merge pull request #84 from TangentFoxy/patch-1 
Fix typo in Import/Export Activity
 2020-11-06 09:00:50 +01:00
Rose Liverman
1637895866 Fix typo in Import/Export Activity 2020-11-05 22:22:24 -07:00
Sylvia van Os
6e0d48e42d Update CHANGELOG 2020-11-05 21:38:34 +01:00
Sylvia van Os
9e71a0d86c Fix fastlane 2020-11-05 20:29:37 +01:00
Sylvia van Os
20365e31be Merge pull request #81 from weblate/weblate-catima-catima 
Translations update from Weblate
 2020-11-03 19:28:17 +01:00
J. Lavoie
fb29adbb22 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/
 2020-11-03 19:26:48 +01: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
Sylvia van Os
1f962d88c0 Merge pull request #80 from arshbeerSingh/master 
Fix Issue #56
 2020-11-03 18:12:00 +01:00
Arshbeer Singh
d897f3b137 Fix Issue #56 2020-11-03 03:31:04 -08:00
Sylvia van Os
dba3692521 Merge pull request #79 from IzzySoft/fastlane 
Fastlane: add German summary/description
 2020-11-02 22:37:26 +01:00
Izzy
7ab6ec5f75 Fastlane: add German summary/description 2020-11-02 21:52:00 +01:00
Sylvia van Os
0d6e002324 Fix README 2020-11-02 18:58:05 +01:00