Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Full Custom emoji & Sticker support #686

Merged
merged 39 commits into from
Aug 6, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b0cd26d
Remove comments
ajbura Jul 13, 2022
295a5be
Show custom emoji first in suggestions
ajbura Jul 16, 2022
11334f9
Show global image packs in emoji picker
ajbura Jul 16, 2022
b2342ec
Display emoji and sticker in room settings
ajbura Jul 26, 2022
4d76b59
Fix some pack not visible in emojiboard
ajbura Jul 26, 2022
dbbb607
WIP
ajbura Jul 27, 2022
15e8412
Add/delete/rename images to exisitng packs
ajbura Jul 30, 2022
458738f
Change pack avatar, name & attribution
ajbura Jul 31, 2022
3f7ba56
Add checkbox to make pack global
ajbura Jul 31, 2022
f99e792
Bug fix
ajbura Jul 31, 2022
11c3d3b
Create or delete pack
ajbura Jul 31, 2022
6e1cf62
Add personal emoji in settings
ajbura Aug 3, 2022
4c66164
Show global pack selector in settings
ajbura Aug 3, 2022
89eb133
Remove comments
ajbura Jul 13, 2022
5325485
Show custom emoji first in suggestions
ajbura Jul 16, 2022
d678b05
Show global image packs in emoji picker
ajbura Jul 16, 2022
4fd2d3a
Display emoji and sticker in room settings
ajbura Jul 26, 2022
5816ec7
Fix some pack not visible in emojiboard
ajbura Jul 26, 2022
7d8c4ce
WIP
ajbura Jul 27, 2022
6ae79e0
Add/delete/rename images to exisitng packs
ajbura Jul 30, 2022
91b18cc
Change pack avatar, name & attribution
ajbura Jul 31, 2022
9174d6d
Add checkbox to make pack global
ajbura Jul 31, 2022
f646daa
Bug fix
ajbura Jul 31, 2022
42a8daa
Create or delete pack
ajbura Jul 31, 2022
d05c03c
Add personal emoji in settings
ajbura Aug 3, 2022
5fb2958
Show global pack selector in settings
ajbura Aug 3, 2022
b5788a4
Merge branch 'custom-emoji-viewer' of https://github.com/ajbura/cinny…
ajbura Aug 3, 2022
b0741fa
Show space emoji in emojiboard
ajbura Aug 4, 2022
519f620
Send custom emoji reaction as mxc
ajbura Aug 4, 2022
a33cefe
Render stickers as stickers
ajbura Aug 4, 2022
c803106
Fix sticker jump bug
ajbura Aug 4, 2022
0f5ced7
Fix reaction width
ajbura Aug 4, 2022
46a72ae
Fix stretched custom emoji
ajbura Aug 4, 2022
7abd8ae
Fix sending space emoji in message
ajbura Aug 4, 2022
5ad03da
Remove unnessesary comments
ajbura Aug 5, 2022
c0a10e9
Send user pills
ajbura Aug 5, 2022
bcd2bff
Fix pill generating regex
ajbura Aug 5, 2022
aa6fb59
Add support for sending stickers
ajbura Aug 5, 2022
1ac7906
Merge branch 'dev' into custom-emoji-viewer
ajbura Aug 5, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions public/res/ic/outlined/sticker.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/app/atoms/button/Button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
&--icon {
@include dir.side(padding, var(--sp-tight), var(--sp-loose));

.ic-raw {
@include dir.side(margin, 0, var(--sp-extra-tight));
flex-shrink: 0;
}
}
.ic-raw {
@include dir.side(margin, 0, var(--sp-extra-tight));
flex-shrink: 0;
}
}

Expand Down
Loading