Merge remote-tracking branch 'origin/develop' into shigusegubu
* origin/develop: (41 commits) Apply suggestion to src/components/notifications/notifications.js fix height for emoji panel of settings modal Add bookmarks FE part of BE issue 1586 provide index md change alert popup alpha add follow request users to store make the addNotice dispatch return the notice change storage error one-off into a global notice system remove accidental log revert accidental change in instance.js update the message and changelog catch localforage error and let the application work, add an alert for user to dismiss document the 'mark-as-read-detection' system allow overscrolling enough to not have FAB block interactables add initial fetching back in a more streamlined way remove unnecessary fetchAndUpdate, change notifications fetcher to not double fetch change Show New text to Reload when flushing Make use of backend reply filtering update changelog for reply-to strikethrough add no-statusId support for status popover ...
This commit is contained in:
commit
7d81d11338
52 changed files with 824 additions and 193 deletions
12
static/fontello.json
Executable file → Normal file
12
static/fontello.json
Executable file → Normal file
|
|
@ -375,6 +375,18 @@
|
|||
"css": "download",
|
||||
"code": 59429,
|
||||
"src": "fontawesome"
|
||||
},
|
||||
{
|
||||
"uid": "f04a5d24e9e659145b966739c4fde82a",
|
||||
"css": "bookmark",
|
||||
"code": 59430,
|
||||
"src": "fontawesome"
|
||||
},
|
||||
{
|
||||
"uid": "2f5ef6f6b7aaebc56458ab4e865beff5",
|
||||
"css": "bookmark-empty",
|
||||
"code": 61591,
|
||||
"src": "fontawesome"
|
||||
}
|
||||
]
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue