mirror/Android
1
0
Fork 0
mirror of https://github.com/CatimaLoyalty/Android.git synced 2026-03-31 13:51:52 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,942 Commits 39 Branches 158 Tags
1fb94de8090e9bd471a9b88a78b73980b6d67a45
Commit Graph

5942 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia van Os
2ef739fb4f Fix typo 2019-12-01 22:55:17 +01:00
Sylvia van Os
bae6f746a1 Another import test 2019-12-01 22:38:31 +01:00
Sylvia van Os
22e8d7f699 Fix linter warning 2019-12-01 20:53:37 +01:00
Sylvia van Os
48a1084c40 Fix typo 2019-12-01 20:46:13 +01:00
Sylvia van Os
3d2ad1693a Tests 2019-12-01 20:42:37 +01:00
Sylvia van Os
28b3aa2018 Add ability to share and receive loyalty cards 2019-12-01 18:22:55 +01:00
Branden Archer
ed4adad087 Merge pull request #320 from TheLastProject/feature/card_filter 
Add loyalty card filter
 2019-11-28 20:22:51 -08:00
Sylvia van Os
5a898b4c4c Address comments 2019-11-28 23:07:27 +01:00
Sylvia van Os
7a78eadabb Remove unneeded imports 2019-11-24 20:08:56 +01:00
Sylvia van Os
d7556b9951 Remove unneeded imports 2019-11-24 19:05:26 +01:00
Sylvia van Os
c936e3c9c0 Switch to SearchView 2019-11-23 20:27:37 +01:00
Sylvia van Os
e33565abdc Add filtering test 2019-11-23 15:27:31 +01:00
Sylvia van Os
30419b5896 Explain focusable change 2019-11-23 14:35:03 +01:00
Sylvia van Os
f0426b98dc Cleanup 2019-11-23 14:29:10 +01:00
Sylvia van Os
bd3d67574e Bump minSdk because of rawQuery usage 2019-11-22 21:03:55 +01:00
Sylvia van Os
52a09056e8 Remove default focus 2019-11-22 20:54:34 +01:00
Sylvia van Os
21a8dc6867 Show warning when no matches 2019-11-22 20:46:06 +01:00
Sylvia van Os
e048fdff59 Fix tests 2019-11-22 20:24:50 +01:00
Sylvia van Os
0a8c85d24c Cleanup 2019-11-22 19:24:03 +01:00
Sylvia van Os
07d938701f Add loyalty card filter 2019-11-22 17:32:40 +01:00
Sylvia van Os
c0c126192f Improve note sizing 
Signed-off-by: Sylvia van Os <sylvia@hackerchick.me>
 2019-11-22 14:00:21 +01:00
Branden Archer
7cb5eba18f Merge pull request #313 from brarcher/pre-v0.25.4 
Update for 0.25.4
v0.25.4 		2019-10-04 23:05:35 -07:00
Branden Archer
134d7fd824 Update for 0.25.4 2019-10-04 22:47:54 -07:00
Branden Archer
1615bc38bd Merge pull request #312 from brarcher/translations 
Update translations
 2019-10-04 22:45:19 -07:00
Branden Archer
3ecdf71331 Update translations 
These were fetched from Transifex
 2019-10-04 22:37:46 -07:00
Branden Archer
66a2cd438c Merge pull request #311 from brarcher/allow-backup 
Allow backups of app data
 2019-10-04 22:35:12 -07:00
Branden Archer
3fdff3c85a Allow backups of app data 
Setting the allowBackup option enables the app to participate
in backup and restore infrastructure.
 2019-10-04 22:27:17 -07:00
Branden Archer
56709d40b5 Merge pull request #297 from brarcher/pre-v0.25.3 
Update for 0.25.3
v0.25.3 		2019-03-02 11:59:43 -08:00
Branden Archer
a8c4c73611 Update CHANGELOG 2019-03-02 11:38:21 -08:00
Branden Archer
31dd0e1de2 Update for 0.25.3 2019-03-02 11:37:09 -08:00
Branden Archer
f51e97fdf7 Merge pull request #296 from brarcher/translations 
Update Russian translations
 2019-03-02 11:36:23 -08:00
Branden Archer
1fcf7101f2 Update Russian translations 2019-03-02 10:19:10 -08:00
Branden Archer
dbb7a4ea62 Merge pull request #292 from brarcher/readme 
Update translation instructions in README
 2019-01-28 19:26:50 -08:00
Branden Archer
a2fa8edcf5 Update translation instructions in README 2019-01-28 07:08:28 -08:00
Branden Archer
fd71eda561 Merge pull request #290 from brarcher/changelog 
Update CHANGELOG
 2019-01-05 16:09:09 -08:00
Branden Archer
058676bb0f Update CHANGELOG 2019-01-05 16:01:54 -08:00
Branden Archer
1fb59979f3 Merge pull request #289 from brarcher/pre-v0.25.2 
Update for v0.25.2
v0.25.2 		2019-01-05 16:00:11 -08:00
Branden Archer
9bde7ce4da Update for v0.25.2 2019-01-05 15:40:48 -08:00
Branden Archer
db3d93e1bc Merge pull request #288 from brarcher/translations 
Update translations
 2019-01-05 15:40:22 -08:00
Branden Archer
4fd7872c87 Update translations 2019-01-05 15:24:47 -08:00
Branden Archer
fc313f0cfa Merge pull request #280 from comradekingu/patch-1 
Norwegian Bokmål translation
 2018-10-19 21:03:00 -07:00
Allan Nordhøy
03cf97cca7 Added self-referencing "about" tag 2018-10-20 03:22:17 +02:00
Allan Nordhøy
a7204eb9d5 Norwegian Bokmål translation 2018-10-19 15:14:37 +02:00
Branden Archer
81d7250306 Merge pull request #275 from brarcher/pre-v0.25.1 
Update for v0.25.1
v0.25.1 		2018-10-14 11:53:02 -07:00
Branden Archer
580025c99e Update for v0.25.1 2018-10-14 11:46:34 -07:00
Branden Archer
d88bede310 Merge pull request #274 from brarcher/translations 
Update translations
 2018-10-14 11:46:06 -07:00
Branden Archer
4c9bc911ad Update translations 2018-10-14 11:39:21 -07:00
Branden Archer
38d6d6ccff Merge pull request #273 from brarcher/fix-manual-barcode 
Fix manual barcode
 2018-10-14 11:38:55 -07:00
Branden Archer
866eaea680 Correct log statement when entering barcode manually 2018-10-14 11:24:42 -07:00
Branden Archer
5619c1c003 Revert "Remove unneeded code" 
The log statement here was misleading. This code is responsible for
receiving a barcode that a user typed in manually.

This reverts commit cafa09a86a.
 2018-10-14 11:24:42 -07:00