me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
glitchier-soc/app/views/admin/custom_emojis
History
Claire 8e04ac45be Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/account.rb`:
  Not a real conflict, just upstream getting rid of unused constants too close
  to glitch-soc-specific contents.
  Removed unused constants like upstream did.
- `app/models/trends.rb`:
  Conflict because glitch-soc disabled email notifications for trending links.
  Upstream has refactored this quite a bit and added trending posts.
  Took upstream code, but disabling the extra trending stuff will come in
  another commit.
- `app/views/admin/trends/links/index.html.haml`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes accordingly.
2022-02-26 09:29:23 +01:00
..
_custom_emoji.html.haml Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
index.html.haml Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
new.html.haml Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00