tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity
mastodon/app
History
Claire aa832d623a Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `CHANGELOG.md`:
  Upstream added newlines.
  Conflicts are because the CHANGELOG was independently merged from 3.4.6 on
  last security update.
  Took upstream's version.
- `app/helpers/context_helper.rb`:
  Conflicts because of extra vocabulary in glitch-soc. The conflicts were
  actually handled in last security merge.
  Kept our version.
2022-02-06 15:34:42 +01:00
..
chewy
Add trending links (#16917)
2021-11-25 13:07:38 +01:00
controllers
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-06 15:34:42 +01:00
helpers
Fix compacted JSON-LD possibly causing compatibility issues on forwarding (#17428)
2022-02-03 14:09:04 +01:00
javascript
Add optional hCaptcha support
2022-01-24 21:22:13 +01:00
lib
Compact JSON-LD signed incoming activities (#17426)
2022-02-03 14:07:29 +01:00
mailers
Add notifications for statuses deleted by moderators (#17204)
2022-01-17 09:41:33 +01:00
models
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-01 20:59:28 +01:00
policies
Merge branch 'main' into glitch-soc/merge-upstream
2021-12-18 11:44:54 +01:00
presenters
Merge branch 'main' into glitch-soc/merge-upstream
2021-10-14 21:44:57 +02:00
serializers
Change CAPTCHA handling to be only on email verification
2022-01-25 23:56:57 +01:00
services
Fix compacted JSON-LD possibly causing compatibility issues on forwarding (#17428)
2022-02-03 14:09:04 +01:00
validators
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-17 08:28:52 +01:00
views
Merge branch 'main' into glitch-soc/merge-upstream
2022-02-06 15:34:42 +01:00
workers
Merge branch 'main' into glitch-soc/merge-upstream
2022-01-28 08:58:32 +01:00