mirror of https://framagit.org/tykayn/mastodon.git
a2a64ecd3e
Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close. |
||
|---|---|---|
| .. | ||
| _mixins.scss | ||
| about.scss | ||
| accessibility.scss | ||
| accounts.scss | ||
| admin.scss | ||
| basics.scss | ||
| boost.scss | ||
| compact_header.scss | ||
| components.scss | ||
| containers.scss | ||
| dashboard.scss | ||
| emoji_picker.scss | ||
| footer.scss | ||
| forms.scss | ||
| introduction.scss | ||
| lists.scss | ||
| modal.scss | ||
| reset.scss | ||
| rtl.scss | ||
| stream_entries.scss | ||
| tables.scss | ||
| variables.scss | ||
| widgets.scss | ||