FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
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.
mastodon/app/views
History
Thibaut Girka 4a70792b4a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Not a real conflict, just a glitch-soc-only dependency too close to a
  dependency that got updated upstream. Updated as well.
- `app/models/status.rb`:
  Not a real conflict, just a change too close to glitch-soc-changed code
  for optionally showing boosts in public timelines.
  Applied upstream changes.
- `app/views/layouts/application.html.haml`:
  Upstream a new, static CSS file, conflict due to glitch-soc's theming
  system, include the file regardless of the theme.
- `config/initializers/content_security_policy.rb`:
  Upstream dropped 'unsafe-inline' from the 'style-src' directive, but
  both files are very different. Removed 'unsafe-inline' as well.
 		2020-05-10 16:19:56 +02:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
accounts Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +02:00
admin_mailer Fixed not being able to display review pending hashtags in the admin UI. (#11875) 2019-09-17 16:59:16 +02:00
application Fix end-user-facing uses of inline CSS (#13438) 2020-04-28 10:16:55 +02:00
auth Fix end-user-facing uses of inline CSS (#13438) 2020-04-28 10:16:55 +02:00
authorize_interactions Fix misleading error when attempting to re-send a pending follow request (#13133) 2020-02-24 21:19:19 +01:00
directories Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
errors Add specific rate limits for posting and following (#13172) 2020-03-08 15:17:39 +01:00
filters Various fixes and improvements (#12878) 2020-01-20 15:55:03 +01:00
follower_accounts Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
following_accounts Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
home Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
invites Remove invite comments from UI (#12068) 2019-10-03 22:37:13 +02:00
kaminari Pagination improvements (#1445) 2017-04-11 01:11:41 +02:00
layouts Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +02:00
media Save video metadata and improve video OpenGraph tags (#6481) 2018-02-16 07:22:20 +01:00
notification_mailer Fix NotificationMailer failing when receiving mention with media from remote instance (#11765) 2019-09-05 06:14:30 +02:00
oauth Add noopener and/or noreferrer (#12202) 2019-10-24 22:44:42 +02:00
public_timelines Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
relationships Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
remote_follow Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
remote_interaction Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247) 2019-07-07 16:16:51 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-05-10 16:19:56 +02:00
shared Remove fallback to long description on sidebar and meta description (#12119) 2019-10-08 22:08:55 +02:00
shares Merge branch 'master' into glitch-soc/merge-upstream 2019-08-19 21:49:35 +02:00
statuses Merge branch 'master' into glitch-soc/merge-upstream 2020-05-03 21:23:49 +02:00
tags Merge branch 'master' into glitch-soc/merge-upstream 2020-04-20 16:45:40 +02:00
user_mailer Fix “Email changed” notification sometimes having wrong e-mail (#13475) 2020-04-15 16:13:44 +02:00
well_known/host_meta Remove XML version of Webfinger and remove links to Atom feeds (#11460) 2019-08-01 19:14:02 +02:00