AkkomaGang
/
akkoma-fe
4
13
Fork 56
Code Issues 72 Pull Requests 16 Projects Releases 1 Wiki Activity

emoji-picker-emoji #163

Closed
Beefox wants to merge 28 commits from Beefox/fox-fe:emoji-picker-emoji into develop
pull from: Beefox/fox-fe:emoji-picker-emoji
merge into: AkkomaGang:develop
Conversation 4 Commits 28 Files Changed 24 +1789 -785
Beefox commented 2022-09-10 06:51:11 +00:00
Contributor
Copy Link

While obviously you can just enter an emoji straight into the text file, this is impossible for reactions.
At current searching for 💛 returns no results, it is expected to return the 💛 emoji.
This feature adds a test for this when searching for emoji.

(this should only be one commit idk why its 147, as it is up to date with develop...)

While obviously you can just enter an emoji straight into the text file, this is impossible for reactions. At current searching for `💛` returns no results, it is expected to return the `💛` emoji. This feature adds a test for this when searching for emoji. (this should only be one commit idk why its 147, as it is up to date with develop...)
floatingghost commented 2022-09-11 21:41:59 +00:00
Owner
Copy Link

woah yeah this has a whole load of conflicts with develop

you need to rebase your feature branch on top of develop

woah yeah this has a whole load of conflicts with develop you need to rebase your feature branch on top of develop
Beefox force-pushed emoji-picker-emoji from 75379c1e12 to f8f5db823d 2022-09-22 01:01:58 +00:00 Compare
Beefox commented 2022-09-22 01:02:53 +00:00
Author
Contributor
Copy Link

ok i rebased and all that jazz, conflicts should be gone, still unsure of why commits already part of develop are showing up here though

ok i rebased and all that jazz, conflicts should be gone, still unsure of why commits already part of develop are showing up here though
Beefox force-pushed emoji-picker-emoji from f8f5db823d to c858bf49bd 2022-09-22 01:14:05 +00:00 Compare
Beefox added 1 commit 2022-09-24 23:27:02 +00:00
ci/woodpecker/pr/woodpecker Pipeline failed Details
7b1a030807 Merge branch 'develop' into emoji-picker-emoji
Mergan commented 2022-11-17 23:27:43 +00:00
Member
Copy Link

Would ye kindly re-make the PR?

Would ye kindly re-make the PR?
Mergan added the
Feature
 label 2022-11-17 23:28:18 +00:00
Beefox commented 2022-11-19 07:36:35 +00:00
Author
Contributor
Copy Link

remaking pr

remaking pr
Beefox closed this pull request 2022-11-19 07:36:40 +00:00
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline failed
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
a11y

Issues and PRs about accessibility

  
Bug

Applies to issues describing bugs

  
Bug fix

Pull requests that squash bugs

  
Critical Priority

   
Documentation

  
Feature

Pull requests that implement new features

  
Feature request

Issues that request new features

  
Held for next release cycle

PR reviewed during release candidate phase, approved and held as PR

  
High Priority

   
Low Priority

   
Medium Priority

   
Minor change

For minor changes, ie CSS alignment changes

  
Translation/Locale

For changes related to translations

  
WIP

Work in progress

No Label
a11y
Bug
Bug fix
Critical Priority
Documentation
Feature
Feature request
Held for next release cycle
High Priority
Low Priority
Medium Priority
Minor change
Translation/Locale
WIP
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
3 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: AkkomaGang/akkoma-fe#163
No description provided.
Delete Branch "Beefox/fox-fe:emoji-picker-emoji"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?