Thibaut Girka 61631f4751 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- README.md
- app/javascript/styles/mastodon/components.scss
  conflicts caused by image URLs being different
- app/models/status.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline
- app/views/statuses/_simple_status.html.haml
- config/locales/en.yml
  some strings were changed upstream
- spec/models/status_spec.rb
  as_home_timeline removed, kept glitch-soc-only as_direct_timeline

2019-10-10 17:26:08 +02:00

..

_mixins.scss

Fix placeholder colors for inputs not being explicitly defined (#11890)

2019-09-19 19:58:40 +02:00

about.scss

Fix long domain block descriptions breaking table layout (#12029)

2019-10-01 04:54:29 +02:00

accessibility.scss

Add a few black emojis that are to have a white outline (#8597)

2018-09-10 18:26:47 +02:00

accounts.scss

Fix profile fields overflowing page width (#11828)

2019-09-13 19:15:59 +02:00

admin.scss

Merge branch 'master' into glitch-soc/merge-upstream

2019-09-30 12:23:57 +02:00

basics.scss

Add error description and button to copy stack trace to web UI (#12033)

2019-10-01 20:48:49 +02:00

boost.scss

Redesign forms, verify link ownership with rel="me" (#8703)

2018-09-18 16:45:58 +02:00

compact_header.scss

Separate high contrast theme (#7213)

2018-04-21 21:35:55 +02:00

components.scss

Merge branch 'master' into glitch-soc/merge-upstream

2019-10-10 17:26:08 +02:00

containers.scss

Fix media editing modal and profile directory in light theme (#12059)

2019-10-03 03:17:29 +02:00

dashboard.scss

Fix height of dashboard counters (#11736)

2019-09-02 18:11:34 +02:00

emoji_picker.scss

Fix sass-lint config (#10982)

2019-06-06 18:51:46 +02:00

footer.scss

Fix Mastodon logo style on hover on public pages' footer (#11735)

2019-09-02 18:12:12 +02:00

forms.scss

Fix placeholder colors for inputs not being explicitly defined (#11890)

2019-09-19 19:58:40 +02:00

introduction.scss

Fix performance of home feed regeneration (#12084)

2019-10-06 22:11:17 +02:00

lists.scss

Restore vanilla components

2017-11-17 19:29:16 -08:00

modal.scss

Merge branch 'master' into glitch-soc/tentative-merge

2018-07-09 07:13:59 +02:00

polls.scss

Fix vote checkmark in poll results (#11990)

2019-09-28 19:41:36 +02:00

reset.scss

Fix Firefox scrollbar color regression in #9210 (#9908)

2019-01-24 13:32:23 +01:00

rtl.scss

Fix issues in RTL layout in web UI (#12060)

2019-10-03 03:17:41 +02:00

statuses.scss

Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)

2019-07-07 16:16:51 +02:00

tables.scss

Fix public list of domain blocks being too verbose on about page (#11967)

2019-09-29 16:23:01 +02:00

variables.scss

Separate font-family into variable (#8763)

2018-09-23 20:41:24 +02:00

widgets.scss

Add table of contents to about page (#11885)

2019-09-19 11:09:05 +02:00