Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Feature: User Activity for #15 #19

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

Feature: User Activity for #15 #19

wants to merge 44 commits into from

Commits on Mar 20, 2015

  1. Configuration menu
    Copy the full SHA
    150fc23 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    532f9e7 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2015

  1. Configuration menu
    Copy the full SHA
    5136b6b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fa8ee4b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ab88192 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e61b607 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'feature-user-activity' of github.com:euantorano/mybb2 i…

    …nto feature-user-activity
    euantorano committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    cdfc38d View commit details
    Browse the repository at this point in the history
  6. Update Post.php

    euantorano committed Mar 21, 2015
    Configuration menu
    Copy the full SHA
    cc00a85 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2015

  1. Configuration menu
    Copy the full SHA
    30386b6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1112a42 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' of github.com:mybb/mybb2 into feature-user-acti…

    …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
    euantorano committed Mar 23, 2015
    Configuration menu
    Copy the full SHA
    21d40b7 View commit details
    Browse the repository at this point in the history
  4. Slight code reformatting.

    euantorano committed Mar 23, 2015
    Configuration menu
    Copy the full SHA
    01ca97e View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2015

  1. Merge branch 'master' of github.com:mybb/mybb2 into feature-user-acti…

    …vity
    
    # Conflicts:
    #	app/Http/routes.php
    #	app/Providers/AppServiceProvider.php
    euantorano committed Mar 29, 2015
    Configuration menu
    Copy the full SHA
    673b3ed View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2015

  1. Merge branch 'master' of github.com:mybb/mybb2 into feature-user-acti…

    …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
    euantorano committed Apr 7, 2015
    Configuration menu
    Copy the full SHA
    6d37209 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2015

  1. Merge branch 'master' of github.com:mybb/mybb2 into feature-user-acti…

    …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
    euantorano committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    31d4fba View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    eabfe83 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' of github.com:mybb/mybb2 into feature-user-acti…

    …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
    euantorano committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    6fac0c9 View commit details
    Browse the repository at this point in the history
  4. Fixed syntax error.

    euantorano committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    9412ccf View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fafb4e9 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    33e6fdf View commit details
    Browse the repository at this point in the history
  7. Added settings.

    euantorano committed Apr 9, 2015
    Configuration menu
    Copy the full SHA
    cce3a86 View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2015

  1. Merge branch 'master' of github.com:mybb/mybb2 into feature-user-acti…

    …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
    euantorano committed Apr 19, 2015
    Configuration menu
    Copy the full SHA
    a9ef59f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    e88043b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    bcae5c7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a10328f View commit details
    Browse the repository at this point in the history
  5. Refactoring code.

    euantorano committed Apr 19, 2015
    Configuration menu
    Copy the full SHA
    3a2cdd2 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    f0f1700 View commit details
    Browse the repository at this point in the history
  7. Fixing profile template.

    euantorano committed Apr 19, 2015
    Configuration menu
    Copy the full SHA
    25ac9a1 View commit details
    Browse the repository at this point in the history
  8. Reformatting seeds.

    euantorano committed Apr 19, 2015
    Configuration menu
    Copy the full SHA
    be0c29b View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    a72f406 View commit details
    Browse the repository at this point in the history
  10. Removed old imports.

    euantorano committed Apr 19, 2015
    Configuration menu
    Copy the full SHA
    6f5a673 View commit details
    Browse the repository at this point in the history
  11. Merge branch 'master' of github.com:mybb/mybb2 into feature-user-acti…

    …vity
    
    # Conflicts:
    #	database/seeds/SettingsTableSeeder.php
    #	resources/views/user/profile_activity.twig
    euantorano committed Apr 19, 2015
    Configuration menu
    Copy the full SHA
    258c9c5 View commit details
    Browse the repository at this point in the history
  12. Auto-loading the likeable relation for the Likes model, saving 3 quer…

    …ies on the activity page.
    euantorano committed Apr 19, 2015
    Configuration menu
    Copy the full SHA
    c9ca049 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2015

  1. Merge branch 'master' of github.com:mybb/mybb2 into feature-user-acti…

    …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
    euantorano committed Apr 24, 2015
    Configuration menu
    Copy the full SHA
    2f9dea2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    a94eb61 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3b8dc21 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2015

  1. Merge branch 'master' of github.com:mybb/mybb2 into feature-user-acti…

    …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
    euantorano committed May 19, 2015
    Configuration menu
    Copy the full SHA
    1a5b91f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1b9ebfa View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2440360 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f6c2c78 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    baa739e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    3df880c View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    9b544d3 View commit details
    Browse the repository at this point in the history
  8. Fixed code style issues.

    euantorano committed May 19, 2015
    Configuration menu
    Copy the full SHA
    a8f35f3 View commit details
    Browse the repository at this point in the history