Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(Add) User Request Sharing + Stats + Privacy Fixes #590

Merged
merged 42 commits into from
Feb 22, 2019
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
fb13d9b
(Update) HomeController
singularity43 Feb 22, 2019
1b06276
(Update) TorrentController
singularity43 Feb 22, 2019
ef45229
(Update) UserController
singularity43 Feb 22, 2019
a0bd0bf
(Update) User Model
singularity43 Feb 22, 2019
a4b39cf
(Update) UserPrivacy Model
singularity43 Feb 22, 2019
d56c051
(Add) New Privacy Migration
singularity43 Feb 22, 2019
ab27700
(Update) Helper JS
singularity43 Feb 22, 2019
1a1af03
(Update) Custom SASS
singularity43 Feb 22, 2019
53753e8
(Update) Online Block View
singularity43 Feb 22, 2019
3dbb9a0
(Update) Top Nav View
singularity43 Feb 22, 2019
4209831
(Update) Torrent History View
singularity43 Feb 22, 2019
0ff8cb3
(Update) Peers View
singularity43 Feb 22, 2019
110fbdc
(Update) Bookmark View
singularity43 Feb 22, 2019
1fed6a7
(Remove) Bookmark View
singularity43 Feb 22, 2019
5fd4569
(Add) Other View
singularity43 Feb 22, 2019
fc68fd5
(Update) Profile View
singularity43 Feb 22, 2019
8e802fe
(Update) Public Buttons
singularity43 Feb 22, 2019
bb833c6
(Add) Requests Buttons
singularity43 Feb 22, 2019
5cc000e
(Update) Staff Nav
singularity43 Feb 22, 2019
60dcf71
(Update) Stats Nav
singularity43 Feb 22, 2019
41de51b
(Update) User Nav
singularity43 Feb 22, 2019
7778197
(Remove) Wishlist Nav
singularity43 Feb 22, 2019
75e9dcb
(Add) Requests View
singularity43 Feb 22, 2019
65cfa64
(Update) Privacy View
singularity43 Feb 22, 2019
39594d0
(Add) Requests View
singularity43 Feb 22, 2019
0814ee2
(Update) Resurrections View
singularity43 Feb 22, 2019
82ee8bd
(Update) Profile View
singularity43 Feb 22, 2019
1347045
(Add) Requests View
singularity43 Feb 22, 2019
8e1a0e7
(Update) Wishlist View
singularity43 Feb 22, 2019
1f7b3c7
(Update) Web Routes
singularity43 Feb 22, 2019
4f0284b
(Update) User English Lang File
singularity43 Feb 22, 2019
5f481cb
(Update) UserController
singularity43 Feb 22, 2019
210b3b4
(Update) UserController
singularity43 Feb 22, 2019
c2d903d
(Update) UserController
singularity43 Feb 22, 2019
a6e5f8b
Apply fixes from StyleCI
HDVinnie Feb 22, 2019
00d8740
Merge pull request #591 from HDInnovations/analysis-zeQO47
HDVinnie Feb 22, 2019
513eb1c
(Update) UserController
singularity43 Feb 22, 2019
f64e164
Merge branch 'quick-updates' of https://github.com/HDInnovations/UNIT…
singularity43 Feb 22, 2019
04d00a4
(Update) Request View
singularity43 Feb 22, 2019
5dc7770
(Update) Resurrections View
singularity43 Feb 22, 2019
69d510f
Apply fixes from StyleCI
HDVinnie Feb 22, 2019
d537b95
Merge pull request #593 from HDInnovations/analysis-qJV5xo
HDVinnie Feb 22, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
(Update) TorrentController
Add load for peers and history.
  • Loading branch information
singularity43 committed Feb 22, 2019
commit 1b062765d590a38ec81a3196949b13fb85b6615c
4 changes: 2 additions & 2 deletions app/Http/Controllers/TorrentController.php
Original file line number Diff line number Diff line change
@@ -1094,7 +1094,7 @@ public function deleteTorrent(Request $request)
public function peers($slug, $id)
{
$torrent = Torrent::withAnyStatus()->findOrFail($id);
$peers = Peer::where('torrent_id', '=', $id)->latest('seeder')->paginate(25);
$peers = Peer::with(['user'])->where('torrent_id', '=', $id)->latest('seeder')->paginate(25);

return view('torrent.peers', ['torrent' => $torrent, 'peers' => $peers]);
}
@@ -1110,7 +1110,7 @@ public function peers($slug, $id)
public function history($slug, $id)
{
$torrent = Torrent::withAnyStatus()->findOrFail($id);
$history = History::where('info_hash', '=', $torrent->info_hash)->latest()->paginate(25);
$history = History::with(['user'])->where('info_hash', '=', $torrent->info_hash)->latest()->paginate(25);

return view('torrent.history', ['torrent' => $torrent, 'history' => $history]);
}