pleroma/pleroma-fe
0
0
Fork 0
Code Issues 343 Pull requests 27 Projects Releases Packages Wiki Activity

Add a way to upload new packs from URL/ZIP file #3266

Open
vaartis wants to merge 1 commit from gitlab-mr-iid-1999 into develop
pull from: gitlab-mr-iid-1999
merge into: pleroma:develop
Conversation 1 Commits 1 Files changed 4 +121 -4
vaartis commented 2025-01-21 09:48:40 +00:00
Member
Copy link

Changes

  • Adds a submenu to the emoji admin panel that allows you to upload a new pack .zip file or download a pack from a URL

Depends on pleroma!4314

(Screenshots pending)

# Changes * Adds a submenu to the emoji admin panel that allows you to upload a new pack .zip file or download a pack from a URL Depends on pleroma!4314 (Screenshots pending)
hj commented 2025-01-21 09:54:19 +00:00
Owner
Copy link

dl should be download, also on lower line as well

`dl` should be `download`, also on lower line as well
This pull request has changes conflicting with the target branch.
  • src/components/settings_modal/admin_tabs/emoji_tab.js
  • src/components/settings_modal/admin_tabs/emoji_tab.vue
  • src/services/api/api.service.js
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-1999:gitlab-mr-iid-1999
git switch gitlab-mr-iid-1999

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-1999
git switch gitlab-mr-iid-1999
git rebase develop
git switch develop
git merge --ff-only gitlab-mr-iid-1999
git switch gitlab-mr-iid-1999
git rebase develop
git switch develop
git merge --no-ff gitlab-mr-iid-1999
git switch develop
git merge --squash gitlab-mr-iid-1999
git switch develop
git merge --ff-only gitlab-mr-iid-1999
git switch develop
git merge gitlab-mr-iid-1999
git push origin develop
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
BE Request

   
Backlog

   
Better behavior

   
Blocked by deps

   
Bug

   
Code Review

   
Discussion

   
Doing

   
Feature Request / Enhancement

   
In the shining bright future maybe

   
It's complicated

   
MS Edge

   
Mememoon (or other niche browsers)

   
Missing API

   
Missing feature

   
Missing l10n/i18n

   
NL1

Instance Admin Dashboard

  
NL2

Improved Mobile Experience

  
NL4

Improved instance customization and QoL options

  
Need to verify on develop

   
RELEASE BLOCKER

   
Reassign or Close

   
Refactor

   
Regression

   
Safari

   
To Do

   
User story

   
Waiting on godot

   
accessibility

https://git.pleroma.social/pleroma/pleroma-fe/-/snippets/7746

  
better documentation

   
chore

   
confirmed

   
easy ticket

   
incident

Denotes a disruption to IT services and the associated issues require immediate attention

  
l10n update

   
mastoapi

   
mobile

   
needs design

   
needs-info

   
needs-review

   
stupid
No labels
BE Request
Backlog
Better behavior
Blocked by deps
Bug
Code Review
Discussion
Doing
Feature Request / Enhancement
In the shining bright future maybe
It's complicated
MS Edge
Mememoon (or other niche browsers)
Missing API
Missing feature
Missing l10n/i18n
NL1
NL2
NL4
Need to verify on develop
RELEASE BLOCKER
Reassign or Close
Refactor
Regression
Safari
To Do
User story
Waiting on godot
accessibility
better documentation
chore
confirmed
easy ticket
incident
l10n update
mastoapi
mobile
needs design
needs-info
needs-review
stupid
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/pleroma-fe!3266
No description provided.