greed

steffo/greed

Fork 0

mirror of https://github.com/Steffo99/greed.git synced 2025-02-17 14:13:57 +00:00

Commit graph

dbd137b23e

Merge #52: Add logging support Stefano Pigozzi 2020-04-23 17:24:15 +02:00
8d3b492822

Merge branch 'master' into logging Stefano Pigozzi 2020-04-23 17:22:58 +02:00
71a3683cc1 Use logging in configloader (even if it doesn't show up) Stefano Pigozzi 2020-04-23 17:20:51 +02:00
68eafef656 Improve logging system (and rename ChatWorker class to Worker) Stefano Pigozzi 2020-04-23 17:10:28 +02:00
bfc4ff6430

Merge ce29d5511a into 788163458e pzhuk 2020-04-15 14:29:18 +03:00
ce29d5511a rename strings + review comments on worker Pavlo Zhuk 2020-04-15 14:29:04 +03:00
c07b0ef510 Simplify a line of SQL code Stefano Pigozzi 2020-04-15 02:28:19 +02:00
85a0414914 Improve some of the new strings Stefano Pigozzi 2020-04-15 02:23:01 +02:00
972499e440 fix datatime usage in worker Pavlo Zhuk 2020-04-11 03:07:13 +03:00
7312a84847 import attregetter Pavlo Zhuk 2020-04-11 03:01:47 +03:00
b27a350d09 update last seen on user login Pavlo Zhuk 2020-04-11 01:31:19 +03:00
dc2c7e03ad allow administrator removal Pavlo Zhuk 2020-04-11 00:01:43 +03:00
4876ca2053 refactor admin selection Pavlo Zhuk 2020-04-10 23:38:31 +03:00
2565fd57d9 fix a TODO with image upload handling Pavlo Zhuk 2020-04-10 21:41:01 +03:00
b32757daeb some linting cleanup Pavlo Zhuk 2020-04-10 21:21:22 +03:00
5a3313499d refactor image upload Pavlo Zhuk 2020-04-10 15:04:31 +03:00
788163458e Offer refill only if the credit_required is between the min_amount and max_amount range Stefano Pigozzi 2020-04-08 15:02:19 +02:00
279b8f1539 #44: Change CancelSignal handling Stefano Pigozzi 2020-04-08 14:51:44 +02:00
357b0e5680 #43: Improve README.md Stefano Pigozzi 2020-04-08 00:03:33 +02:00
1523863fed #46: Don't crash if Sentry is enabled and greed isn't being run in a git repository Stefano Pigozzi 2020-04-07 23:54:24 +02:00
45eadb74b2 Clarify how to disable credit card payments in the template config Stefano Pigozzi 2020-04-07 23:52:17 +02:00
13243521a5 Don't refill on checkout if credit card payments are disabled Stefano Pigozzi 2020-04-07 23:51:59 +02:00
3f6b208ba1 #47: Add a link to the greed Telegram group in the README Stefano Pigozzi 2020-04-07 23:42:35 +02:00
b074daf347

Merge pull request #41 from pzhuk/russian-translation Stefano Pigozzi 2020-04-07 14:39:52 +02:00
5da299f044 #45: Load config files with UTF8 encoding Stefano Pigozzi 2020-04-07 02:22:47 +02:00
102d58b387

Merge pull request #40 from pzhuk/order-invoice Stefano Pigozzi 2020-04-07 02:04:55 +02:00
9d6e21fb4e Move the presets to the [Credit Card] section Stefano Pigozzi 2020-04-07 02:02:07 +02:00
9df1203b3e Made a few changes Stefano Pigozzi 2020-04-07 01:44:23 +02:00
c9561f0da5 Bump up config file version Stefano Pigozzi 2020-04-07 01:30:13 +02:00
23f395ee8a allow refill on insufficient funds during checkout Pavlo Zhuk 2020-04-04 23:37:03 +03:00
5be2f9e762 add configurable payment presets Pavlo Zhuk 2020-04-04 20:53:10 +03:00
4c0c38902e create __issue_invoice() Pavlo Zhuk 2020-04-04 20:18:35 +03:00
87922e8aad

Merge pull request #42 from pzhuk/conf-currency-symbol Stefano Pigozzi 2020-04-05 19:04:46 +02:00
b1c313bf1d

Bump config version Stefano Pigozzi 2020-04-05 19:04:32 +02:00
be31210afa Allow configuration of currency symbol instead of using language-based one Pavlo Zhuk 2020-04-05 00:43:41 +03:00
37ce8ca57d add russian language support Pavlo Zhuk 2020-04-05 00:18:45 +03:00
5828ba8f31 PEP8 Stefano Pigozzi 2020-04-04 13:06:57 +02:00
9688575fd7 refactor + add __get_cart_value() and __get_cart_summary() Pavlo Zhuk 2020-04-04 12:23:45 +03:00
44d8e89830 PEP8 Stefano Pigozzi 2020-04-04 13:06:57 +02:00
2d3c563456 refactor + add __get_cart_value() and __get_cart_summary() Pavlo Zhuk 2020-04-04 12:23:45 +03:00
d70a8f2134 full stops Pavlo Zhuk 2020-04-04 00:30:27 +03:00
c54e56b59c minor fix Pavlo Zhuk 2020-04-03 23:56:11 +03:00
96c295b327 adding Ukrainian translations Pavlo Zhuk 2020-04-03 20:19:46 +03:00
23febf1b4a fix Cancellable calls Pavlo Zhuk 2020-04-04 02:05:59 +03:00
da6dd0dd9a fix Cancellable calls Pavlo Zhuk 2020-04-04 02:05:59 +03:00
bc33fbd59d full stops Pavlo Zhuk 2020-04-04 00:30:27 +03:00
9abaac6d30 minor fix Pavlo Zhuk 2020-04-03 23:56:11 +03:00
f33ee91de3 adding Ukrainian translations Pavlo Zhuk 2020-04-03 20:19:46 +03:00
013ffc8bbc Use logging in utils too Stefano Pigozzi 2020-04-01 03:19:01 +02:00
d0faae11fb Accept any commands starting with /start to start the bot Stefano Pigozzi 2020-03-31 01:52:44 +02:00
641c2736bd Enable logging in core Stefano Pigozzi 2020-03-31 01:52:10 +02:00
d34617ee22 Fix price conversion callbacks Darren 2020-03-30 17:37:15 +02:00
3caa5ef179 #18: Recalculate credit on every new transaction Stefano Pigozzi 2020-03-27 18:14:37 +01:00
611eb7e1db Print exceptions to the console for easier debugging Stefano Pigozzi 2020-03-27 18:07:13 +01:00
7f4087e046 Add a "transactions" backref to User Stefano Pigozzi 2020-03-27 18:06:31 +01:00
3e49f7c8a5 #17: Properly generate CancelSignals from regular keyboards Stefano Pigozzi 2020-03-27 16:57:32 +01:00
0a0f76168b PEP8 improvement Stefano Pigozzi 2020-03-27 16:31:27 +01:00
cdb698c951 Remove time delay after payment info Darren 2020-03-23 08:40:51 +02:00
669ebc43cc

Update README.md shivaenigma 2020-03-19 22:44:32 +05:30
517acd38c4

Update README.md shivaenigma 2020-03-19 22:44:08 +05:30
f40d1ff2c1 Add BTC integration instructions Darren 2020-03-13 10:04:49 +02:00
13c187eb67 Add BTC integration instructions Darren 2020-03-13 10:00:41 +02:00
7691493f61

Merge pull request #1 from DarrenWestwood/bitcoin Darren 2020-03-13 09:01:26 +02:00
2b23bd5661 Fix #27 by removing the character limit on regexes Stefano Pigozzi 2020-03-13 02:54:23 +01:00
45d8763d63 Merge branch 'master' into bitcoin Stefano Pigozzi 2020-03-01 23:55:41 +01:00
16e6b16fb0 Improve README Stefano Pigozzi 2020-03-01 23:51:35 +01:00
eea3623475 Merge branch 'english-translation' Stefano Pigozzi 2020-03-01 23:27:28 +01:00
88b38b2b5b Improve english and italian translations Stefano Pigozzi 2020-03-01 23:25:47 +01:00
3b3543ae86 Add BTC string to en_US translation. Darren 2020-02-06 13:03:36 +02:00
2b6679e898 Update default bitcoin values Darren 2020-02-06 00:30:56 +02:00
ad26e2abae Merge remote-tracking branch 'Steffo99/master' into bitcoin Darren 2020-02-05 17:26:53 +02:00
0a9ade30e9

Add localization support and unofficial en_US strings file (#32) Stefano Pigozzi 2020-02-05 03:25:34 +01:00
63a28f2225 Improve translations a bit Stefano Pigozzi 2020-02-05 03:23:13 +01:00
985550e37b Bump the config version to 14, as a new value was added to it Stefano Pigozzi 2020-02-05 02:12:57 +01:00
dd686a4456 I found this on my pc, I have no idea of what I was trying to do archive-config-stuff Stefano Pigozzi 2020-02-05 02:10:52 +01:00
6173669911 Remove cancel button to fix blocking issue Darren 2020-02-04 17:00:56 +02:00
7d4d5f966e Add English translations en_US Darren 2020-02-04 15:14:04 +02:00
49cc2b8036 Add language switcher Darren 2020-02-04 15:13:14 +02:00
ceb36214f9 fix price display main menu Darren 2020-01-29 18:06:10 +02:00
583c2ac280 remove unnecessary change Darren 2020-01-29 15:10:28 +02:00
58d766068b fix rounding issues Darren 2020-01-29 15:06:44 +02:00
a9c520541b fix rounding issues Darren 2020-01-29 14:51:35 +02:00
1bcb243337 remove unneccesary satoshi Darren 2020-01-29 14:48:18 +02:00
f5867405af clean up code Darren 2020-01-29 14:03:01 +02:00
30ae2cf481 fix address save to db Darren 2020-01-29 13:38:59 +02:00
facfbc7e92 remove network_confirmations config Darren 2020-01-29 13:08:53 +02:00
e91a7454ea seperate websocket and callback Darren 2020-01-29 13:05:21 +02:00
2dccc11130 Connect to websocket before message Darren 2020-01-28 17:01:06 +02:00
bfbf7b0cdf Fix loop error Darren 2020-01-28 16:41:36 +02:00
a32c9e3148 Add callback switcher Darren 2020-01-28 16:40:31 +02:00
89092c6f3e add use websocket flag Darren 2020-01-23 06:03:53 +02:00
ab82544c1e remove test setup api methods Darren 2020-01-23 04:14:40 +02:00
d8bd807ee4 remove test setup Darren 2020-01-23 03:44:19 +02:00
ac3a40417e add flask dependency Darren 2020-01-19 05:31:55 +02:00
ac21a05bf9 fix cancel payment button Darren 2020-01-19 04:49:54 +02:00
20740661c4 fix issue in callbacks Darren 2020-01-19 04:46:36 +02:00
e9cc51f853 fix payment timeout Darren 2020-01-17 02:54:31 +02:00
57a70e76fc add test setup Darren 2020-01-17 01:54:52 +02:00
7e5f5f4fd7 add network confirmations to config Darren 2020-01-13 15:46:41 +02:00
4ee78c4e87 complete bitcoin integration Darren 2020-01-13 14:47:25 +02:00