mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-25 10:58:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
15592 commits 5 branches 147 tags 265 MiB
Commit graph

9638 commits

Author SHA1 Message Date
Jeremy Kescher
c07857bb2b
Merge remote-tracking branch 'upstream/main' into develop 2022-07-05 09:50:33 +02:00
Jeremy Kescher
550a0fa08a
Exclude /api/v1/custom_emojis from secure fetch (unless allowlist mode is enabled) 2022-07-05 09:49:31 +02:00
Claire
7cc76b823a Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 08:49:22 +02:00
Jeremy Kescher
ce001a5e62
Merge remote-tracking branch 'upstream/main' into develop 2022-07-04 11:55:24 +02:00
Claire
1b4054256f
Fix crash when a remote Flag activity mentions a private post (#18760) 
* Add tests

* Fix crash when a remote Flag activity mentions a private post
 2022-07-04 11:08:30 +02:00
Claire
1418574447 Merge branch 'main' into glitch-soc/merge-upstream 2022-07-03 21:36:15 +02:00
Jeremy Kescher
54426b77d0
ip_cleanup_scheduler: Introduce separate session retention period 2022-07-03 10:41:48 +02:00
Jeremy Kescher
c5e0fac088
ip_cleanup_scheduler: Stop destroying sessions, replace IP with nil instead 2022-07-03 08:48:35 +02:00
Claire
a233a9bfb5
Remove dead code in WebUI filtering code (#18745) 2022-06-30 10:39:29 +02:00
Claire
3c24f19afe
Fix reblogged statuses being erroneously shown as filtered (#18744) 2022-06-30 09:51:55 +02:00
Jeremy Kescher
241aa5a98e
Merge remote-tracking branch 'upstream/main' into develop 2022-06-29 22:35:47 +02:00
Jeong Arm
df27953f96
Support audio/vnd.wave (#18737) 
See: https://datatracker.ietf.org/doc/html/rfc2361
And Misskey uses this mime type for wav file.
 2022-06-28 19:49:35 +02:00
Eugen Rochko
485b43ed7e [Glitch] Add notifications for new reports 
Port 2936f42a14 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-06-28 13:13:10 +02:00
Claire
f218e633b4 [Glitch] [SSR only] Revamp post filtering system 
Port CSS and JS for Server-Side Rendered pages from 02851848e9

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-06-28 11:35:28 +02:00
mayaeh
97f81577f1 [Glitch] Fixed the setting page's logo that is not displayed on the smartphone 
Port 65ad589848 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-06-28 11:21:58 +02:00
Claire
fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
 2022-06-28 11:11:18 +02:00
Claire
02851848e9
Revamp post filtering system (#18058) 
* Add model for custom filter keywords

* Use CustomFilterKeyword internally

Does not change the API

* Fix /filters/edit and /filters/new

* Add migration tests

* Remove whole_word column from custom_filters (covered by custom_filter_keywords)

* Redesign /filters

Instead of a list, present a card that displays more information and handles
multiple keywords per filter.

* Redesign /filters/new and /filters/edit to add and remove keywords

This adds a new gem dependency: cocoon, as well as a npm dependency:
cocoon-js-vanilla. Those are used to easily populate and remove form fields
from the user interface when manipulating multiple keyword filters at once.

* Add /api/v2/filters to edit filter with multiple keywords

Entities:
- `Filter`: `id`, `title`, `filter_action` (either `hide` or `warn`), `context`
  `keywords`
- `FilterKeyword`: `id`, `keyword`, `whole_word`

API endpoits:
- `GET /api/v2/filters` to list filters (including keywords)
- `POST /api/v2/filters` to create a new filter
  `keywords_attributes` can also be passed to create keywords in one request
- `GET /api/v2/filters/:id` to read a particular filter
- `PUT /api/v2/filters/:id` to update a new filter
  `keywords_attributes` can also be passed to edit, delete or add keywords in
   one request
- `DELETE /api/v2/filters/:id` to delete a particular filter
- `GET /api/v2/filters/:id/keywords` to list keywords for a filter
- `POST /api/v2/filters/:filter_id/keywords/:id` to add a new keyword to a
   filter
- `GET /api/v2/filter_keywords/:id` to read a particular keyword
- `PUT /api/v2/filter_keywords/:id` to edit a particular keyword
- `DELETE /api/v2/filter_keywords/:id` to delete a particular keyword

* Change from `irreversible` boolean to `action` enum

* Remove irrelevent `irreversible_must_be_within_context` check

* Fix /filters/new and /filters/edit with update for filter_action

* Fix Rubocop/Codeclimate complaining about task names

* Refactor FeedManager#phrase_filtered?

This moves regexp building and filter caching to the `CustomFilter` class.

This does not change the functional behavior yet, but this changes how the
cache is built, doing per-custom_filter regexps so that filters can be matched
independently, while still offering caching.

* Perform server-side filtering and output result in REST API

* Fix numerous filters_changed events being sent when editing multiple keywords at once

* Add some tests

* Use the new API in the WebUI

- use client-side logic for filters we have fetched rules for.
  This is so that filter changes can be retroactively applied without
  reloading the UI.
- use server-side logic for filters we haven't fetched rules for yet
  (e.g. network error, or initial timeline loading)

* Minor optimizations and refactoring

* Perform server-side filtering on the streaming server

* Change the wording of filter action labels

* Fix issues pointed out by linter

* Change design of “Show anyway” link in accordence to review comments

* Drop “irreversible” filtering behavior

* Move /api/v2/filter_keywords to /api/v1/filters/keywords

* Rename `filter_results` attribute to `filtered`

* Rename REST::LegacyFilterSerializer to REST::V1::FilterSerializer

* Fix systemChannelId value in streaming server

* Simplify code by removing client-side filtering code

The simplifcation comes at a cost though: filters aren't retroactively
applied anymore.
 2022-06-28 09:42:13 +02:00
Eugen Rochko
2936f42a14
Add notifications for new reports (#18697) 2022-06-27 09:30:15 +02:00
Jeremy Kescher
c3b6f263b3
Fix "undefined method ago for 86400:Integer" 2022-06-27 00:28:39 +02:00
Jeremy Kescher
97d03110ed
Allow modifying IP retention period 
To allow IP addresses to not be stored for an entire year.
This attempts to fix https://github.com/mastodon/mastodon/issues/6474 for Catstodon.
 2022-06-27 00:09:17 +02:00
Eugen Rochko
829b978a89
New Crowdin updates (#18671) 
* New translations en.json (Esperanto)

* New translations en.json (Esperanto)

* New translations en.json (Esperanto)

* New translations en.yml (Korean)

* New translations simple_form.en.yml (Korean)

* New translations activerecord.en.yml (Korean)

* New translations en.yml (German)

* New translations en.yml (Dutch)

* New translations simple_form.en.yml (Dutch)

* New translations activerecord.en.yml (Dutch)

* New translations en.yml (Dutch)

* New translations en.yml (Icelandic)

* New translations en.yml (Icelandic)

* New translations simple_form.en.yml (Icelandic)

* New translations activerecord.en.yml (Icelandic)

* New translations en.yml (Thai)

* New translations en.json (Thai)

* New translations simple_form.en.yml (Thai)

* New translations activerecord.en.yml (Thai)

* New translations activerecord.en.yml (Indonesian)

* New translations en.yml (Turkish)

* New translations en.json (Galician)

* New translations en.yml (Slovenian)

* New translations en.yml (Galician)

* New translations en.json (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.json (Esperanto)

* New translations en.json (Esperanto)

* New translations en.yml (Galician)

* New translations en.json (Esperanto)

* New translations en.json (Esperanto)

* New translations en.json (Esperanto)

* New translations simple_form.en.yml (Galician)

* New translations en.json (Esperanto)

* New translations en.json (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.yml (Esperanto)

* New translations en.json (Esperanto)

* New translations en.yml (Ukrainian)

* New translations en.yml (Ukrainian)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2022-06-26 12:08:08 +09:00
Claire
35588d09e2
Add /api/v1/admin/domain_allows (#18668) 
- `GET /api/v1/admin/domain_allows` lists allowed domains
- `GET /api/v1/admin/domain_allows/:id` shows one by ID
- `DELETE /api/v1/admin/domain_allows/:id` deletes a given domain from the list
  of allowed domains
- `POST /api/v1/admin/domain_allows` to allow a new domain:
  if that domain is already allowed, the existing DomainAllow will be returned
 2022-06-23 23:12:01 +02:00
Takeshi Umeda
9c571a95db
Fix missing , (#18660) 2022-06-23 23:10:03 +02:00
Jeong Arm
6c2d3038f4
Fix CDN_HOST not affected on full_asset_url (#18662) 
* Fix CDN_HOST not affected to assets url

* Fix typo
 2022-06-23 23:09:32 +02:00
mayaeh
65ad589848
Fixed the setting page's logo that is not displayed on the smartphone (#18710) 2022-06-23 23:08:52 +02:00
tateisu
47f2ff617d
use Notification::TYPES for api push subscription alerts (#18709) 2022-06-23 01:44:27 +02:00
Jeremy Kescher
06b9e14a03
Enable editing in web interface 2022-06-23 00:08:40 +02:00
Jeremy Kescher
3ad7552b1c
Merge remote-tracking branch 'upstream/main' into develop 2022-06-21 17:16:49 +02:00
Claire
327eed0076
Fix suspicious sign-in mails never being sent (#18599) 
* Add tests

* Fix suspicious sign-in mails never being sent
 2022-06-21 15:16:22 +02:00
Eugen Rochko
353e2c5d84 [Glitch] Fix contrast of some elements with new brand colors 
Port 0391b2a603 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-06-21 09:00:43 +02:00
Claire
0e74d4da59 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/dependabot.yml`:
  Changed upstream, while we modified it in glitch-soc to not get spammed
  by dependabot.
  Kept it removed.
- `README.md`:
  Changed upstream, which has a very different version.
  Discarded upstream changes.
 2022-06-21 08:28:59 +02:00
Eugen Rochko
0391b2a603
Fix contrast of some elements with new brand colors (#18691) 2022-06-19 08:18:08 +02:00
Jeremy Kescher
1e066f0108
Merge remote-tracking branch 'upstream/main' into develop 2022-06-16 22:41:04 +02:00
Claire
7a75bce1b4
Fix checkmark on interaction buttons with larger fonts (#1799) 
Fixes #1796
 2022-06-16 15:37:59 +02:00
Eugen Rochko
3f02157a94
New Crowdin updates (#18605) 
* New translations doorkeeper.en.yml (Indonesian)

* New translations simple_form.en.yml (Persian)

* New translations activerecord.en.yml (Persian)

* New translations doorkeeper.en.yml (Persian)

* New translations simple_form.en.yml (Tamil)

* New translations doorkeeper.en.yml (Tamil)

* New translations activerecord.en.yml (Marathi)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations activerecord.en.yml (Spanish, Argentina)

* New translations doorkeeper.en.yml (Spanish, Argentina)

* New translations simple_form.en.yml (Spanish, Mexico)

* New translations activerecord.en.yml (Spanish, Mexico)

* New translations doorkeeper.en.yml (Spanish, Mexico)

* New translations simple_form.en.yml (Bengali)

* New translations activerecord.en.yml (Bengali)

* New translations activerecord.en.yml (Asturian)

* New translations simple_form.en.yml (Scottish Gaelic)

* New translations activerecord.en.yml (Scottish Gaelic)

* New translations doorkeeper.en.yml (Scottish Gaelic)

* New translations simple_form.en.yml (Asturian)

* New translations doorkeeper.en.yml (Asturian)

* New translations doorkeeper.en.yml (Sinhala)

* New translations simple_form.en.yml (Occitan)

* New translations activerecord.en.yml (Occitan)

* New translations doorkeeper.en.yml (Occitan)

* New translations simple_form.en.yml (Serbian (Latin))

* New translations activerecord.en.yml (Serbian (Latin))

* New translations doorkeeper.en.yml (Serbian (Latin))

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations activerecord.en.yml (Kurmanji (Kurdish))

* New translations doorkeeper.en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Sorani (Kurdish))

* New translations activerecord.en.yml (Sinhala)

* New translations simple_form.en.yml (Chinese Traditional, Hong Kong)

* New translations simple_form.en.yml (English, United Kingdom)

* New translations activerecord.en.yml (English, United Kingdom)

* New translations simple_form.en.yml (Welsh)

* New translations activerecord.en.yml (Welsh)

* New translations doorkeeper.en.yml (Welsh)

* New translations activerecord.en.yml (Chinese Traditional, Hong Kong)

* New translations simple_form.en.yml (Sinhala)

* New translations doorkeeper.en.yml (Chinese Traditional, Hong Kong)

* New translations simple_form.en.yml (Tatar)

* New translations activerecord.en.yml (Tatar)

* New translations doorkeeper.en.yml (Tatar)

* New translations simple_form.en.yml (Malayalam)

* New translations activerecord.en.yml (Malayalam)

* New translations doorkeeper.en.yml (Malayalam)

* New translations simple_form.en.yml (Breton)

* New translations activerecord.en.yml (Breton)

* New translations doorkeeper.en.yml (Breton)

* New translations activerecord.en.yml (Sorani (Kurdish))

* New translations doorkeeper.en.yml (Sorani (Kurdish))

* New translations simple_form.en.yml (Ido)

* New translations activerecord.en.yml (Standard Moroccan Tamazight)

* New translations simple_form.en.yml (Standard Moroccan Tamazight)

* New translations doorkeeper.en.yml (Ido)

* New translations activerecord.en.yml (Ido)

* New translations doorkeeper.en.yml (Kabyle)

* New translations simple_form.en.yml (Corsican)

* New translations activerecord.en.yml (Kabyle)

* New translations simple_form.en.yml (Kabyle)

* New translations doorkeeper.en.yml (Sardinian)

* New translations activerecord.en.yml (Sardinian)

* New translations simple_form.en.yml (Sardinian)

* New translations doorkeeper.en.yml (Corsican)

* New translations activerecord.en.yml (Corsican)

* New translations doorkeeper.en.yml (Standard Moroccan Tamazight)

* New translations en.yml (Korean)

* New translations en.yml (Portuguese)

* New translations en.yml (Hungarian)

* New translations en.yml (Armenian)

* New translations en.yml (Dutch)

* New translations en.yml (Norwegian)

* New translations en.yml (Polish)

* New translations en.yml (Albanian)

* New translations en.yml (Basque)

* New translations en.yml (Turkish)

* New translations en.yml (Ukrainian)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Icelandic)

* New translations en.yml (Portuguese, Brazilian)

* New translations en.yml (Indonesian)

* New translations en.yml (Tamil)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Finnish)

* New translations en.yml (Greek)

* New translations en.yml (Galician)

* New translations en.yml (Slovak)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Swedish)

* New translations en.yml (Arabic)

* New translations en.yml (French)

* New translations en.yml (Spanish)

* New translations en.yml (Catalan)

* New translations en.yml (Hebrew)

* New translations en.yml (Italian)

* New translations en.yml (Japanese)

* New translations en.yml (Russian)

* New translations en.yml (Slovenian)

* New translations en.yml (German)

* New translations en.yml (Vietnamese)

* New translations en.yml (Thai)

* New translations en.yml (Scottish Gaelic)

* New translations en.yml (Occitan)

* New translations en.yml (Persian)

* New translations en.yml (Romanian)

* New translations en.yml (Bulgarian)

* New translations en.yml (Czech)

* New translations en.yml (Danish)

* New translations en.yml (Spanish, Mexico)

* New translations en.yml (Bengali)

* New translations en.yml (Corsican)

* New translations en.yml (Sardinian)

* New translations en.yml (Kabyle)

* New translations en.yml (Ido)

* New translations en.yml (Kurmanji (Kurdish))

* New translations simple_form.en.yml (Russian)

* New translations activerecord.en.yml (Russian)

* New translations simple_form.en.yml (Slovenian)

* New translations activerecord.en.yml (Slovenian)

* New translations simple_form.en.yml (Ukrainian)

* New translations activerecord.en.yml (Ukrainian)

* New translations en.yml (Sorani (Kurdish))

* New translations en.yml (Welsh)

* New translations en.yml (Norwegian Nynorsk)

* New translations en.yml (Kazakh)

* New translations en.yml (Estonian)

* New translations en.yml (Latvian)

* New translations en.yml (Malay)

* New translations en.yml (Esperanto)

* New translations en.yml (Asturian)

* New translations en.yml (Chinese Traditional, Hong Kong)

* New translations en.yml (Malayalam)

* New translations activerecord.en.yml (Asturian)

* New translations en.yml (Catalan)

* New translations activerecord.en.yml (Catalan)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Danish)

* New translations en.yml (Ido)

* New translations simple_form.en.yml (Danish)

* New translations activerecord.en.yml (Danish)

* New translations activerecord.en.yml (Italian)

* New translations activerecord.en.yml (Chinese Simplified)

* New translations simple_form.en.yml (Ido)

* New translations activerecord.en.yml (Ido)

* New translations en.yml (Korean)

* New translations en.yml (Chinese Traditional)

* New translations en.yml (Spanish, Argentina)

* New translations simple_form.en.yml (Chinese Traditional)

* New translations activerecord.en.yml (Chinese Traditional)

* New translations en.yml (Chinese Simplified)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Spanish, Mexico)

* New translations simple_form.en.yml (Spanish, Argentina)

* New translations activerecord.en.yml (Spanish, Argentina)

* New translations en.yml (Galician)

* New translations simple_form.en.yml (Galician)

* New translations activerecord.en.yml (Galician)

* New translations en.yml (Greek)

* New translations en.yml (Catalan)

* New translations en.yml (Afrikaans)

* New translations en.yml (Polish)

* New translations simple_form.en.yml (Afrikaans)

* New translations activerecord.en.yml (Afrikaans)

* New translations simple_form.en.yml (Polish)

* New translations activerecord.en.yml (Polish)

* New translations en.yml (Portuguese)

* New translations en.json (German)

* New translations simple_form.en.yml (Portuguese)

* New translations activerecord.en.yml (Portuguese)

* New translations en.yml (Italian)

* New translations en.yml (Russian)

* New translations en.yml (Turkish)

* New translations simple_form.en.yml (Turkish)

* New translations activerecord.en.yml (Turkish)

* New translations en.yml (Russian)

* New translations en.yml (Hungarian)

* New translations simple_form.en.yml (Hungarian)

* New translations activerecord.en.yml (Hungarian)

* New translations en.yml (French)

* New translations en.yml (Galician)

* New translations en.yml (French)

* New translations en.yml (Icelandic)

* New translations simple_form.en.yml (Galician)

* New translations simple_form.en.yml (French)

* New translations activerecord.en.yml (French)

* New translations en.yml (Italian)

* New translations simple_form.en.yml (Italian)

* New translations en.yml (Latvian)

* New translations en.json (Latvian)

* New translations simple_form.en.yml (Latvian)

* New translations activerecord.en.yml (Latvian)

* New translations en.yml (Kurmanji (Kurdish))

* New translations en.json (Latvian)

* New translations simple_form.en.yml (Kurmanji (Kurdish))

* New translations activerecord.en.yml (Kurmanji (Kurdish))

* New translations en.yml (Catalan)

* New translations simple_form.en.yml (Catalan)

* New translations en.yml (Chinese Traditional)

* New translations simple_form.en.yml (Chinese Traditional)

* New translations en.yml (Vietnamese)

* New translations en.yml (Vietnamese)

* New translations simple_form.en.yml (Vietnamese)

* New translations activerecord.en.yml (Vietnamese)

* New translations en.yml (Japanese)

* New translations simple_form.en.yml (Japanese)

* New translations activerecord.en.yml (Japanese)

* New translations en.yml (Czech)

* New translations en.yml (French)

* New translations en.yml (Czech)

* New translations en.json (Arabic)

* New translations en.yml (Slovak)

* New translations en.json (Slovak)

* New translations en.yml (Indonesian)

* New translations en.yml (Czech)

* New translations en.yml (Czech)

* New translations simple_form.en.yml (Czech)

* New translations activerecord.en.yml (Czech)

* New translations en.yml (Spanish, Argentina)

* New translations en.yml (Indonesian)

* New translations en.yml (Indonesian)

* New translations en.yml (Hebrew)

* New translations en.json (Hebrew)

* New translations simple_form.en.yml (Hebrew)

* New translations en.yml (Albanian)

* New translations en.json (Albanian)

* New translations simple_form.en.yml (Albanian)

* New translations activerecord.en.yml (Albanian)

* New translations devise.en.yml (Albanian)

* New translations en.yml (German)

* New translations en.json (German)

* New translations simple_form.en.yml (German)

* New translations activerecord.en.yml (German)

* New translations en.json (German)

* New translations en.yml (Spanish)

* New translations en.yml (Spanish)

* New translations simple_form.en.yml (Spanish)

* New translations activerecord.en.yml (Spanish)

* New translations en.json (Ido)

* New translations en.yml (Chinese Simplified)

* New translations en.json (Occitan)

* New translations en.json (Occitan)

* New translations en.json (Esperanto)

* New translations en.json (Esperanto)

* Run `yarn manage:translations`

* Run `bundle exec i18n-tasks normalize`

* New translations en.yml (Albanian)

* Run `bundle exec i18n-tasks normalize`

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2022-06-16 13:31:19 +09:00
Jeremy Kescher
0f889d3828
Update blobCat emoji URL in emoji picker 2022-06-14 00:20:43 +02:00
Jeremy Kescher
bad37d4102
Merge remote-tracking branch 'upstream/main' 
# Conflicts:
#	public/android-chrome-192x192.png
#	public/apple-touch-icon.png
#	public/browserconfig.xml
#	public/favicon.ico
#	public/mstile-150x150.png
 2022-06-13 23:47:34 +02:00
Jeremy Kescher
a6d7063be9
Make rate limits even less strict 2022-06-12 23:18:03 +02:00
Eugen Rochko
620b70c41e
Remove item titles from RSS feeds (#18640) 2022-06-12 02:48:03 +02:00
Eugen Rochko
fe2d6fe105
Fix wrong aspect ratio of logo in icons (#18639) 2022-06-11 20:32:02 +02:00
Claire
f938afee72 [Glitch] Fix logo gradient not working on some Safari and Blink-based browsers 
Port 37cd984acf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-06-11 00:09:20 +02:00
Eugen Rochko
b31c32fd61 [Glitch] Change brand color and logotypes 
Port SCSS changes from 45aa5781ce to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-06-11 00:09:20 +02:00
Claire
15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Our README is completely different. Discarded upstream changes.
- `app/javascript/packs/mailer.js`:
  We had removed the file. Move the changes to `app/javascript/core/mailer.js`.
 2022-06-11 00:08:41 +02:00
Jeremy Kescher
a2383b89e2
Merge remote-tracking branch 'upstream/main' 2022-06-10 23:11:12 +02:00
Claire
37cd984acf
Fix logo gradient not working on some Safari and Blink-based browsers (#18634) 
Works around https://bugs.chromium.org/p/chromium/issues/detail?id=258029
 2022-06-10 17:34:59 +02:00
Eugen Rochko
d064476c4a [Glitch] Add administrative webhooks 
Port SCSS changes from a2871cd747 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-06-10 17:04:02 +02:00
Claire
edaaf6a5e9 Merge branch 'main' into glitch-soc/merge-upstream 2022-06-10 11:51:43 +02:00
Eugen Rochko
45aa5781ce
Change brand color and logotypes (#18592) 
- Add rake task for generating Apple/Android icons and favicons from SVG
- Add rake task for generating PNG icons and logos for e-mails from SVG
- Remove obsolete Microsoft icons and configuration
- Remove PWA shortcut icons
 2022-06-09 22:25:23 +02:00
Eugen Rochko
a2871cd747
Add administrative webhooks (#18510) 
* Add administrative webhooks

* Fix error when webhook is deleted before delivery worker runs
 2022-06-09 21:57:36 +02:00
Jeremy Kescher
7c64837454
Merge remote-tracking branch 'upstream/main' 2022-06-06 12:19:57 +02:00