This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire e2a2bc9021 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated copyright year, we don't mention it so kept our version. - `app/controllers/admin/dashboard_controller.rb`: Not really a conflict, upstream change (removing the spam checker) too close to glitch-soc changes. Ported upstream changes. - `app/models/form/admin_settings.rb`: Same. - `app/services/remove_status_service.rb`: Same. - `app/views/admin/settings/edit.html.haml`: Same. - `config/settings.yml`: Same. - `config/environments/production.rb`: Not a real conflict, upstream added a default HTTP header, but we have extra headers in glitch-soc. Added the header.		2021-04-20 12:17:14 +02:00
..
avatars/original	…
emoji	Add border to 🚲 emoji (#16035)	2021-04-13 23:43:51 +02:00
headers/original	…
ocr/lang-data	Add OCR tool to media editing modal (#11566)	2019-08-15 15:13:26 +02:00
shortcuts	Add app shortcuts (#15234)	2020-12-15 02:04:56 +01:00
sounds	…
500.html	…
android-chrome-192x192.png	…
apple-touch-icon.png	…
background-cybre.png	…
badge.png	…
browserconfig.xml	…
clock.js	…
embed.js	…
favicon-dev.ico	…
favicon.ico	…
inert.css	Remove 'unsafe-inline' from Content-Security-Policy style-src (#13679)	2020-05-08 21:22:57 +02:00
logo-cybre-glitch.gif	…
mask-icon.svg	…
mstile-150x150.png	…
oops.gif	…
oops.png	Change error graphic to hover-to-play (#10055)	2019-02-15 23:33:25 +01:00
riot-glitch.png	…
robots.txt	Disallow robots from indexing /interact/ (#10666)	2019-05-02 00:10:19 +02:00
sw.js	…
web-push-icon_expand.png	…
web-push-icon_favourite.png	…
web-push-icon_reblog.png	…