UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 05:23:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2019-02-24 23:34:14 -07:00 committed by GitHub
commit c77a22b224
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 3 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();

BIN
public/js/timeline.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

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 => {
});
},