Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Agcashdaum patch 1 #26

Open
wants to merge 79 commits into
base: master
Choose a base branch
from
Open

Agcashdaum patch 1 #26

wants to merge 79 commits into from

Conversation

agcashdaum
Copy link

No description provided.

Steffo99 and others added 30 commits June 29, 2020 03:40
@Steffo99
Update the README
cb90959
@Steffo99
Fix incomplete sentence
020d081
@Steffo99
Add some screenshots (closes Steffo99#59)
1ecc874
@Steffo99
Display the bot's username instead of "greed" in the starting message
faaeb08
@Steffo99
Fix Steffo99#63
bd1b984
@Steffo99
Fix https://t.me/greed_project/488
c9f220a
@zhihuiyuze
master
2579a5a
@zhihuiyuze
Add Chinese support is preparing to test
1679975
@zhihuiyuze
Update zh_cn.py
8d16f15 
Fix some minor bugs
@zhihuiyuze
Update template_config.ini
c3d119f
@zhihuiyuze
Fix Chinese menu
bb4ac59
@zhihuiyuze
Modify the switch language icon
4befa7b
@zhihuiyuze
Update worker.py
556645b
@zhihuiyuze
Update zh_cn.py
71a0d22
@zhihuiyuze
Translate'Refund Reason'
b59f8e9
@zhihuiyuze
Update en.py
8dbc69e
@zhihuiyuze
Update it.py
b08f3b5
@zhihuiyuze
Update worker.py
c077e40
@Steffo99
Merge pull request Steffo99#68 from zhihuiyuze/master
2935d4f 
Add Chinese support
@Steffo99
Fix syntax error in the zh_ch translation
228dac5
@netanelkoli @Steffo99
Adding Hebrew language support (Steffo99#70)
9267b25 
* Adding Hebrew language support

* Update heb.py

* Fix a few things

* Fix issues

Co-authored-by: Stefano Pigozzi <[email protected]>
Co-authored-by: Netanel Koli <[email protected]>
@Steffo99
Hide custom keyboard during Live Orders mode (closes Steffo99#39)
b4fc5d0 
Also fixes a bug with the chinese translation
@Steffo99
Merge
da1de18
@Steffo99
Add PyCharm run configuration
adb0397
@Steffo99
Make the welcome message toggleable with a config option (closes Stef…
378bbba 
…fo99#69)
@Steffo99
Completely rework the configuration system (Steffo99#76)
6a49756 
* Do a lot of progress on the new config system

* Completely rework the configuration system

* Improve logging messages
@Steffo99
Reformat code using PyCharm
177f5b3
@Steffo99
Daemonize worker processes so greed can be stopped with Ctrl+C
62587f0
@Steffo99
Fix self.loc race condition
3bcd409
@Steffo99
Remove access to missing worker.loc
22adafe
Steffo99 and others added 30 commits January 11, 2021 19:19
@Steffo99
Merge pull request Steffo99#92 from Bakx13/patch-1
90e5141 
Update ru.py
@Steffo99
Tentative fix for Steffo99#95
3cfe025
@Steffo99
🐛 Fix Steffo99#100 by using re.DOTALL in all regexes
3cc3693
@Steffo99
Merge remote-tracking branch 'origin/master'
624f4c1
@Steffo99
🐛 Fix excess whitespace in russian translation
ee57dd9
@Steffo99
fix 3+ numbers for create_transaction
17cb4fe
@Steffo99
fix python-telegram-bot:latest warning && variable connection pool size
3dd0bbc
@valentino-sm @Steffo99
fix order-transaction one-to-one relation
3f38083
@valentino-sm @Steffo99
fix order-transaction one-to-one relation Steffo99#2
3272557
@valentino-sm @Steffo99
update ru.py
ce8ab7a
@valentino-sm @Steffo99
fix sqlalchemy exception
730fa96
@valentino-sm @Steffo99
update ru.py
d0b7da2
@valentino-sm @Steffo99
fix-2 sqlalchemy exception
6a70a45
@valentino-sm @Steffo99
fix orderitem-order relation warning
262eea2
@Steffo99
✏ Improve string spacing
0e1bf50
@Steffo99
🔧 Remove unnecessary session parameter
6cf8a3d
@Steffo99
🔧 Improve SQLalchemy code
d3200b1
@Steffo99
✏ Change guide link
efa6aee
@Steffo99
🔧 Display transaction data if present in the db
24d5024
@Steffo99
🔨 Remove saved runConfig
deab244
@Steffo99
🔧 Display + before the international prefix
2c5cdef
@Steffo99
🔧 Steffo99#122: Pin dependencies
419efc5
@valentino-sm @Steffo99
fix worker init
94f8b91
@Steffo99
🔧 Steffo99#107: Support tips (even if not recommended)
2262dbb
@eufelipemateus
Add language pt_br (Steffo99#132)
6995d78 
* Add Language PT_BR

Create br.py

* Update config/template_config.toml

* Update strings/br.py

* Update strings/br.py

* Update strings/br.py

* Update strings/br.py

* Update strings/br.py

* Update strings/br.py

* Update config/template_config.toml

* Fix problems

* Update pt_br.py

* 🔧 Add `pt_br` to the language menu
Co-authored-by: Stefano Pigozzi <[email protected]>

* Update pt_br.py
Update "order" word to "pedido".
@Steffo99
Create codeql-analysis.yml
3c235b2
@Steffo99
Update codeql-analysis.yml
bcdff61
@Steffo99
Fix Steffo99#135
48c3eb9
@dependabot @Steffo99
Bump urllib3 from 1.26.4 to 1.26.5
28967de 
Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.4 to 1.26.5.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@1.26.4...1.26.5)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
@agcashdaum
Create python-package-conda.yml
66d2cfe
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@agcashdaum @Steffo99 @zhihuiyuze @netanelkoli @mastersuv @Bakx13 @valentino-sm @eufelipemateus