tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/app/models
History
Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json
2019-08-19 21:49:35 +02:00
..
admin
Fix option to send e-mail notification about account action always being true (#11242)
2019-07-06 13:54:32 +02:00
concerns
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
form
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
web
…
account_conversation.rb
Fix crash when conversations have no valid participants (#10078)
2019-02-19 20:00:41 +01:00
account_domain_block.rb
Fix crash when saving invalid domain name (#11528)
2019-08-08 23:04:19 +02:00
account_filter.rb
Add moderation API (#9387)
2019-06-20 02:52:34 +02:00
account_identity_proof.rb
Fix Keybase verification using wrong domain for remote accounts (#10547)
2019-04-10 20:28:43 +02:00
account_moderation_note.rb
…
account_pin.rb
…
account_stat.rb
Add more accurate account search (#11537)
2019-08-16 01:24:03 +02:00
account_tag_stat.rb
…
account_warning_preset.rb
…
account_warning.rb
…
account.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
admin.rb
…
application_record.rb
Change admin UI for hashtags and add back whitelisted trends (#11490)
2019-08-05 19:54:29 +02:00
backup.rb
…
block.rb
…
bookmark.rb
…
context.rb
…
conversation_mute.rb
…
conversation.rb
Revert "Remove conversation URI (#11423)" (#11424)
2019-07-28 17:47:37 +02:00
custom_emoji_category.rb
Add categories for custom emojis (#11196)
2019-06-28 15:54:10 +02:00
custom_emoji_filter.rb
…
custom_emoji.rb
Remove WebP support (#11589)
2019-08-17 22:04:15 +02:00
custom_filter.rb
Fix expiration date of filters being set to “Never” when editing them (#11204)
2019-06-30 16:11:21 +02:00
direct_feed.rb
Use a redis-cached feed for the DM timeline
2019-06-27 16:44:12 +02:00
domain_allow.rb
Fix crash when saving invalid domain name (#11528)
2019-08-08 23:04:19 +02:00
domain_block.rb
Add public blocks to /about/blocks (#11298)
2019-08-19 11:35:48 +02:00
email_domain_block.rb
Fix crash when saving invalid domain name (#11528)
2019-08-08 23:04:19 +02:00
export.rb
Export and import show_reblogs together with following list (#10495)
2019-04-08 07:28:27 +02:00
favourite.rb
…
featured_tag.rb
Fix featured tags not finding the right tag on save (#11504)
2019-08-07 10:00:58 +02:00
feed.rb
Create Redisable#redis (#9633)
2019-02-02 19:11:38 +01:00
follow_request.rb
Fix MergeWorker being queued for remote users (#10355)
2019-03-24 12:36:26 +01:00
follow.rb
…
home_feed.rb
…
identity.rb
…
import.rb
Add option to overwrite imported data (#9962)
2019-02-03 03:59:51 +01:00
instance_filter.rb
Add whitelist mode (#11291)
2019-07-30 11:10:46 +02:00
instance.rb
Add whitelist mode (#11291)
2019-07-30 11:10:46 +02:00
invite_filter.rb
…
invite.rb
Add invite comments (#10465)
2019-08-19 11:40:42 +02:00
list_account.rb
…
list_feed.rb
…
list.rb
…
media_attachment.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
mention.rb
…
mute.rb
…
notification.rb
Add account_id param to GET /api/v1/notifications (#10796)
2019-05-21 13:28:49 +02:00
poll_vote.rb
Add optimistic lock to avoid race conditions when handling votes (#10196)
2019-03-06 19:53:57 +01:00
poll.rb
Add support for custom emojis in poll options (#10322)
2019-03-20 17:29:12 +01:00
preview_card.rb
Remove WebP support (#11589)
2019-08-17 22:04:15 +02:00
relay.rb
Fix relay enabling/disabling not resetting inbox availability status (#10048)
2019-02-15 16:08:59 +01:00
remote_follow.rb
Fix acct URIs with IDN domains not being resolved (#11520)
2019-08-07 21:14:08 +02:00
report_filter.rb
Add moderation API (#9387)
2019-06-20 02:52:34 +02:00
report_note.rb
…
report.rb
Add moderation API (#9387)
2019-06-20 02:52:34 +02:00
scheduled_status.rb
Fix deleting a scheduled status immediately deleting media attachments (#9728)
2019-01-06 16:38:40 +01:00
search.rb
…
session_activation.rb
…
setting.rb
…
site_upload.rb
Improvements to image upload validation and creation (#10431)
2019-04-01 07:30:46 +02:00
status_pin.rb
…
status_stat.rb
…
status.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
tag.rb
Add more accurate hashtag search (#11579)
2019-08-18 03:45:51 +02:00
tombstone.rb
Record deleted(by mod) status to prevent re-appear (#10732)
2019-05-09 22:03:02 +02:00
trending_tags.rb
Add more accurate hashtag search (#11579)
2019-08-18 03:45:51 +02:00
user_invite_request.rb
Add "why do you want to join" field to invite requests (#10524)
2019-04-09 23:06:30 +09:00
user.rb
Add option to disable emoji replacements
2019-08-12 23:01:37 +02:00
web.rb
…