…ervice provider.

…ervice provider.

…nto feature-user-activity

…vity

…vity

# By JN-Jones
# Via Euan T. (3) and JN-Jones (2)
* 'master' of github.com:mybb/mybb2:
  Fix last post for forum and topic. Also updated the seeder a bit
  Fix PSR-2 styling
  Fixing forum counters and last_post_id, last_post_user_id updating
  Keep the written reply in the editor when switching to full reply
  Forgot the slug
  Link to the correct topic or forum instead of the action page

…vity

# Conflicts:
#	app/Http/routes.php
#	app/Providers/AppServiceProvider.php

…vity

# Conflicts:
#	app/Database/Repositories/Decorators/Forum/CachingDecorator.php
#	app/Database/Repositories/Eloquent/PostRepository.php
#	app/Database/Repositories/Eloquent/TopicRepository.php
#	app/Http/Controllers/Auth/AuthController.php
#	app/Http/Controllers/TopicController.php
#	app/Http/Requests/Topic/CreateRequest.php
#	app/Http/Requests/Topic/ReplyRequest.php
#	app/Http/routes.php
#	app/Presenters/User.php

…vity

# Conflicts:
#	app/Captcha/CaptchaAyah.php
#	app/Captcha/CaptchaFactory.php
#	app/Captcha/CaptchaInterface.php
#	app/Captcha/CaptchaMybb.php
#	app/Captcha/CaptchaNocaptcha.php
#	app/Captcha/CaptchaRecaptcha.php
#	app/Database/Repositories/Eloquent/ForumRepository.php
#	app/Database/Repositories/PostRepositoryInterface.php

…vity

# Conflicts:
#	app/Database/Models/Post.php
#	app/Database/Repositories/Eloquent/UserRepository.php
#	app/Database/Repositories/TopicRepositoryInterface.php
#	app/Database/Repositories/UserRepositoryInterface.php
#	app/Providers/AppServiceProvider.php

…vity

# Conflicts:
#	app/Database/Repositories/ForumRepositoryInterface.php
#	app/Http/Controllers/CaptchaController.php
#	app/Http/Controllers/Controller.php
#	app/Providers/AppServiceProvider.php
#	composer.json
#	database/seeds/SettingsTableSeeder.php

…vity

…vity

# Conflicts:
#	database/seeds/SettingsTableSeeder.php
#	resources/views/user/profile_activity.twig

…ies on the activity page.

…vity

# Conflicts:
#	app/Database/Models/Post.php
#	app/Database/Repositories/Eloquent/SearchRepository.php
#	app/Database/Repositories/SearchRepositoryInterface.php
#	app/Http/Controllers/AbstractController.php
#	app/Http/Controllers/UserController.php
#	app/Likes/Database/Models/Like.php
#	app/Likes/Database/Repositories/Eloquent/LikesRepository.php
#	app/Likes/Database/Repositories/LikesRepositoryInterface.php
#	database/seeds/ProfileFieldsTableSeeder.php

…vity

# Conflicts:
#	app/Http/Controllers/UserController.php
#	app/Http/routes.php
#	app/Likes/Database/Repositories/Eloquent/LikesRepository.php
#	app/Likes/Database/Repositories/LikesRepositoryInterface.php
#	app/Providers/AppServiceProvider.php
#	database/seeds/SettingsTableSeeder.php
#	resources/lang/en/member.php
#	resources/views/user/profile_activity.twig