Commit graph

1399 commits

Author SHA1 Message Date
Kukks
fff39d9879 Merge remote-tracking branch 'origin/feature/coinswitch' into feature/coinswitch 2018-12-28 12:34:01 +01:00
Kukks
444e761d41 Merge remote-tracking branch 'btcpayserver/master' into feature/coinswitch 2018-12-28 12:33:55 +01:00
Kukks
d9426d301d Merge remote-tracking branch 'btcpayserver/master' into feature/crowdfund 2018-12-28 12:08:32 +01:00
Kukks
8bcf7109a3 integrate invoice popup 2018-12-28 12:07:15 +01:00
Andrew Camilleri
3effdf0f4d
Update UpdateCoinSwitchSettings.cshtml 2018-12-28 10:49:12 +01:00
Mario Dian
037ff52f4f Fix z-index of search cancel button that overlaps modal confirmation 2018-12-28 11:13:04 +08:00
Kukks
b11f8acba1 wip 2018-12-28 00:10:03 +01:00
Kukks
c7e2f979dd Merge remote-tracking branch 'btcpayserver/master' into feature/crowdfund 2018-12-27 20:19:29 +01:00
Kukks
e97bb9c933 work on vue and signalr fro crowdfund 2018-12-27 20:19:21 +01:00
Mario Dian
f87339f9fa Change CustomTipPercentages type to int[] 2018-12-27 12:57:31 +08:00
Mario Dian
f724db8226 Fix cart table widths 2018-12-27 12:57:31 +08:00
Mario Dian
c7e90cd7df New PoS design 2018-12-27 12:57:31 +08:00
nicolas.dorier
caa6978d80 Save the KeyPath of the WalletKeyPathRoot of the hardware wallet so we don't have to scan for it 2018-12-26 14:04:00 +09:00
nicolas.dorier
af22d6a4e3 Remove preliminary test to know if the ledger can handle the store. If it can't signing will fail anyway. 2018-12-25 19:33:03 +09:00
Kukks
2b84791391 fix raw html 2018-12-22 21:03:43 +01:00
Kukks
9a488c60f2 fix some styling 2018-12-22 17:30:54 +01:00
Kukks
8c00a2359e better layout 2018-12-22 15:43:40 +01:00
Kukks
d1ff34d16d add minimal crowdfund system and UI 2018-12-22 15:02:16 +01:00
Kukks
8e8615dab8 Merge remote-tracking branch 'btcpayserver/master' into feature/crowdfund 2018-12-21 11:51:13 +01:00
nicolas.dorier
ed4de612dd Fix layout if customized to an absolute uri 2018-12-21 13:31:02 +09:00
nicolas.dorier
d4bdd5fd9c Do not use absolute link to link theme files on layout.cshtml 2018-12-21 13:24:01 +09:00
Andrew Camilleri
ae6e1bfd85
Update UpdateCoinSwitchSettings.cshtml 2018-12-20 21:01:10 +01:00
Kukks
6d1f3b73ef update link 2018-12-20 20:40:33 +01:00
Kukks
fc9cd5bdf0 Merge remote-tracking branch 'btcpayserver/master' into feature/coinswitch 2018-12-20 17:57:04 +01:00
nicolas.dorier
9c99ffae57 Lightning charge integration 2018-12-20 22:40:32 +09:00
Andrew Camilleri
30a3a84ec9 fix final issues with integration 2018-12-20 14:33:31 +01:00
nicolas.dorier
e80593fb7b Expose LND's other macaroon if possible 2018-12-20 16:52:04 +09:00
nicolas.dorier
73e280157d Show the gRPC cypher suites for gRPC consumption 2018-12-20 14:16:23 +09:00
Kukks
3e2ff55954 Merge remote-tracking branch 'btcpayserver/master' into feature/coinswitch 2018-12-19 10:41:36 +01:00
nicolas.dorier
94e0048a3b Redirect users to docs.btcpayserver.org on home page 2018-12-19 15:30:10 +09:00
Kukks
40c645e433 coinswitch integration 2018-12-18 20:14:59 +01:00
Kukks
b2e5415a35 coinswitch integration 2018-12-18 20:00:30 +01:00
Kukks
2b4603a234 coinswitch integration 2018-12-18 19:01:58 +01:00
Andrew Camilleri
27bde55f54 work on building the viewmodel for crowdfund 2018-12-18 16:27:03 +01:00
Andrew Camilleri
b5d360594a Merge remote-tracking branch 'origin/master' into feature/crowdfund 2018-12-18 13:29:22 +01:00
nicolas.dorier
83dc95a0a7 Remove dollar sign in textbox 2018-12-15 23:39:45 +09:00
nicolas.dorier
d60889f952 Merge branch 'pos-product-management' of https://github.com/mariodian/btcpayserver into mariodian-pos-product-management 2018-12-15 23:22:07 +09:00
Nicolas Dorier
8c9952973d
Merge pull request #449 from sipsorcery/uxpwdreset
HTML formatting fix for issue #448.
2018-12-15 23:20:09 +09:00
Mario Dian
00673bdb7f Fix product width on smaller screens 2018-12-14 16:16:08 +08:00
Mario Dian
d039890a9b Create js-only product management in PoS 2018-12-14 16:03:02 +08:00
nicolas.dorier
a341d4f800 Show Spark QR Code pairing 2018-12-14 13:12:27 +09:00
2pac1
e3833914b3
Update AddDerivationScheme.cshtml 2018-12-13 16:18:01 +01:00
2pac1
49cdec6961
Update PayButtonEnable.cshtml 2018-12-13 12:26:30 +01:00
Aaron Clauson
3ad1834439 Better fix this as well or the user gets a blank page after the reset. 2018-12-12 22:39:37 +01:00
Aaron Clauson
4b492eae85 HTML formatting fix for issue #448. 2018-12-12 22:29:40 +01:00
nicolas.dorier
991826b686 do not show restricted macaroon 2018-12-12 18:52:01 +09:00
nicolas.dorier
475ea68696 Can attach external spark 2018-12-12 18:19:13 +09:00
Kukks
7fa1b65af0 initial commit 2018-12-11 16:36:25 +01:00
Kukks
c00c95efcf initial coinswitch work 2018-12-11 12:47:38 +01:00
nicolas.dorier
0d06cf63b7 Use enum for invoice status and invoice exception 2018-12-10 21:48:28 +09:00