mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-05-17 21:29:39 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,876 Commits 40 Branches 160 Tags
d8361cc2882993161c8a333aa7649b2a71ac040e
Commit Graph

1876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia van Os
d8361cc288 String improvements 2021-10-16 16:49:47 +02:00
Ankit Tiwari
7028a1f4ca Changes to AlertDialog for entering password 2021-10-16 20:04:24 +05:30
Ankit Tiwari
32d62dd9ba Requested Modifications Made. 2021-10-16 01:34:44 +05:30
Ankit Tiwari
401fc98b4d Passing password to ZipInputStream constructor in importData method of CatimaImporter.java 2021-10-16 00:15:32 +05:30
Ankit Tiwari
993589427b Changed password parameter to a char[] instead of null in ImportExportTest.java line 613 2021-10-15 23:10:38 +05:30
Ankit Tiwari
2390568bdf Added Encrypted Backup feature.The Zip File is Password Protected, which is asked from the user at the time of export immediately on click of Export Button. 2021-10-15 22:51:52 +05:30
Ankit Tiwari
44066e6599 Extracted zip parameter logic into a new function and used it on imageZipParameters as well 2021-10-15 00:22:51 +05:30
Ankit Tiwari
fc9c616869 1.Created new method multipleCardsExportImportPasswordProtected() in ImportExportTest.java \n 2.Added 5th Paramete 2021-10-14 23:23:01 +05:30
Sylvia van Os
d2b2a53109 Merge pull request #485 from TacoTheDank/materialCardview 
Use MaterialCardView
 2021-10-11 21:27:30 +02:00
Sylvia van Os
5107f88998 Merge pull request #483 from TheLastProject/dependabot/gradle/gradle.plugin.com.github.spotbugs.snom-spotbugs-gradle-plugin-4.7.5 
Bump spotbugs-gradle-plugin from 4.7.0 to 4.7.5
 2021-10-11 21:25:48 +02:00
dependabot[bot]
78f2e1698f Bump spotbugs-gradle-plugin from 4.7.0 to 4.7.5 
Bumps spotbugs-gradle-plugin from 4.7.0 to 4.7.5.

