Mirrors/Catima-Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2025-12-28 05:14:28 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
670 Commits 40 Branches 150 Tags 52 MiB
feature/pkpass
Commit Graph

670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia van Os
435ad2cfb3 Fix comment 2020-10-24 15:35:25 +02:00
Sylvia van Os
ef675fe6e5 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker into feature/pkpass 2020-10-24 15:07:22 +02: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
799b82e199 Update androidx.appcompat:appcompat to 1.2.0 2020-10-24 14:17:30 +02:00
Sylvia van Os
91e2b7acdd Remove no longer existing activity 2020-10-24 14:10:27 +02:00
Sylvia van Os
e59fc1ea0a Migrate from Loyalty Card Keychain 2020-10-23 20:03:01 +02:00
Sylvia van Os
2926d0d716 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2020-10-23 20:02:01 +02:00
Sylvia van Os
bcc988ff2c Fix upstream name 2020-10-23 19:25:10 +02:00
Sylvia van Os
c03c02c6ea
Fix build status badge 2020-10-23 15:32:48 +02:00
Sylvia van Os
25d2a5ec5d Update screenshots 2020-10-22 20:55:00 +02:00
Sylvia van Os
344f7a9bc8 Fix unit tests 2020-10-22 20:11:26 +02:00
Sylvia van Os
e32993ceb5 Merge branch 'master' of github.com:TheLastProject/loyalty-card-locker 2020-10-22 19:49:48 +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
c471c35b82 Set theme jekyll-theme-cayman 2020-10-21 20:50:23 +02:00
Branden Archer
ccd848c0b8
Merge pull request #368 from TheLastProject/fix/367 
Improve export/import dialog messages
 2020-06-20 20:06:14 -07:00
Sylvia van Os
d8776da8b6 Improve export/import dialog messages 2020-06-16 21:47:39 +02:00
Branden Archer
9de6a2e0da
Merge pull request #363 from brarcher/pre-v0.28 
Update for v0.28
 2020-03-09 22:31:54 -07:00
Branden Archer
9f1d5ad1b3
Update CHANGELOG for v0.28 2020-03-09 22:26:19 -07:00
Branden Archer
290abd9c56
Update for v0.28 2020-03-09 22:22:07 -07:00
Branden Archer
72a04b570a
Merge pull request #362 from brarcher/translations 
Update translations from Transifex
 2020-03-09 22:21:28 -07:00
Branden Archer
1fccfff338 Update translations from Transifex 2020-03-09 22:16:54 -07:00
Branden Archer
d22f8cc5e9
Merge pull request #358 from brarcher/brarcher-readme 
Mention hiatus in README
 2020-03-08 22:32:37 -07:00
Branden Archer
7fc88cd5af
Merge branch 'master' into brarcher-readme 2020-03-08 22:28:16 -07:00
Branden Archer
ab485991f1
Merge pull request #361 from brarcher/brarcher-patch-1 
Delete .travis.yml
 2020-03-08 22:27:34 -07:00
Branden Archer
e579168a03
Delete .travis.yml 2020-03-08 22:17:19 -07:00
Branden Archer
38fc515372
Merge pull request #360 from brarcher/github-action 
Create android.yml
 2020-03-08 22:15:55 -07:00
Branden Archer
aad074e29e
Create android.yml 
This creates a GitHub Action for building and
testing the project, as an attempt to replace
Travis-CI.
 2020-03-08 22:10:54 -07:00
Branden Archer
4321bf5ac8
Merge pull request #352 from TheLastProject/feature/choose_export_location 
Choose export location
 2020-03-08 22:00:51 -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
288531dff0
Mention hiatus in README 2020-02-24 23:07:56 -08:00
Branden Archer
678f126403
Merge pull request #333 from sergiowalls/master 
Display barcode format
 2020-02-24 23:02:41 -08:00
Branden Archer
3ae496427a
Merge branch 'master' into master 2020-02-24 22:51:31 -08:00
Branden Archer
046348612f
Merge pull request #351 from TheLastProject/fix/fullscreen_leave_uncenter 
Fix barcode centering when leaving fullscreen
 2020-02-24 22:33:08 -08:00
Sylvia van Os
fe4dc868aa Fix bad merge 2020-02-22 15:00:58 +01:00
Sylvia van Os
52e32caca3
Fix merge typo 2020-02-21 16:25:24 +01:00
Sylvia van Os
d7ef204d0a
Merge branch 'master' into feature/pkpass 2020-02-21 15:33:12 +01: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
2f562b432c
Merge pull request #357 from brarcher/translations 
Update nb_NO translations from Weblate
 2020-02-01 16:41:19 -08: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
7970bb8a40
Merge pull request #350 from brarcher/pre-v0.27 
Update for v0.27
 2020-01-26 22:41:14 -08:00