Commit graph

  • b4126e664b nitpicks from vlad dni ⚡ 2022-12-05 12:28:26 +01:00
  • 04b67c3551 WALLET outside of loop dni ⚡ 2022-12-05 12:20:37 +01:00
  • 9e60b5374c fake wallet queue issue dni ⚡ 2022-12-05 12:18:59 +01:00
  • f52e8ebfa1
    Merge branch 'lnbits:main' into main Uthpala 2022-12-04 23:31:17 +01:00
  • 4645b8338b added the reverse swap as well Uthpala Heenatigala 2022-12-04 23:29:57 +01:00
  • befdeb040e add expiry to frontend callebtc 2022-12-02 19:05:22 +01:00
  • 32448c4b0c on-the-fly deletion callebtc 2022-12-02 18:55:53 +01:00
  • 167c2ce9f1 make format callebtc 2022-12-02 18:51:52 +01:00
  • 7a6450f032 add expiry to Payment model callebtc 2022-12-02 18:51:18 +01:00
  • 2134b63cea readd comments callebtc 2022-12-02 17:48:47 +01:00
  • 1a98f15d48 remove STARTUP_INVOICE_EXPIRY_CHECK callebtc 2022-12-02 17:39:56 +01:00
  • 4e69924c9c fix datetime conversion callebtc 2022-12-02 17:38:36 +01:00
  • c3e6ed9089 fix for default ad image URL Tiago Vasconcelos 2022-12-02 14:59:02 +00:00
  • fe5e1241bf fix some of Vlad's review comments Tiago Vasconcelos 2022-12-02 14:52:31 +00:00
  • 52cbc7d0f7 make format Tiago Vasconcelos 2022-12-02 14:38:21 +00:00
  • 4410968bf5 enable disable ads and display ads Tiago Vasconcelos 2022-12-02 14:36:09 +00:00
  • 1ff76defc3
    Merge pull request #1168 from motorina0/broadcast_signed_psbt Vlad Stan 2022-12-02 14:06:13 +02:00
  • f7061da361 chore: code clean-up Vlad Stan 2022-12-02 14:02:59 +02:00
  • 88035305c5 fix: hide New Payment button Vlad Stan 2022-12-02 13:46:51 +02:00
  • 8b0c004883 feat: allow external signed PSBT Vlad Stan 2022-12-02 13:41:26 +02:00
  • 3ad0463dfe feat: extract utxos. from PSBT Vlad Stan 2022-12-02 13:40:59 +02:00
  • 79ffbb7bc2 merge main callebtc 2022-12-02 11:23:20 +01:00
  • f7dd533daa make ad space as a CSV formatted string Tiago Vasconcelos 2022-12-01 22:16:55 +00:00
  • 223c980710
    Merge pull request #1167 from lnbits/switchtounisocket Arc 2022-12-01 19:12:48 +00:00
  • 44e12f9d3a updated dev article ben 2022-12-01 19:04:05 +00:00
  • 9a50f4187e isort ben 2022-12-01 18:45:00 +00:00
  • 8ca390e0b0 format ben 2022-12-01 18:41:58 +00:00
  • 694a4e5054 replaced extension specific websockets with the generic websocket ben 2022-12-01 18:31:58 +00:00
  • 949e3f58f8
    Merge pull request #1165 from lnbits/arcbtc-patch-5 Arc 2022-12-01 16:39:55 +00:00
  • 27b641fe6f
    more precise venv python version 3.9 Arc 2022-12-01 16:39:40 +00:00
  • 1f31495634
    Merge pull request #1146 from lnbits/universalwebsocket Arc 2022-12-01 14:55:40 +00:00
  • a220acb583 Removed id, using param instead benarc 2022-12-01 14:41:57 +00:00
  • 4aeb7683e5 Added Response benarc 2022-12-01 13:15:46 +00:00
  • 31b30cacd4 Merge branch 'main' into universalwebsocket benarc 2022-12-01 12:42:01 +00:00
  • 69ef0f2bb1
    Merge pull request #1160 from blackcoffeexbt/bugfix/lnbits-casing Arc 2022-12-01 12:24:27 +00:00
  • 0a47b63597 fix satspay merge error dni ⚡ 2022-12-01 13:05:31 +01:00
  • 59deca7b6f Merge remote-tracking branch 'origin/FinalAdminUI' into FinalAdminUI Tiago Vasconcelos 2022-12-01 11:52:08 +00:00
  • e09b31de7c change ad space inputs Tiago Vasconcelos 2022-12-01 11:51:54 +00:00
  • 803c9349d4 merge main dni ⚡ 2022-12-01 12:37:08 +01:00
  • 4702448ecf fix satspay settings dni ⚡ 2022-12-01 12:28:28 +01:00
  • 04c77be523 bump cashu to 0.5.5 callebtc 2022-11-30 17:44:55 +01:00
  • 86fbd2844d remove debug print callebtc 2022-11-30 16:29:29 +01:00
  • 8dc4e5faff remove codecov callebtc 2022-11-30 16:28:48 +01:00
  • 33eb460d5c restore 7f64f426c2 callebtc 2022-11-30 16:24:13 +01:00
  • f8647aa5d5 Fixed css ben 2022-11-29 22:13:40 +00:00
  • 3966f2602d Revert "Revert "update requirements"" Arc 2022-11-29 11:48:54 +00:00
  • fe379f60d1 Revert "update requirements" Arc 2022-11-29 11:40:40 +00:00
  • b3a86875a2 add missing f-string for SQL ChuckNorrison 2022-11-28 19:02:31 +01:00
  • 11c6137017 add missing f-string for SQL ChuckNorrison 2022-11-28 19:00:43 +01:00
  • 3ed8cb986c Update migrations.py calle 2022-11-19 14:34:13 -06:00
  • 8034c477ab Update migrations.py calle 2022-11-19 14:33:18 -06:00
  • f1418da52f Update migrations.py calle 2022-11-19 14:32:17 -06:00
  • b23b3634f6 fix integer to bigint for extensions ChuckNorrison 2022-11-17 15:44:59 +01:00
  • 3ff14cb71b change status code to 400 on exception Tiago Vasconcelos 2022-11-29 10:28:19 +00:00
  • 872d5a6702 use isinstance, not type callebtc 2022-11-25 15:20:39 +01:00
  • 92435e8492 rewrite values in db callebtc 2022-11-25 15:11:58 +01:00
  • c901a5c69d strip html callebtc 2022-11-25 14:53:03 +01:00
  • 090a449037 update requirements callebtc 2022-11-29 11:52:04 +01:00
  • e3050062f3 fix: show completelink in the absence of webhook Vlad Stan 2022-11-28 17:00:29 +02:00
  • 44759d23ae fix: show completelink in the absence of webhook Vlad Stan 2022-11-28 17:00:07 +02:00
  • 92bb0979d2 feat: add Advanced toggle Vlad Stan 2022-11-28 16:59:47 +02:00
  • 338462af78 feat: move custom css next to the other optional fileds Vlad Stan 2022-11-28 16:40:39 +02:00
  • 5d1d13765d fix: custom css is optional Vlad Stan 2022-11-28 16:37:42 +02:00
  • d8c34690eb fix: merge leftover Vlad Stan 2022-11-28 16:28:09 +02:00
  • 04a5d834d2 fix: merge bug Vlad Stan 2022-11-28 16:17:18 +02:00
  • c1890d4b4c fix: SQL syntax Vlad Stan 2022-11-28 16:11:05 +02:00
  • 431bfd6c09 fix: sql insert Vlad Stan 2022-11-28 16:02:07 +02:00
  • 0dbd91048f fix: rebase clean-up Vlad Stan 2022-11-28 15:52:39 +02:00
  • cc6648df85 fix: quote user column Vlad Stan 2022-11-28 10:53:55 +02:00
  • 798dc73fc8 fix: timestamp does not exist on themes Vlad Stan 2022-11-28 10:53:16 +02:00
  • 317ddec705 isort ben 2022-11-26 15:27:52 +00:00
  • 9d1a8b839d Primary key ben 2022-11-26 15:24:44 +00:00
  • ce41e4b689 formatting ben 2022-11-26 02:11:59 +00:00
  • 2fcf2153c3 adding missing css to public_charge ben 2022-11-26 02:10:47 +00:00
  • 13d2c93007 Added lost return ben 2022-11-26 01:52:30 +00:00
  • fd7a5ca465 resolving conflict errors ben 2022-11-26 01:11:54 +00:00
  • 11b743a905 Trying to fix conflict errors ben 2022-11-26 00:40:13 +00:00
  • 742bbc9112 Added back custom_css ben 2022-11-25 19:43:45 +00:00
  • 003288e19d added back custom css to public page ben 2022-11-25 19:34:13 +00:00
  • 2c2558b9e1 fixed admin check ben 2022-11-25 19:28:45 +00:00
  • 76c2a87577 Auto stash before checking out "HEAD" ben 2022-11-25 19:25:32 +00:00
  • 1a17c04246 removed compact_charge ben 2022-11-25 19:21:42 +00:00
  • 754aa637b9 added back crud ben 2022-11-25 19:18:14 +00:00
  • 08747f1cb6 only allows admins to use custom themes ben 2022-11-25 19:10:18 +00:00
  • cbd939f35b Revert "Merge remote-tracking branch 'origin/fix/strip_html_db' into feature/satspay-server-custom-css" ben 2022-11-25 14:23:15 +00:00
  • 824baa4f2a use isinstance, not type callebtc 2022-11-25 15:20:39 +01:00
  • 2ec150fd13 rewrite values in db callebtc 2022-11-25 15:11:58 +01:00
  • 6d16ac0f0a strip html callebtc 2022-11-25 14:53:03 +01:00
  • 700196a5a9 Now you can have multiple themes ben 2022-11-24 14:54:19 +00:00
  • b2e8bed24c run isort and black Black Coffee 2022-10-25 14:31:34 +01:00
  • 72cf6b9b79 Change user to user_id in satspay settings table and fixed first use bug Black Coffee 2022-10-25 14:30:37 +01:00
  • b51bc492fb Remove console.log from satspay index.html Black Coffee 2022-10-25 14:21:29 +01:00
  • 29a503a0eb Remove theme settings on satspay invoice page and default to blue theme to allow users to skin satspay invoice page more easily Black Coffee 2022-10-25 11:28:49 +01:00
  • 7bc660ea09 Removed unused custom css api call from display.html Black Coffee 2022-10-25 11:04:07 +01:00
  • b34cfd2906 Custom CSS on SatsPay server working!:) Black Coffee 2022-10-24 16:38:56 +01:00
  • 487833f1f2 Settings now save and load and have an insert or delete for new / existing settings Black Coffee 2022-10-24 15:53:43 +01:00
  • a63ec981f1 SatsPay server save custom css settings now working Black Coffee 2022-10-24 15:33:49 +01:00
  • 2b67169512 Added satspay settings migration Black Coffee 2022-10-24 14:05:30 +01:00
  • 2c562b7053 Revert "Extension: Cashu" calle 2022-11-27 18:03:20 +01:00
  • cb042d0bd0 Added websocket checker for switch ben 2022-11-26 22:46:46 +00:00