Commit Graph

3139 Commits

Author SHA1 Message Date
Lee Salminen
993511bcd4 fix validation check for existing card UID, was preventing all edits of cards. we should validate a bit differently for updates vs. creates 2022-08-29 09:40:35 -06:00
Lee Salminen
a6cf19c29d potential race condition here, hits is dependent on cards to get the card name in hits 2022-08-29 09:33:28 -06:00
dni ⚡
5fecb02b8d
fix typo in view api.py (#933) 2022-08-29 17:32:36 +02:00
Lee Salminen
88210129b7 make refunds work properly 2022-08-29 09:32:13 -06:00
Lee Salminen
7baec1de15 success_action was not defined, does not appear to be necessary for this 2022-08-29 09:05:00 -06:00
Lee Salminen
82904e509d Merge branch 'ext-boltcards-2' of github.com:leesalminen/lnbits-legend into ext-boltcards-2 2022-08-29 08:51:41 -06:00
Lee Salminen
fe83cad7a3 formatting 2022-08-29 08:51:32 -06:00
ben
d4da94e10b Merge remote-tracking branch 'leesalminen/ext-boltcards-2' into ext-boltcards-2 2022-08-29 15:51:32 +01:00
ben
56b4eb4a5e Added "lnurl://" to refund 2022-08-29 15:51:22 +01:00
Lee Salminen
6d9d037c06 add link to play store for bolt card app listing 2022-08-29 08:51:15 -06:00
Lee Salminen
b7c7b28dfc remove v-el:keybtn, was removed in vue v2. unnecessary ref anyways 2022-08-29 08:49:57 -06:00
Lee Salminen
51f9166744 define lnurlLink 2022-08-29 08:49:04 -06:00
ben
1493e73724 Merge remote-tracking branch 'leesalminen/ext-boltcards-2' into ext-boltcards-2 2022-08-29 15:40:31 +01:00
Lee Salminen
8e41f7867e Revert "make format"
This reverts commit 8832d6e4eb.
2022-08-29 08:39:37 -06:00
Lee Salminen
93483f76ab Revert "make copy lnurl to clipboard work"
This reverts commit c8b725830b.
2022-08-29 08:39:30 -06:00
Lee Salminen
e715ff52d2 Revert "link to play store app in qr code dialog"
This reverts commit 7400d7f430.
2022-08-29 08:39:16 -06:00
Lee Salminen
5dd6c0d2f4 Revert "make scan nfc button work"
This reverts commit a8ac90da5c.
2022-08-29 08:39:02 -06:00
Lee Salminen
d7696fdc0f Revert "remove v-el from element, this was removed in Vue v2, ref does not appear to be used anywhere"
This reverts commit c35ae109a4.
2022-08-29 08:38:54 -06:00
Lee Salminen
a086db43ba Revert "do not add lnurlw:// to the string"
This reverts commit 630cc296fb.
2022-08-29 08:38:48 -06:00
ben
d858a3c7cd Merge branch 'bensbits' into ext-boltcards-2 2022-08-29 15:37:55 +01:00
ben
33f9ae9f66 Added some unique checks so only 1 record can be made per card 2022-08-29 15:37:31 +01:00
Lee Salminen
630cc296fb do not add lnurlw:// to the string 2022-08-29 08:22:51 -06:00
Lee Salminen
c35ae109a4 remove v-el from element, this was removed in Vue v2, ref does not appear to be used anywhere 2022-08-29 08:21:47 -06:00
Lee Salminen
a8ac90da5c make scan nfc button work 2022-08-29 08:19:39 -06:00
ben
c0daf8e7b2 Merge branch 'bensbits' into ext-boltcards-2 2022-08-29 15:12:27 +01:00
ben
7ea3830fed Added NFC to get UID 2022-08-29 15:11:25 +01:00
Lee Salminen
7400d7f430 link to play store app in qr code dialog 2022-08-29 07:58:29 -06:00
Lee Salminen
c8b725830b make copy lnurl to clipboard work 2022-08-29 07:55:51 -06:00
Lee Salminen
8832d6e4eb make format 2022-08-29 07:34:56 -06:00
Lee Salminen
b987059386
Merge branch 'lnbits:main' into ext-boltcards-2 2022-08-29 07:33:18 -06:00
ben
59876fc17c Merge branch 'ext-boltcards-2' into bensbits 2022-08-29 14:18:36 +01:00
ben
7bfc0848ef Black/prettier 2022-08-29 14:18:18 +01:00
dni ⚡
88d38f7294
change docker image name for regtest tests (#931) 2022-08-29 10:55:35 +02:00
ben
9e3cd3f00e Merge branch 'bensbits' into ext-boltcards-2 2022-08-28 12:29:45 +01:00
ben
17eeed48f5 Added pretty "add card" button 2022-08-28 12:29:27 +01:00
ben
25697a8b00 Merge branch 'bensbits' into ext-boltcards-2 2022-08-28 12:16:30 +01:00
ben
6e9fd28d28 UI tidy 2022-08-28 12:16:23 +01:00
ben
6f5c35d4d3 Merge branch 'ext-boltcards-2' into bensbits 2022-08-28 11:59:55 +01:00
ben
8cabd7b5a4 withdraws working 2022-08-28 11:59:21 +01:00
ben
cb5c11fae4 Fixed enable 2022-08-28 11:05:26 +01:00
ben
4f920fe563 Merge branch 'bensbits' into ext-boltcards-2 2022-08-28 10:58:54 +01:00
ben
977f9bb8c4 Added enable disable card 2022-08-28 10:58:17 +01:00
ben
77ecc5a1d2 Merge branch 'bensbits' into ext-boltcards-2 2022-08-27 17:26:28 +01:00
ben
20dbd879b1 bug 2022-08-27 17:26:17 +01:00
ben
5ba624761c Merge branch 'ext-boltcards-2' into bensbits 2022-08-27 16:41:16 +01:00
ben
99595ba96b Added refunds 2022-08-27 16:37:31 +01:00
ben
330a026379 Pretty much works 2022-08-26 19:22:03 +01:00
ben
c3870e65e3 Added UID scan for form 2022-08-25 14:17:03 +01:00
ben
4e8766ce08 removed uid for justa card id 2022-08-25 13:07:18 +01:00
ben
59d6b654c5 push before removing uuid 2022-08-24 09:33:38 +01:00