djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-16 04:32:57 -05:00
Code Issues Packages Projects Releases Wiki Activity
tootlab-mastodon/app/views
History
Thibaut Girka 48b8a1f414 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb
- app/services/remove_status_service.rb
- db/schema.rb

All conflicts were due to the addition of a `deleted_at` attribute
to Statuses and reworked database indexes.
2019-08-29 12:07:50 +02:00
..
about
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
accounts
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
admin
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-29 12:07:50 +02:00
admin_mailer
Change admin UI for hashtags and add back whitelisted trends (#11490)
2019-08-05 19:54:29 +02:00
application
Add trends to public pages sidebar (#11594)
2019-08-18 14:55:32 +02:00
auth
Add whitelist mode (#11291)
2019-07-30 11:10:46 +02:00
authorize_interactions
Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)
2019-07-07 16:16:51 +02:00
directories
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-19 18:28:37 +01:00
errors
New error page graphic. Other error page improvements (#5099)
2017-09-25 23:05:54 +02:00
filters
Redesign forms, verify link ownership with rel="me" (#8703)
2018-09-18 16:45:58 +02: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
Add invite comments (#10465)
2019-08-19 11:40:42 +02:00
kaminari
Pagination improvements (#1445)
2017-04-11 01:11:41 +02:00
layouts
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
media
Save video metadata and improve video OpenGraph tags (#6481)
2018-02-16 07:22:20 +01:00
notification_mailer
Add option to include reported statuses in warning e-mail (#11639)
2019-08-23 22:37:23 +02:00
oauth
Change unconfirmed user login behaviour (#11375)
2019-07-22 10:48:50 +02:00
public_timelines
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
relationships
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-28 13:01:33 +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
2019-08-19 21:49:35 +02:00
shared
Bump webpacker from 3.5.5 to 4.0.2 (#10277)
2019-03-15 15:05:31 +01: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
2019-08-29 12:07:50 +02:00
tags
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
user_mailer
Add option to include reported statuses in warning e-mail (#11639)
2019-08-23 22:37:23 +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