Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

A

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

Snippets Groups Projects

f1a9d172

Commit f1a9d172 authored 4 years ago by Angelina Filippova

Downloads
- Plain Diff

Merge branch 'feature/emoji-packs-pagination' into 'develop'

Implement emoji packs pagination

Closes #118

See merge request pleroma/admin-fe!137

parents ed801c54 1bae1cd3

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 1 addition, 0 deletions

CHANGELOG.md
src/api/emojiPacks.js 12 additions, 14 deletions

src/api/emojiPacks.js
src/lang/en.js 2 additions, 1 deletion

src/lang/en.js
src/store/index.js 5 additions, 5 deletions

src/store/index.js
src/store/modules/emojiPacks.js 72 additions, 21 deletions

src/store/modules/emojiPacks.js
src/views/emojiPacks/components/LocalEmojiPack.vue 58 additions, 11 deletions

src/views/emojiPacks/components/LocalEmojiPack.vue
src/views/emojiPacks/components/RemoteEmojiPack.vue 18 additions, 12 deletions

src/views/emojiPacks/components/RemoteEmojiPack.vue
src/views/emojiPacks/components/SingleEmojiEditor.vue 1 addition, 1 deletion

src/views/emojiPacks/components/SingleEmojiEditor.vue
src/views/emojiPacks/index.vue 94 additions, 63 deletions

src/views/emojiPacks/index.vue
src/views/users/index.vue 1 addition, 1 deletion

src/views/users/index.vue

with 264 additions and 129 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