Commit Graph
100 Commits
Author SHA1 Message Date
ben dd90c3a2eb format 2022-12-23 22:47:14 +00:00
ben cd6f4c909f swaps pos id for number 2022-12-23 22:38:19 +00:00
ben dce50105c9 no such column 2022-12-23 15:41:59 +00:00
ben 0ce987a20e await 2022-12-23 15:40:52 +00:00
ben 03846adbfb unsupported type 2022-12-23 15:40:05 +00:00
ben 886070755c hacky lnurlpos bump 2022-12-23 15:35:06 +00:00
ben 604c0a4ee9 Merge remote-tracking branch 'origin/main' into fix/boltcard_errors 2022-12-17 10:01:12 +00:00
ben 940615cb0b Merge branch 'main' into FinalAdminUI 2022-12-16 22:45:54 +00:00
ben 6b69c0f3e4 Fixed theme options
Prop needed to be persisted
2022-12-16 22:44:18 +00:00
ben 475ff47f5b isort 2022-12-14 14:56:04 +00:00
ben 60a01cd89a fomrat 2022-12-14 14:53:09 +00:00
ben 59c6469bd1 generalised tag search 2022-12-14 14:43:41 +00:00
ben 4c3db72afc Added ID 2022-12-14 00:31:09 +00:00
ben 7b2b1de681 Merge branch 'main' into switchpasstag 2022-12-14 00:18:46 +00:00
ben 75e6252d23 formatted 2022-12-14 00:06:36 +00:00
ben f506b010f6 Working 2022-12-14 00:04:03 +00:00
ben 5f53eb8e4e tagged working 2022-12-13 23:41:40 +00:00
ben c91b5031bf migration working 2022-12-13 20:17:52 +00:00
ben e161c5d116 fixed migration 2022-12-13 20:11:07 +00:00
ben 100cf17e4b fixed percent 2022-12-13 20:07:16 +00:00
ben 2e69ebe080 Seems to be working 2022-12-13 20:01:05 +00:00
ben d69c2e9170 moved to tag changed 2022-12-13 14:25:18 +00:00
ben 5539a82b4a Added tag 2022-12-13 13:42:09 +00:00
ben 52d490d687 struggling with ui 2022-12-12 12:44:58 +00:00
ben 4e6466cd95 Started adding ability to forward by tag 2022-12-09 14:10:10 +00:00
ben 44d7435163 format 2022-12-07 10:42:48 +00:00
ben d8a21800f2 Switched steps 2022-12-07 10:29:01 +00:00
ben 97565fde02 Adds PoS websocket endpoint
Receives all payments to a pos
2022-12-07 10:21:45 +00:00
ben 44e12f9d3a updated dev article 2022-12-01 19:04:05 +00:00
ben 9a50f4187e isort 2022-12-01 18:45:00 +00:00
ben 8ca390e0b0 format 2022-12-01 18:41:58 +00:00
ben 694a4e5054 replaced extension specific websockets with the generic websocket 2022-12-01 18:31:58 +00:00
benarc a220acb583 Removed id, using param instead 2022-12-01 14:41:57 +00:00
benarc 4aeb7683e5 Added Response 2022-12-01 13:15:46 +00:00
benarc 31b30cacd4 Merge branch 'main' into universalwebsocket 2022-12-01 12:42:01 +00:00
benanddni ⚡ f8647aa5d5 Fixed css 2022-12-01 12:21:25 +01:00
benanddni ⚡ 317ddec705 isort 2022-12-01 12:21:25 +01:00
benanddni ⚡ 9d1a8b839d Primary key 2022-12-01 12:21:25 +01:00
benanddni ⚡ ce41e4b689 formatting 2022-12-01 12:21:25 +01:00
benanddni ⚡ 2fcf2153c3 adding missing css to public_charge 2022-12-01 12:21:25 +01:00
benanddni ⚡ 13d2c93007 Added lost return 2022-12-01 12:21:25 +01:00
benanddni ⚡ fd7a5ca465 resolving conflict errors 2022-12-01 12:21:25 +01:00
benanddni ⚡ 11b743a905 Trying to fix conflict errors 2022-12-01 12:21:25 +01:00
benanddni ⚡ 742bbc9112 Added back custom_css 2022-12-01 12:21:25 +01:00
benanddni ⚡ 003288e19d added back custom css to public page 2022-12-01 12:21:25 +01:00
benanddni ⚡ 2c2558b9e1 fixed admin check 2022-12-01 12:21:25 +01:00
benanddni ⚡ 76c2a87577 Auto stash before checking out "HEAD" 2022-12-01 12:21:25 +01:00
benanddni ⚡ 1a17c04246 removed compact_charge 2022-12-01 12:21:25 +01:00
benanddni ⚡ 754aa637b9 added back crud 2022-12-01 12:21:25 +01:00
benanddni ⚡ 08747f1cb6 only allows admins to use custom themes 2022-12-01 12:21:25 +01:00
benanddni ⚡ cbd939f35b Revert "Merge remote-tracking branch 'origin/fix/strip_html_db' into feature/satspay-server-custom-css"
This reverts commit f98278faba.
2022-12-01 12:21:25 +01:00
benanddni ⚡ 700196a5a9 Now you can have multiple themes 2022-12-01 12:21:25 +01:00
benanddni ⚡ cb042d0bd0 Added websocket checker for switch 2022-12-01 12:21:25 +01:00
benanddni ⚡ 0a70af7e1e Added websocket test 2022-12-01 12:21:25 +01:00
benanddni ⚡ 6873cf1be0 added props 2022-12-01 12:21:24 +01:00
benanddni ⚡ a85d27ed5c missing comma 2022-12-01 12:21:24 +01:00
benanddni ⚡ f317a7cb2d Working through, getting functions working 2022-12-01 12:21:24 +01:00
benanddni ⚡ 11056f2a57 Booting 2022-12-01 12:21:24 +01:00
benanddni ⚡ 7df673c72d started adding mint stuff 2022-12-01 12:21:24 +01:00
benanddni ⚡ 485647d8a1 Extension authors 2022-12-01 12:21:24 +01:00
benanddni ⚡ 82fc156a04 Added the cashu router 2022-12-01 12:21:24 +01:00
benanddni ⚡ f743feb232 Broke, started added private/public key 2022-12-01 12:21:24 +01:00
benanddni ⚡ e54eb535a9 UI works well 2022-12-01 12:21:24 +01:00
benanddni ⚡ 93cc79e0c6 rebuild pages 2022-12-01 12:21:24 +01:00
ben 4fe408f067 Fixed css 2022-11-29 22:13:40 +00:00
ben a63b3cc89d Merge remote-tracking branch 'origin/main' into universalwebsocket 2022-11-29 11:47:01 +00:00
ben 9a9733c1ce Auto stash before merge of "universalwebsocket" and "origin/universalwebsocket" 2022-11-29 11:23:34 +00:00
ben 2244508a8c Merge remote-tracking branch 'origin/main' into universalwebsocket 2022-11-29 11:10:34 +00:00
ben 31d9f2e2ee Removed returns and reverted socket check so multiple clients can join 2022-11-29 11:09:54 +00:00
ben 187d709098 isort 2022-11-28 13:28:11 +00:00
benandVlad Stan 58eefd4d30 isort 2022-11-28 15:25:19 +02:00
benandVlad Stan 63d52581f2 Primary key 2022-11-28 15:24:23 +02:00
benandVlad Stan 879996039f formatting 2022-11-28 15:24:23 +02:00
benandVlad Stan 577d5fccd7 adding missing css to public_charge 2022-11-28 15:24:12 +02:00
benandVlad Stan e192b6c3f5 Added lost return 2022-11-28 15:24:12 +02:00
ben bb84f6b0e8 Black 2022-11-28 13:24:10 +00:00
benandVlad Stan 1d01ed861b resolving conflict errors 2022-11-28 15:23:49 +02:00
benandVlad Stan 16183a0317 Trying to fix conflict errors 2022-11-28 15:23:49 +02:00
benandVlad Stan 769bce0f94 Added back custom_css 2022-11-28 15:23:49 +02:00
benandVlad Stan 254cb8cce1 added back custom css to public page 2022-11-28 15:23:33 +02:00
benandVlad Stan 3a9dbb97c5 fixed admin check 2022-11-28 15:23:06 +02:00
benandVlad Stan 7dc90177ec Auto stash before checking out "HEAD" 2022-11-28 15:23:06 +02:00
benandVlad Stan a19bb520c3 removed compact_charge 2022-11-28 15:22:35 +02:00
benandVlad Stan 5b75d4f262 added back crud 2022-11-28 15:21:34 +02:00
benandVlad Stan 5c029a7af9 only allows admins to use custom themes 2022-11-28 15:20:35 +02:00
benandVlad Stan c54077f65b Revert "Merge remote-tracking branch 'origin/fix/strip_html_db' into feature/satspay-server-custom-css"
This reverts commit f98278faba.
2022-11-28 15:19:51 +02:00
benandVlad Stan a26a13a88d Now you can have multiple themes 2022-11-28 15:19:51 +02:00
ben aefd1fad69 isort 2022-11-28 13:13:45 +00:00
ben 746e119046 added vlads suggestion 2022-11-28 13:04:35 +00:00
ben 00123d6c16 Merge remote-tracking branch 'origin/main' into universalwebsocket 2022-11-28 12:29:34 +00:00
ben aa8c543325 Added websocket checker for switch 2022-11-26 22:46:46 +00:00
ben 988c7eb7b4 Added websocket test 2022-11-26 21:36:11 +00:00
ben 3cea3a0ba8 Removed payments websocket example
To be prob added back at a later date
2022-11-24 11:18:38 +00:00
ben dce4da96b7 fixed function name clash 2022-11-24 00:46:39 +00:00
ben c2a737ab84 Black 2022-11-24 00:34:46 +00:00
ben f876f0659f Moved into correct files, and added payment example 2022-11-24 00:21:39 +00:00
ben fde128e961 Better naming 2022-11-23 23:35:02 +00:00
ben cea4f9350c black 2022-11-23 22:42:32 +00:00
ben 152991fbec added try for return 2022-11-23 22:31:11 +00:00
ben 2f08255e92 added get option 2022-11-23 22:27:09 +00:00