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.

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

Merge dev to master #4864

Merged
merged 11 commits into from
Aug 28, 2016
Merged

Merge dev to master #4864

merged 11 commits into from
Aug 28, 2016

Conversation

mjmadsen
Copy link
Contributor

Small fix to capture percentage.

Gobberwart and others added 11 commits August 28, 2016 01:55
* Fix bot crash at start on permaban

* Expanded logging options

Added "logging" section to config, with options "color",
"show_datetime", "show_process_name" and "show_log_level"

* Added warning about deprecated logging_color arg

* Display log message moved

No point trying to use the logger before it's been initialised. Moved to
init_config.

* Remove milliseconds from datetime

Because really, do we need that?

* Reversed condition order for clarity

First check: "if not in config", OR
Second check: "is in config AND set to true"

If either condition matches, the logging detail will be displayed.

* Documented new log options

* Modified conditions again

Removed unnecessary second check for config values and slightly modified
parentheses as per suggestion from @mjmadsen
Fixed an faulty character
* dont forget to update the docs when adding config changes...

* reflect config changes....
Add stuff in the right order.
* Clarify Max_distance

* Added distance unit and updated configuration_files.md
- fix for Telegram to accept "@username" as "master", too, along with numeric  IDs
@mention-bot
Copy link

@mjmadsen, thanks for your PR! By analyzing the annotation information on this pull request, we identified @k4n30, @douglascamata and @reddivision to be potential reviewers

@mjmadsen
Copy link
Contributor Author

mjmadsen commented Aug 28, 2016

👍

Approved with PullApprove

@mjmadsen mjmadsen merged commit d6d5dab into master Aug 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants