pleroma/admin-fe
0
0
Fork 0
Code Issues 48 Pull requests 19 Projects Releases Packages Wiki Activity

Add display name for emoji packs #410

Open
seanking wants to merge 93 commits from gitlab-mr-iid-178 into develop
pull from: gitlab-mr-iid-178
merge into: pleroma:develop
Conversation 1 Commits 93 Files changed 93 +5090 -4084
seanking commented 2020-10-20 02:19:17 +00:00
Member
Copy link

Related MR: pleroma!3092

This MR adds the ability to add/change/remove display names for custom emoji packs.

Screenshot_from_2020-10-19_20-18-58

Related MR: pleroma!3092 This MR adds the ability to add/change/remove display names for custom emoji packs. ![Screenshot_from_2020-10-19_20-18-58](/attachments/fa2a8501-bd41-4094-a23a-a2ee9f221966)
Screenshot_from_2020-10-19_20-18-58.png
84 KiB
linafilippova commented 2020-10-20 19:30:31 +00:00
Member
Copy link

LGTM 👍 I will merge it when the BE will be merged

LGTM 👍 I will merge it when the BE will be merged
# Conflicts:
#   CHANGELOG.md
# Conflicts:
#   CHANGELOG.md
#   src/store/modules/emojiPacks.js
Disable tag actions when TagPolicy is disabled

Closes #135

See merge request pleroma/admin-fe!164
Move :restrict_unauthenticated setting to Instance tab

Closes #156

See merge request pleroma/admin-fe!166
* For both development (running locally) and building we also need to install the dependencies. I added how I did it.
Ability to enable MediaProxy and Invalidation from MediaProxy tab

Closes #141

See merge request pleroma/admin-fe!167
Add installing dependencies to readme

See merge request pleroma/admin-fe!168
Define Instance Panel and Terms of Services in Admin-FE

Closes #90

See merge request pleroma/admin-fe!170
Fix managing users from reports

Closes #144

See merge request pleroma/admin-fe!172
Mock settings api in reports tests

See merge request pleroma/admin-fe!173
Allow using underscores and hyphens in new account's usernames

Closes #158

See merge request pleroma/admin-fe!174
Implement remote emojis pagination

See merge request pleroma/admin-fe!159
Icons and frontends settings

Closes #162 and #157

See merge request pleroma/admin-fe!175
Fix tests

See merge request pleroma/admin-fe!176
Add DetectOpenHandles

See merge request pleroma/admin-fe!177
This pull request has changes conflicting with the target branch.
  • CHANGELOG.md
  • package.json
  • src/api/__mocks__/emojiPacks.js
  • src/api/__mocks__/mediaProxyCache.js
  • src/api/__mocks__/mediaUpload.js
  • src/api/__mocks__/moderationLog.js
  • src/api/__mocks__/relays.js
  • src/api/__mocks__/settings.js
  • src/icons/svg/tiptap-add_col_after.svg
  • src/icons/svg/tiptap-add_col_before.svg
  • src/icons/svg/tiptap-add_row_after.svg
  • src/icons/svg/tiptap-add_row_before.svg
  • src/icons/svg/tiptap-bold.svg
  • src/icons/svg/tiptap-checklist.svg
  • src/icons/svg/tiptap-code.svg
  • src/icons/svg/tiptap-combine_cells.svg
  • src/icons/svg/tiptap-delete_col.svg
  • src/icons/svg/tiptap-delete_row.svg
  • src/icons/svg/tiptap-delete_table.svg
  • src/icons/svg/tiptap-github.svg
  • src/icons/svg/tiptap-hr.svg
  • src/icons/svg/tiptap-image.svg
  • src/icons/svg/tiptap-italic.svg
  • src/icons/svg/tiptap-link.svg
  • src/icons/svg/tiptap-ol.svg
  • src/icons/svg/tiptap-paragraph.svg
  • src/icons/svg/tiptap-quote.svg
  • src/icons/svg/tiptap-redo.svg
  • src/icons/svg/tiptap-remove.svg
  • src/icons/svg/tiptap-strike.svg
  • src/icons/svg/tiptap-table.svg
  • src/icons/svg/tiptap-ul.svg
  • src/icons/svg/tiptap-underline.svg
  • src/icons/svg/tiptap-undo.svg
  • src/lang/en.js
  • src/store/modules/emojiPacks.js
  • src/store/modules/normalizers.js
  • src/store/modules/reports.js
  • src/store/modules/settings.js
  • src/store/modules/users.js
  • src/views/reports/components/ModerateUserDropdown.vue
  • src/views/reports/components/Report.vue
  • src/views/settings/components/Authentication.vue
  • src/views/settings/components/Emoji.vue
  • src/views/settings/components/Inputs.vue
  • src/views/settings/components/Instance.vue
  • src/views/settings/components/Other.vue
  • src/views/settings/components/inputComponents/EditorInput.vue
  • src/views/settings/components/tabs.js
  • src/views/styles/settings.scss
  • src/views/users/components/ModerationDropdown.vue
  • src/views/users/components/MultipleUsersMenu.vue
  • test/views/layout/index.test.js
  • test/views/mediaProxyCache/index.test.js
  • test/views/settings/formSearchObject.test.js
  • test/views/users/index.test.js
  • test/views/users/usersFilters.test.js
  • yarn.lock
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin gitlab-mr-iid-178:gitlab-mr-iid-178
git switch gitlab-mr-iid-178

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch develop
git merge --no-ff gitlab-mr-iid-178
git switch gitlab-mr-iid-178
git rebase develop
git switch develop
git merge --ff-only gitlab-mr-iid-178
git switch gitlab-mr-iid-178
git rebase develop
git switch develop
git merge --no-ff gitlab-mr-iid-178
git switch develop
git merge --squash gitlab-mr-iid-178
git switch develop
git merge --ff-only gitlab-mr-iid-178
git switch develop
git merge gitlab-mr-iid-178
git push origin develop
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
blocked

   
stale
No labels
blocked
stale
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
pleroma/admin-fe!410
No description provided.