Merge branch 'new' into 'master'
Merge Final To Master See merge request IF3250-2018-K01-I-4/WebAlumniSTEI!14
Showing
- app/Http/Controllers/AnswersController.php 1 addition, 1 deletionapp/Http/Controllers/AnswersController.php
- app/Http/Controllers/Auth/SocialAccountsController.php 6 additions, 4 deletionsapp/Http/Controllers/Auth/SocialAccountsController.php
- app/Http/Controllers/Auth/SocialAccountsController.php.save 95 additions, 0 deletionsapp/Http/Controllers/Auth/SocialAccountsController.php.save
- app/Http/Controllers/MembersController.php 29 additions, 23 deletionsapp/Http/Controllers/MembersController.php
- app/Http/Controllers/UsersController.php 0 additions, 85 deletionsapp/Http/Controllers/UsersController.php
- app/SocialAccountService.php 5 additions, 1 deletionapp/SocialAccountService.php
- composer.lock 134 additions, 249 deletionscomposer.lock
- config/services.php 3 additions, 3 deletionsconfig/services.php
- public/storage/cover_images/default_1524675461.png 0 additions, 0 deletionspublic/storage/cover_images/default_1524675461.png
- public/storage/profile_image/noimage_1524676318.jpg 0 additions, 0 deletionspublic/storage/profile_image/noimage_1524676318.jpg
- public/storage/view-more-members.png 0 additions, 0 deletionspublic/storage/view-more-members.png
- resources/views/admin/addanswer.blade.php 0 additions, 77 deletionsresources/views/admin/addanswer.blade.php
- resources/views/admin/dashboard.blade.php 0 additions, 3 deletionsresources/views/admin/dashboard.blade.php
- resources/views/admin/editprofile.blade.php 7 additions, 0 deletionsresources/views/admin/editprofile.blade.php
- resources/views/admin/profile.blade.php 4 additions, 4 deletionsresources/views/admin/profile.blade.php
- resources/views/admin/showeachpost.blade.php 0 additions, 2 deletionsresources/views/admin/showeachpost.blade.php
- resources/views/admin/showquestion.blade.php 0 additions, 2 deletionsresources/views/admin/showquestion.blade.php
- resources/views/home.blade.php 1 addition, 40 deletionsresources/views/home.blade.php
- resources/views/inc/adminmenu.blade.php 0 additions, 2 deletionsresources/views/inc/adminmenu.blade.php
- resources/views/inc/navbarhome.blade.php 65 additions, 42 deletionsresources/views/inc/navbarhome.blade.php
Please register or sign in to comment