mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #884 from pixelfed/frontend-ui-refactor 

Frontend ui refactor
This commit is contained in:
daniel 2019-02-25 00:13:11 -07:00 committed by GitHub
parent b0049181bc 6bbef6ac4e
commit cbb39ebbb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/PublicApiController.php
View File

@ -217,7 +217,7 @@ class PublicApiController extends Controller
$page = $request->input('page');
$min = $request->input('min_id');
$max = $request->input('max_id');
$limit = $request->input('limit') ?? 10;
$limit = $request->input('limit') ?? 3;
// TODO: Use redis for timelines
// $timeline = Timeline::build()->local();
@ -311,7 +311,7 @@ class PublicApiController extends Controller
$page = $request->input('page');
$min = $request->input('min_id');
$max = $request->input('max_id');
$limit = $request->input('limit') ?? 10;
$limit = $request->input('limit') ?? 3;
// TODO: Use redis for timelines
// $timeline = Timeline::build()->local();

2
public/js/timeline.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/mix-manifest.json
View File

@ -8,5 +8,5 @@
"/js/micro.js": "/js/micro.js?id=178479fb6990f8806257",
"/js/profile.js": "/js/profile.js?id=488dcd99d616ca9ef8de",
"/js/status.js": "/js/status.js?id=096927f9312b1d7bb1b0",
"/js/timeline.js": "/js/timeline.js?id=846dbce71bbcd67609ab"
"/js/timeline.js": "/js/timeline.js?id=7a400692c9ed6419702c"
}

2
resources/assets/js/components/Timeline.vue
View File

@ -328,7 +328,7 @@
'mod': false,
'dark': false,
'notify': true,
'infinite': false
'infinite': true
}
}
},