Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
research
laravel_training
Commits
431a859d
Commit
431a859d
authored
9 years ago
by
Kamolpop Kuadsantia (ไอซ์)
Browse files
Options
Download
Plain Diff
Merge branch 'develop' into feature/edit_style_post
# Conflicts: # resources/views/post/newsfeed.blade.php
parents
7a4b08cb
cbfb6bec
master
authentication/register
develop
doneDeleteUserTest
login/login-form-001
login/login-form-002
personal/train_phpunit
register/clean_taey
register/clear
register/clear_auth
register/clear_route
register/register_kwun
register/session1
routing/challenge_1_basic_route
routing/challenge_2_3
session1/view
session1/view-ans
session1/view-part1
session1/view-part2
session1/view-part3
session1/view-part4
session2/controller
session2/edit_view
session2/update
session2/upload
session2/validate
session3/comment-part1
session3/comment-part1-new
session3/comment-part2
session3/comment-part2-ans
session3/init
session3/like-part1
session3/like-part1-new
session3/like-part2
session3/like-part2-ans
session3/post
version0.1
protect_comment_user
ok
gitignore
gitignore_fix
fix_code
No related merge requests found
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
app/Http/Controllers/PostController.php
+2
-2
app/Http/Controllers/PostController.php
app/Http/Controllers/ProfileController.php
+2
-2
app/Http/Controllers/ProfileController.php
app/Post.php
+1
-1
app/Post.php
app/User.php
+1
-1
app/User.php
composer.json
+2
-1
composer.json
database/migrations/2016_06_15_091630_alter_image_to_users_table.php
+37
-0
...grations/2016_06_15_091630_alter_image_to_users_table.php
public/css/styles.css
+4
-0
public/css/styles.css
resources/views/post/newsfeed.blade.php
+59
-55
resources/views/post/newsfeed.blade.php
resources/views/user/profile.blade.php
+1
-1
resources/views/user/profile.blade.php
with
109 additions
and
63 deletions
+109
-63
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets