chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

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

Frontend ui refactor
This commit is contained in:
daniel 2019-02-24 23:34:14 -07:00 committed by GitHub
parent 199ebc147e 19617f286c
commit c77a22b224
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') ?? 5;
$limit = $request->input('limit') ?? 10;
// TODO: Use redis for timelines
// $timeline = Timeline::build()->local();
@ -314,7 +314,7 @@ class PublicApiController extends Controller
$page = $request->input('page');
$min = $request->input('min_id');
$max = $request->input('max_id');
$limit = $request->input('limit') ?? 5;
$limit = $request->input('limit') ?? 10;
// 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=4101fb6ac1673f3e0abd"
"/js/timeline.js": "/js/timeline.js?id=846dbce71bbcd67609ab"
}

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

@ -341,7 +341,6 @@
mounted() {
this.$nextTick(function () {
$('[data-toggle="tooltip"]').tooltip()
this.fetchNotifications();
});
},
@ -379,6 +378,7 @@
}
$('.timeline .pagination').removeClass('d-none');
this.loading = false;
this.fetchNotifications();
}).catch(err => {
});
},