---
updated-dependencies:
- dependency-name: gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-11 19:20:03 +00:00
Sylvia van Os
6887cd098b Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-10-11 21:19:15 +02:00
Sylvia van Os
0881d745f5 Fix more spotbugs EI_EXPOSE_REP2 2021-10-11 21:18:22 +02:00
Sylvia van Os
94b3a07f90 Merge pull request #484 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-10-11 20:42:40 +02:00
Joel A
dc280b4023 Translated using Weblate (Swedish) 
Currently translated at 2.2% (2 of 87 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/sv/
 2021-10-11 20:22:20 +02:00
Joel A
edce6d6cd3 Translated using Weblate (Swedish) 
Currently translated at 99.0% (218 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/sv/
 2021-10-11 20:22:20 +02:00
solokot
23dc47a5b9 Translated using Weblate (Russian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/ru/
 2021-10-11 20:22:20 +02:00
Sylvia van Os
683b4f46d9 Fix spotbugs EI_EXPOSE_REP2 2021-10-11 20:22:06 +02:00
Sylvia van Os
ac021bce2a Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-10-11 19:58:26 +02:00
Sylvia van Os
b0c34cbca0 Fix spotbugs RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE 2021-10-11 19:58:09 +02:00
TacoTheDank
4a0c8270ef Replace CardView with MaterialCardView 2021-10-10 22:34:53 -04:00
TacoTheDank
793f1e2f87 Remove unneeded MultiDex 2021-10-10 22:34:40 -04:00
avikkundu
0101b6fa25 added translation in bengali (#480) 2021-10-10 17:04:49 +02:00
Sylvia van Os
47dff850fb Merge pull request #479 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-10-10 12:33:11 +02:00
Oğuz Ersen
fe7503c3ac Translated using Weblate (Turkish) 
Currently translated at 16.0% (14 of 87 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/tr/
 2021-10-10 12:31:11 +02:00
Petr Novák
5df7d8a530 Translated using Weblate (Czech) 
Currently translated at 98.8% (86 of 87 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/cs/
 2021-10-10 12:31:10 +02:00
Sylvia van Os
ee129a3373 Merge pull request #478 from TheLastProject/create-pull-request/patch-1633842920 
Update contributors
 2021-10-10 08:17:10 +02:00
TheLastProject
b979b1fc86 Update contributors 2021-10-10 05:15:20 +00:00
Sylvia van Os
361ebb8b80 Merge pull request #476 from TheLastProject/create-pull-request/patch-1633819619 
Update Fastlane changelogs
 2021-10-10 00:49:36 +02:00
TheLastProject
fd49466e0d Update Fastlane changelogs 2021-10-09 22:46:59 +00:00
Sylvia van Os
bf8f00f877 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker v2.7.3 2021-10-10 00:46:33 +02:00
Sylvia van Os
9f0b7604cb Fix botched migration and release 2.7.3 2021-10-10 00:46:20 +02:00
Sylvia van Os
6d151e7377 Merge pull request #474 from TheLastProject/create-pull-request/patch-1633816331 
Update Fastlane changelogs
 2021-10-10 00:02:54 +02:00
TheLastProject
6ecc94526e Update Fastlane changelogs 2021-10-09 21:52:10 +00:00
Sylvia van Os
1462911ffa Fix regression and release 2.7.2 v2.7.2 2021-10-09 23:50:57 +02:00
Sylvia van Os
952f7a933b Merge pull request #471 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-10-09 21:12:21 +02:00
109247019824
b76c4ef352 Translated using Weblate (Bulgarian) 
Currently translated at 4.7% (4 of 85 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/bg/
 2021-10-09 21:04:49 +02:00
Sylvia van Os
48048cdb82 Merge pull request #468 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-10-08 18:56:48 +02:00
Michael Gangolf
a555f1c41b Translated using Weblate (German) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/de/
 2021-10-08 17:30:09 +02:00
Sylvia van Os
2ab7ebb2c0 Merge pull request #466 from weblate/weblate-catima-catima 
Translations update from Weblate
 2021-10-08 09:22:00 +02:00
Oğuz Ersen
e2b0113687 Translated using Weblate (Turkish) 
Currently translated at 14.1% (12 of 85 strings)

Translation: Catima/Fastlane
Translate-URL: https://hosted.weblate.org/projects/catima/fastlane/tr/
 2021-10-08 07:04:26 +02:00
Heimen Stoffels
dc7e9b541a Translated using Weblate (Dutch) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nl/
 2021-10-08 07:04:26 +02:00
Allan Nordhøy
b44ef7dfc0 Translated using Weblate (Norwegian Bokmål) 
Currently translated at 99.5% (219 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/nb_NO/
 2021-10-08 07:04:25 +02:00
Gediminas Murauskas
4d1f4a64fa Translated using Weblate (Lithuanian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Catima/Catima
Translate-URL: https://hosted.weblate.org/projects/catima/catima/lt/
 2021-10-08 07:04:24 +02:00
Sylvia van Os
fd7e6e4993 Release Catima 2.7.1 v2.7.1 2021-10-07 20:04:19 +02:00
Sylvia van Os
b749c79a81 Merge pull request #464 from TheLastProject/create-pull-request/patch-1633550408 
Update Fastlane changelogs
 2021-10-06 22:01:05 +02:00
TheLastProject
5d019a8e5b Update Fastlane changelogs 2021-10-06 20:00:07 +00:00
Sylvia van Os
4e203aebfe Improve search with spaces 2021-10-06 21:59:45 +02:00
Sylvia van Os
fb2bede135 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2021-10-06 19:58:44 +02:00
Sylvia van Os
5a88909cd2 Make spotbugs happy 2021-10-06 19:58:29 +02:00