Sylvia van Os
0547fb9949
Fix typo in merge
2020-02-21 16:22:24 +01:00
Sylvia van Os
d092cbe930
Merge branch 'master' into feature/multiple-barcodes
2020-02-21 15:29:26 +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
Branden Archer
7970bb8a40
Merge pull request #350 from brarcher/pre-v0.27
...
Update for v0.27
2020-01-26 22:41:14 -08:00
Branden Archer
8fa868e99b
Update for v0.27
2020-01-26 22:26:40 -08:00
Branden Archer
77a6cca57d
Merge pull request #329 from TheLastProject/fix/dark_mode_unscannable
...
Fix dark mode scanning issues
2020-01-26 22:21:43 -08:00
Branden Archer
5ab3a62e16
Merge branch 'master' into fix/dark_mode_unscannable
2020-01-26 22:15:18 -08:00
Branden Archer
171ec1cd7e
Merge pull request #348 from TheLastProject/feature/fullscreenBarcode
...
Move barcode to top on tap
2020-01-26 09:25:27 -08:00
Branden Archer
54ee93b0cb
Merge branch 'master' into feature/fullscreenBarcode
2020-01-25 23:41:11 -08:00
Sylvia van Os
fd6c66a86a
Improve documentation
2020-01-21 20:12:15 +01:00
Branden Archer
91044fdc87
Merge pull request #346 from TheLastProject/fix/swap_import_buttons
...
Fix swapped import buttons
2020-01-20 22:38:08 -08:00
Sylvia van Os
3600065ef8
Robolectric crashes if activity recreates
2020-01-19 19:55:08 +01:00
Sylvia van Os
4a7e8b6eba
Reset state on paused to prevent layout glitches
2020-01-19 19:07:06 +01:00
Sylvia van Os
2c12c312e3
Add unit tests
2020-01-19 17:46:50 +01:00
Sylvia van Os
f8943af402
Tap barcode to align to top
2020-01-19 16:45:17 +01:00
Sylvia van Os
3990992f68
Fix swapped import buttons
2020-01-18 13:37:47 +01:00
Branden Archer
d2ac0dacda
Merge pull request #344 from brarcher/pre-v0.26.1
...
Update for v0.26.1
2020-01-09 20:35:20 -08:00
Branden Archer
1a35150677
Update CHANGELOG for v0.26.1
2020-01-09 19:45:08 -08:00
Branden Archer
bf48e394e9
Update app for v0.26.1
2020-01-09 19:45:08 -08:00
Branden Archer
003aba52af
Merge pull request #343 from TheLastProject/fix/sharing_npe
...
Fix NPE when sharing cards without header values
2020-01-09 19:22:00 -08:00
Sylvia van Os
aad98ba55b
Fix NPE when sharing cards without header values
2020-01-09 20:16:54 +01:00
Sylvia van Os
67383a7f10
More tabs into header to save some space
2020-01-06 21:54:52 +01:00
Branden Archer
2b50e503da
Merge pull request #339 from brarcher/pre-v0.26
...
Update for v0.26
2020-01-05 20:14:23 -08:00
Branden Archer
ab4c360c37
Update CHANGELOG for v0.26
2020-01-05 20:06:54 -08:00
Branden Archer
c76580d6be
Update app version to 0.26
2020-01-05 20:06:54 -08:00
Branden Archer
dc8ac6b574
Merge pull request #338 from brarcher/update-translations
...
Update translations
2020-01-05 19:45:12 -08:00
Branden Archer
0c23f25aca
Update translations
...
These were pulled from the Transifex project:
transifex.com/na-243/loyalty-card-locker
2020-01-05 19:35:51 -08:00
Sylvia van Os
5b5ade0edc
Merge branch 'feature/multiple-barcodes' of ssh://github.com/TheLastProject/loyalty-card-locker into feature/multiple-barcodes
2020-01-05 16:09:49 +01:00
Sylvia van Os
efd0f4ef39
Fix tab state loss on rotation
2020-01-05 16:09:21 +01:00
Sylvia van Os
67ada5c027
Merge branch 'master' into feature/multiple-barcodes
2020-01-05 14:47:58 +01:00
Sylvia van Os
520f0da983
Sanitize long and multiline notes
2020-01-05 14:22:15 +01:00
Sylvia van Os
343d710b2a
Swipe between different cards from store
2020-01-05 14:16:13 +01:00
Branden Archer
47b9bbd30d
Merge pull request #336 from TheLastProject/fix/convert_to_barcodeless
...
Fix converting loyalty card to barcodeless
2020-01-04 17:28:39 -08:00
Sylvia van Os
1c71dc964f
Rename barcodecount to card count because barcodeless card support
2020-01-05 00:50:08 +01:00
Sylvia van Os
524d649523
Add new tests
2020-01-05 00:36:44 +01:00
Sylvia van Os
e39593228d
Fix tests
2020-01-05 00:12:12 +01:00
Sylvia van Os
27d718b461
Also add FAB to edit screen
2020-01-05 00:04:50 +01:00
Sylvia van Os
490281bff9
Fix note not reappearing
2020-01-05 00:00:37 +01:00
Sylvia van Os
5030e4c67a
Also add FAB button to main activity
2020-01-04 23:52:36 +01:00
Sylvia van Os
29eac68e3f
Group together multiple barcodes of same store
2020-01-04 23:45:28 +01:00
Sylvia van Os
422501da3e
Make it easy to add extra barcodes
2020-01-04 23:00:23 +01:00
Sylvia van Os
23bd60b476
Add tab to switch between multiple barcodes of same store
2020-01-04 22:26:00 +01:00
Sylvia van Os
ce81d3afd4
Fix as reviewed and add test
2020-01-02 21:15:06 +01:00
Sylvia van Os
cc99af13e4
Fix tests
2020-01-01 19:43:23 +01:00
Sylvia van Os
ccf3d1f3d6
Fix converting loyalty card to barcodeless
...
The LoyaltyCardEditActivity assumes on many places that an empty string
means it doesn't know a value yet. This patch ensures that the
BarcodeSelectorActivity returns a special string so that the
LoyaltyCardEditActivity can distinguish explicitly picking no barcode
from a not yet populated field.
2019-12-31 18:23:45 +01:00
Branden Archer
330ded0b5d
Merge pull request #334 from TheLastProject/fix/sdk28
...
Up targetSdk for Google Play
2019-12-30 19:45:46 -08:00
Sylvia van Os
0bcb0a7ab8
Up targetSdk to 29
2019-12-29 13:01:02 +01:00
Sylvia van Os
403c1fca33
Fix last error Travis reported
2019-12-28 21:25:17 +01:00
Sylvia van Os
ca12f8f914
Fix some of the errors Travis reported
2019-12-28 21:19:00 +01:00
