Claire aaa9ec340b Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/formatter.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.
- `app/models/status.rb`:
  Upstream refactored status edit handling and moved code to
  `app/models/concerns/status_snapshot_concern.rb`.
  Applied glitch-soc's changes to that file.
- `app/serializers/activitypub/note_serializer.rb`:
  Not really a conflict, just a line added too close to one modified by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc-modified one.
- `app/services/update_status_service.rb`:
  Not really a conflict, upstream modified a line adjacent to one added by
  glitch-soc.
  Applied upstream changes while keeping the glitch-soc line.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream refactored formatting, glitch-soc changed the markup slightly.
  Applied upstream changes.
- `spec/lib/formatter_spec.rb`:
  Upstream completely refactored the formatting code and removed that file,
  while glitch-soc had code for Markdown and HTML toots.
  Took upstream code, glitch-soc changes will be re-implemented on top of the
  refactored classes in a later commit.
2022-03-26 19:18:55 +01:00
2022-03-15 22:11:09 +09:00
2021-03-24 10:44:31 +01:00
2022-02-11 15:01:40 +01:00
2016-02-20 22:53:20 +01:00
2017-12-03 23:26:40 -08:00
2017-07-27 22:30:27 +02:00
2016-02-25 00:17:01 +01:00
2021-11-24 20:29:05 +01:00
2019-06-06 18:51:46 +02:00
2017-07-27 22:30:27 +02:00
2022-02-14 16:08:02 +01:00
2022-03-15 08:16:45 +01:00
2022-03-26 02:54:11 +01:00
2022-03-19 09:24:26 +01:00
2021-11-23 00:15:31 +01:00
2020-04-27 17:19:53 +02:00
2018-06-26 20:34:12 +02:00
2016-02-20 22:53:20 +01:00
2022-03-15 08:16:45 +01:00

Mastodon Glitch Edition

Now with automated deploys!

Build Status Code Climate

So here's the deal: we all work on this code, and anyone who uses that does so absolutely at their own risk. can you dig it?

Description
Custom front end for Mastodon
Readme 222 MiB
Languages
Ruby 40.4%
JavaScript 39.5%
SCSS 15.9%
Haml 3.9%
HTML 0.1%