tg-bot-user by "Code Without us" team™#8
Open
nokerokuta wants to merge 58 commits intoskillbox-java:mainfrom
Open
tg-bot-user by "Code Without us" team™#8nokerokuta wants to merge 58 commits intoskillbox-java:mainfrom
nokerokuta wants to merge 58 commits intoskillbox-java:mainfrom
Conversation
…s of model, add new empty config classes
Max branch MR#1
# Conflicts: # src/main/java/org/codewithoutus/tgbotusers/config/AppConfig.java # src/main/java/org/codewithoutus/tgbotusers/controller/BotController.java # src/main/java/org/codewithoutus/tgbotusers/service/BotService.java # src/main/resources/application.yml
# Conflicts: # src/main/java/org/codewithoutus/tgbotusers/handler/MessageHandler.java # src/main/java/org/codewithoutus/tgbotusers/model/UserJoining.java # src/main/java/org/codewithoutus/tgbotusers/repository/UserChatRepository.java # src/main/java/org/codewithoutus/tgbotusers/repository/UserJoiningRepository.java # src/main/java/org/codewithoutus/tgbotusers/service/BotService.java # src/main/java/org/codewithoutus/tgbotusers/service/ModeratorService.java # src/main/java/org/codewithoutus/tgbotusers/service/UserChatService.java # src/main/java/org/codewithoutus/tgbotusers/service/UserJoiningService.java
Alex branch
Now transmitted the ID of UserJoining entity to keyboard buttons. TODO with assigned developer. Refactoring.
…rt, joinCongratulate and joinUserInfo (+ printout congratulated users with crown)
# Conflicts: # src/main/java/org/codewithoutus/tgbotusers/model/entity/ChatModerator.java # src/main/java/org/codewithoutus/tgbotusers/model/entity/ChatUser.java # src/main/java/org/codewithoutus/tgbotusers/model/repository/ChatModeratorRepository.java # src/main/java/org/codewithoutus/tgbotusers/model/service/ChatModeratorService.java # src/main/java/org/codewithoutus/tgbotusers/model/service/ChatUserService.java
… docker-compose.yml. For starting set properties in application-bot.yml and .env, in command line input "mvn clean package" and "docker-compose.yml", for stop CTRL+C
…tSettings" for administrators
+ chooseLucky
# Conflicts: # application-bot.yml # src/main/java/org/codewithoutus/tgbotusers/bot/enums/BotCommand.java # src/main/java/org/codewithoutus/tgbotusers/bot/handler/AdminMessageHandler.java
# Conflicts: # .env # README.md # application-bot.yml
Author
|
Hello everyone =) Sorry for some "looking like big" commits after 00:00 MSK, especial "Merge branch 'master' into alexBranch" [8cdcf97]. It was something unstaged and merge problem in alexBranch during branches synchronizing. The only changes from "final" [84738a4] commit to last "minor README message example addon" [4d59b63] is:
I remember about Konstantin advice for possibility do changes after 00:00 MSK, and we are maybe do some minor improvements, but not 100% sure =) Just asking not consider this "merge" commit like "we didn't make it in time" =)) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Final commit & pull request =)