mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-01-24 14:58:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,156 Commits 38 Branches 157 Tags
create-pull-request/patch-1761845473
Commit Graph

7156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia van Os
96d88bb08c Update CHANGELOG 2024-11-02 22:50:53 +01:00
Sylvia van Os
b502f89da6 Merge pull request #2147 from leaumar/feat/1952-columns 
resolve #1952 custom column count
 2024-11-02 21:47:48 +00:00
Sylvia van Os
d7b8cd7e03 More consistant naming and column edge case bugfix for shortcut picker 2024-11-02 13:45:25 +01:00
Sylvia van Os
61681bdc2b Set default card columns to 4 on big screens 2024-11-01 22:36:12 +01:00
Sylvia van Os
dc65030a63 Padding fixes to ensure the cards scale well without changing text size in LoyaltyCardViewActivity 2024-11-01 22:35:33 +01:00
Sylvia van Os
328c110a97 General cleanups 2024-11-01 22:32:05 +01:00
Sylvia van Os
0b7cd32209 Merge pull request #2152 from CatimaLoyalty/dependabot/gradle/com.android.application-8.7.2 
Bump com.android.application from 8.7.1 to 8.7.2
 2024-11-01 19:25:10 +00:00
Sylvia van Os
b1c0ab74d7 Merge pull request #2151 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2024-11-01 19:25:00 +00:00
Marnes
faee01cde2 implement #1952: better values between portrait and landscape 2024-11-01 18:51:26 +01:00
Marnes
6f456437f7 implement #1952: custom column count 2024-11-01 18:27:41 +01:00
Marnes
1b0fd94a8c misc. linting 2024-11-01 18:27:33 +01:00
dependabot[bot]
268d04841f Bump com.android.application from 8.7.1 to 8.7.2 
Bumps com.android.application from 8.7.1 to 8.7.2.

---
updated-dependencies:
- dependency-name: com.android.application
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-11-01 03:00:22 +00:00
大王叫我来巡山
9408ac5d9f Translated using Weblate (Chinese (Simplified Han script)) 
Currently translated at 100.0% (138 of 138 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/zh_Hans/
 2024-11-01 02:02:45 +01:00
Sylvia van Os
45d2b6206e Merge pull request #2149 from CatimaLoyalty/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.2.0 
Bump androidx.constraintlayout:constraintlayout from 2.1.4 to 2.2.0
 2024-10-31 16:49:45 +00:00
dependabot[bot]
a943fdcc5a Bump androidx.constraintlayout:constraintlayout from 2.1.4 to 2.2.0 
Bumps androidx.constraintlayout:constraintlayout from 2.1.4 to 2.2.0.

---
updated-dependencies:
- dependency-name: androidx.constraintlayout:constraintlayout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-31 02:18:56 +00:00
Sylvia van Os
06e02f0b0f Update fastlane 2024-10-30 19:42:10 +01:00
Sylvia van Os
5b29dc66a9 Merge pull request #2148 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2024-10-30 18:38:23 +00:00
大王叫我来巡山
5187916fd3 Translated using Weblate (Chinese (Simplified Han script)) 
Currently translated at 100.0% (138 of 138 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/zh_Hans/
 2024-10-30 18:10:54 +00:00
Максим Горпиніч
d6e444c6e9 Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (138 of 138 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/uk/
 2024-10-30 18:10:54 +00:00
solokot
59f4ef1091 Translated using Weblate (Russian) 
Currently translated at 100.0% (138 of 138 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/ru/
 2024-10-30 18:10:53 +00:00
B o d o
bab1b3e9df Translated using Weblate (German) 
Currently translated at 100.0% (138 of 138 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/de/
 2024-10-30 18:10:53 +00:00
Kachelkaiser
4e8cbdc93b Translated using Weblate (German) 
Currently translated at 100.0% (138 of 138 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/de/
 2024-10-30 18:10:52 +00:00
Vasilis K
d3e5c5b335 Translated using Weblate (Greek) 
Currently translated at 100.0% (315 of 315 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/el/
 2024-10-30 18:10:51 +00:00
Sylvia van Os
2b4b38ddc6 Merge pull request #2145 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2024-10-29 17:25:47 +00:00
B o d o
d3e6d775e8 Translated using Weblate (German) 
Currently translated at 100.0% (138 of 138 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/de/
 2024-10-29 17:18:28 +00:00
Sylvia van Os
ecf3b57679 Release Catima 2.32.1 v2.32.1 2024-10-29 18:18:09 +01:00
Sylvia van Os
115981ecc6 Merge pull request #2144 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2024-10-29 16:44:32 +00:00
大王叫我来巡山
009f297f59 Translated using Weblate (Chinese (Simplified Han script)) 
Currently translated at 100.0% (137 of 137 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/zh_Hans/
 2024-10-29 16:36:14 +00:00
Максим Горпиніч
f539fb1acf Translated using Weblate (Ukrainian) 
Currently translated at 100.0% (137 of 137 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/uk/
 2024-10-29 16:36:14 +00:00
solokot
297e1e79c2 Translated using Weblate (Russian) 
Currently translated at 100.0% (137 of 137 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/ru/
 2024-10-29 16:36:13 +00:00
B o d o
d8a95d9d48 Translated using Weblate (German) 
Currently translated at 100.0% (137 of 137 strings)

Translation: Catima/Android (Fastlane)
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/de/
 2024-10-29 16:36:13 +00:00
Vasilis K
1d8e87981b Translated using Weblate (Greek) 
Currently translated at 100.0% (315 of 315 strings)

Translation: Catima/Android
Translate-URL: https://hosted.weblate.org/projects/catima/catima/el/
 2024-10-29 16:36:12 +00:00
Sylvia van Os
5c97f9c89a Merge pull request #2143 from CatimaLoyalty/create-pull-request/patch-1730153137 
Update Fastlane changelogs
 2024-10-28 23:03:04 +00:00
TheLastProject
a3b02d775c Update Fastlane changelogs 2024-10-28 22:05:37 +00:00
Sylvia van Os
a83b01b0f4 Update CHANGELOG 2024-10-28 23:05:24 +01:00
Sylvia van Os
4be1d76869 Merge pull request #2142 from CatimaLoyalty/fix/2141 
Fix text wrapping on add dialog
 2024-10-28 22:04:19 +00:00
Sylvia van Os
15a6924894 Fix text wrapping on add dialog 2024-10-28 22:50:55 +01:00
Sylvia van Os
fdeef6504c Release Catima 2.32.0 v2.32.0 2024-10-28 18:38:52 +01:00
Sylvia van Os
00ce3466fd Merge pull request #2138 from CatimaLoyalty/dependabot/github_actions/actions/setup-python-5.3.0 
Bump actions/setup-python from 5.2.0 to 5.3.0
 2024-10-28 06:41:27 +00:00
dependabot[bot]
ee3013499d Bump actions/setup-python from 5.2.0 to 5.3.0 
Bumps [actions/setup-python](https://github.com/actions/setup-python) from 5.2.0 to 5.3.0.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v5.2.0...v5.3.0)

---
updated-dependencies:
- dependency-name: actions/setup-python
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-28 06:32:46 +00:00
Sylvia van Os
0f966d036b Merge pull request #2137 from CatimaLoyalty/dependabot/github_actions/actions/checkout-4.2.2 
Bump actions/checkout from 4.2.1 to 4.2.2
 2024-10-28 06:31:52 +00:00
dependabot[bot]
2c09e625fb Bump actions/checkout from 4.2.1 to 4.2.2 
Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4.2.1...v4.2.2)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-10-28 02:33:10 +00:00
Sylvia van Os
8908796b44 Merge pull request #2136 from CatimaLoyalty/create-pull-request/patch-1730069540 
Update Fastlane changelogs
 2024-10-27 22:52:40 +00:00
TheLastProject
a01fd67565 Update Fastlane changelogs 2024-10-27 22:52:20 +00:00
Sylvia van Os
07fe173487 Update CHANGELOG 2024-10-27 22:52:08 +00:00
Sylvia van Os
e9e63e66a5 Merge pull request #2135 from CatimaLoyalty/fix/2104 
Don't show import cancelled text on import completion
 2024-10-27 22:04:28 +00:00
Sylvia van Os
6cbfb6dd48 Don't show import cancelled text on import completion 2024-10-27 22:51:45 +01:00
Sylvia van Os
e1f4c0a1ca Merge pull request #2132 from weblate/weblate-catima-catima 
Translations update from Hosted Weblate
 2024-10-27 20:29:23 +01:00
Sylvia van Os
5a6b912037 Merge pull request #2134 from CatimaLoyalty/create-pull-request/patch-1730002644 
Update contributors
 2024-10-27 20:28:04 +01:00
Sylvia van Os
996324829d Merge pull request #2133 from obfusk/update-stocard 
update stocard_stores.csv
 2024-10-27 20:25:08 +01:00