Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

P

pleroma-fe
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

1717e700

Commit 1717e700 authored 6 years ago by lain

Downloads
- Plain Diff

Merge branch 'feat/dont-show-load-more-when-bottomed-out' into 'develop'

fix #292 dont show "load more" when bottomed out

Closes #292

See merge request pleroma/pleroma-fe!496

parents 0bd77149 7666d50d

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

src/App.scss 6 additions, 0 deletions

src/App.scss
src/components/notifications/notifications.js 14 additions, 0 deletions

src/components/notifications/notifications.js
src/components/notifications/notifications.vue 7 additions, 2 deletions

src/components/notifications/notifications.vue
src/components/timeline/timeline.js 8 additions, 2 deletions

src/components/timeline/timeline.js
src/components/timeline/timeline.vue 7 additions, 2 deletions

src/components/timeline/timeline.vue
src/i18n/en.json 4 additions, 2 deletions

src/i18n/en.json
src/i18n/fi.json 4 additions, 2 deletions

src/i18n/fi.json
src/modules/statuses.js 7 additions, 0 deletions

src/modules/statuses.js
src/services/notifications_fetcher/notifications_fetcher.service.js 1 addition, 0 deletions

...es/notifications_fetcher/notifications_fetcher.service.js
src/services/timeline_fetcher/timeline_fetcher.service.js 1 addition, 0 deletions

src/services/timeline_fetcher/timeline_fetcher.service.js

with 59 additions and 10 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment