-
Notifications
You must be signed in to change notification settings - Fork 45
Feature: User Activity for #15 #19
base: master
Are you sure you want to change the base?
Conversation
Do you also plan to add activities here (posting topic/post) or will you add it separately? |
Yes, I plan to add support for core content types in this branch, but will open additional pull requests as other content types are created. And yes, I will change the other models. The only reason I fixed Post here is because I was editing the model anyway.
|
* | ||
* @author MyBB Group | ||
* @version 2.0.0 | ||
* @package mybb/settings |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Damn copy and paste. It's probably in a few files ;)
On 21 Mar 2015, at 11:25, Will Pillar [email protected] wrote:
In app/UserActivity/Database/Models/UserActivity.php:
@@ -0,0 +1,69 @@
+<?php
+/**—
Reply to this email directly or view it on GitHub.
…nto feature-user-activity
…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
Basic user activity for replies done. Other activities can be completed in the future as they're implemented. It will also need some nicer styling @justinsoltesz - it currently looks like this: |
@Sama34 They'll be more useful in the future :) It's just good practise to get used to using them now rather than later. |
@@ -16,6 +16,8 @@ | |||
</header> | |||
|
|||
{% include "user.profile_basic" %} | |||
<br style="clear: both;" /> {#TODO: Fix this please Justin!#} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@justinsoltesz For future reference, the profile styling needs some work doing, due to floats and such causing issues...
* | ||
* @return \MyBB\Core\Database\Models\User | ||
*/ | ||
public function getContentAuthor() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't this return the author of the post and not of the topic?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep. Not sure what I was thinking there...
…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
File header should be updated here too ;) |
…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
TODO:
|
Conflicts here too :( |
This pull request implements the User Activity feature for issue #15.