Baptiste Lemoine
e50cb7160a
🐛 add icons in dropdown menu, fix style for this dropdown
...
Merge remote-tracking branch 'origin'
Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com>
# Conflicts:
# .ruby-version
# app/javascript/mastodon/components/status.js
# app/javascript/mastodon/features/direct_timeline/components/conversation.js
# app/javascript/mastodon/features/getting_started/components/announcements.js
# app/javascript/mastodon/locales/fr.json
# config/locales/kab.yml
# config/locales/ta.yml
# yarn.lock
2020-04-09 17:33:58 +02:00
mayaeh
310d729745
Change the string "hidden" to "blocked" in WebUI ( #13221 )
...
* Change the string "hidden" to "blocked" in WebUI.
* update
2020-03-09 09:13:21 +01:00
Clar Charr
6513f6c953
Replace unlock-alt icon with unlock ( #9952 )
2019-01-31 13:45:15 +01:00
Yamagishi Kazutoshi
0ddbccf7e6
Upgrade Babel to version 7.0.0 ( #5925 )
2018-09-14 17:59:48 +02:00
ThibG
a6c129ddbd
Add some UI for user-defined domain blocks ( #6628 )
...
* Keep list of blocked domains
Might be overkill, but I'm trying to follow the same logic as for blocked users
* Add basic domain block UI
* Add the domain blocks UI to Getting Started
* Fix undefined URL in `fetchDomainBlocks`
* Update all known users' domain_blocking relationship instead of just one's
2018-03-30 12:38:00 +02:00