aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,734 Commits
135 Branches
278 Tags
1.0 GiB
Commit Graph

10 Commits (c6ef56fd5e8f2648a256ae1479ddc28d0164c602)

Author SHA1 Message Date
Eugen Rochko 45aa5781ce
Change brand color and logotypes () 
- Add rake task for generating Apple/Android icons and favicons from SVG
- Add rake task for generating PNG icons and logos for e-mails from SVG
- Remove obsolete Microsoft icons and configuration
- Remove PWA shortcut icons
Eugen Rochko cefa526c6d
Refactor formatter () 
* Refactor formatter

* Move custom emoji pre-rendering logic to view helpers

* Move more methods out of Formatter

* Fix code style issues

* Remove Formatter

* Add inline poll options to RSS feeds

* Remove unused helper method

* Fix code style issues

* Various fixes and improvements

* Fix test
Eugen Rochko 564efd0651
Add appeals () 
* Add appeals

* Add ability to reject appeals and ability to browse pending appeals in admin UI

* Add strikes to account page in settings

* Various fixes and improvements

- Add separate notification setting for appeals, separate from reports
- Fix style of links in report/strike header
- Change approving an appeal to not restore statuses (due to federation complexities)
- Change style of successfully appealed strikes on account settings page
- Change account settings page to only show unappealed or recently appealed strikes

* Change appealed_at to overruled_at

* Fix missing method error
Eugen Rochko 14f436c457
Add notifications for statuses deleted by moderators ()
Eugen Rochko 3a3b40e0c3
Fix nil error in warning e-mail template ()
Eugen Rochko 92a6fa6c90
Fix error in user warning template ()
Eugen Rochko 14996496a5
Fix error in warning e-mail template ()
Eugen Rochko 73ca0bb925
Add option to include reported statuses in warning e-mail ()
Yamagishi Kazutoshi 8347479f5d Bump webpacker from 3.5.5 to 4.0.2 () 
Bumps [webpacker](https://github.com/rails/webpacker) from 3.5.5 to 4.0.2.
- [Release notes](https://github.com/rails/webpacker/releases)
- [Changelog](https://github.com/rails/webpacker/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/webpacker/compare/v3.5.5...v4.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
Eugen Rochko 3c033c4352
Add moderation warnings () 
* Add moderation warnings

Replace individual routes for disabling, silencing, and suspending
a user, as well as the report update route, with a unified account
action controller that allows you to select an action (none,
disable, silence, suspend) as well as whether it should generate an
e-mail notification with optional custom text. That notification,
with the optional custom text, is saved as a warning.

Additionally, there are warning presets you can configure to save
time when performing the above.

* Use Account#local_username_and_domain