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/models
History
Thibaut Girka f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/status.rb
- db/schema.rb

Both conflicts are caused by us having extra database columns.
2019-03-05 19:23:16 +01:00
..
admin
Add moderation warnings (#9519)
2018-12-22 20:02:09 +01:00
concerns
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-05 19:23:16 +01:00
form
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-02 15:36:53 +01:00
web
Do no retry web push workers if the server returns a 4xx response (#9434)
2018-12-17 03:14:13 +01:00
account_conversation.rb
Fix crash when conversations have no valid participants (#10078)
2019-02-19 20:00:41 +01:00
account_domain_block.rb
Add option to overwrite imported data (#9962)
2019-02-03 03:59:51 +01:00
account_filter.rb
Redesign admin accounts index (#9340)
2018-11-26 15:53:27 +01:00
account_moderation_note.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
account_pin.rb
Add API endpoint to list featured accounts (fixes #8315) (#8317)
2018-08-20 18:46:04 +02:00
account_stat.rb
Add profile directory (#9427)
2018-12-06 17:36:11 +01:00
account_tag_stat.rb
Add profile directory (#9427)
2018-12-06 17:36:11 +01:00
account_warning_preset.rb
Add moderation warnings (#9519)
2018-12-22 20:02:09 +01:00
account_warning.rb
Add moderation warnings (#9519)
2018-12-22 20:02:09 +01:00
account.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-05 19:23:16 +01:00
admin.rb
Add logging of admin actions (#5757)
2017-11-24 02:05:53 +01:00
application_record.rb
Validate HTTP response length while receiving (#6891)
2018-03-26 14:02:10 +02:00
backup.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
block.rb
Store URIs of follows, follow requests and blocks for ActivityPub (#7160)
2018-05-04 21:14:34 +02:00
bookmark.rb
Thread scopes through #matches?. #454.
2018-06-03 23:00:50 -05:00
context.rb
Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
2017-07-07 04:02:06 +02:00
conversation_mute.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
conversation.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
custom_emoji_filter.rb
Make custom emoji domains case insensitive #9351 (#9474)
2018-12-11 05:30:57 +01:00
custom_emoji.rb
Make custom emoji domains case insensitive #9351 (#9474)
2018-12-11 05:30:57 +01:00
custom_filter.rb
Add option to not consider word boundaries when processing keyword filtering (#7975)
2018-07-09 02:22:09 +02:00
domain_block.rb
Add domain search/filter to the "Federation" (/admin/instances) page (#10071)
2019-02-18 14:59:19 +01:00
email_domain_block.rb
Create DomainNormalizable#normalize_domain (#9631)
2018-12-26 06:38:42 +01:00
export.rb
Fix lists export (#10136)
2019-03-03 15:38:47 +01:00
favourite.rb
Fix error when trying to update counters for statuses that are gone (#8251)
2018-08-18 03:03:23 +02:00
featured_tag.rb
Fix featured tag form not failing on failed tag validations (#10167)
2019-03-05 03:46:24 +01:00
feed.rb
Create Redisable#redis (#9633)
2019-02-02 19:11:38 +01:00
follow_request.rb
Limit the number of people that can be followed from one account (#8807)
2018-10-04 17:36:11 +02:00
follow.rb
Extract counters from accounts table to account_stats table (#9295)
2018-11-19 00:43:52 +01:00
home_feed.rb
Support min_id-based pagination in REST API (#8736)
2018-09-28 02:23:45 +02:00
identity.rb
Change identities id column to a bigint (#9371)
2018-11-27 13:56:25 +01:00
import.rb
Add option to overwrite imported data (#9962)
2019-02-03 03:59:51 +01:00
instance_filter.rb
Add domain search/filter to the "Federation" (/admin/instances) page (#10071)
2019-02-18 14:59:19 +01:00
instance.rb
Redesign admin instances area (#9645)
2019-01-08 13:39:49 +01:00
invite_filter.rb
Add invite filter (#5862)
2017-12-01 16:40:02 +01:00
invite.rb
Keyword/phrase filtering (#7905)
2018-06-29 15:34:36 +02:00
list_account.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
list_feed.rb
Lists (#5703)
2017-11-18 00:16:48 +01:00
list.rb
Add database support for list show-reply preferences
2018-11-28 14:46:07 +01:00
media_attachment.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-10 21:10:09 +01:00
mention.rb
Improve support for aspects/circles (#8950)
2018-10-17 17:13:04 +02:00
mute.rb
Merge remote-tracking branch 'origin/master' into gs-master
2018-05-03 17:23:44 -05:00
notification.rb
Extract counters from accounts table to account_stats table (#9295)
2018-11-19 00:43:52 +01:00
poll_vote.rb
Fix various issues in polls (#10165)
2019-03-05 03:51:18 +01:00
poll.rb
Fix poll options not being stripped of surrounding whitespace on save (#10168)
2019-03-05 03:45:56 +01:00
preview_card.rb
Add WebP support (#9879)
2019-02-02 12:25:04 +01:00
relay.rb
Fix relay enabling/disabling not resetting inbox availability status (#10048)
2019-02-15 16:08:59 +01:00
remote_follow.rb
Add remote interaction dialog for toots (#8202)
2018-08-18 03:03:12 +02:00
remote_profile.rb
[WIP] Enable custom emoji on account pages and in the sidebar (#6124)
2018-04-01 23:55:42 +02:00
report_filter.rb
Admin reports with accounts (#2092)
2017-04-18 19:36:18 +02:00
report_note.rb
Fix scope latest of ReportNote (#9630)
2018-12-26 06:38:59 +01:00
report.rb
Add preference for report notification e-mails, skip for duplicates (#8559)
2018-09-02 00:11:58 +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
Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090)
2017-07-07 04:02:06 +02:00
session_activation.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
setting.rb
Remove intermediary arrays when creating hash maps from results (#9291)
2018-11-16 15:02:18 +01:00
site_upload.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
status_pin.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
status_stat.rb
Reset status cache when status_stat or media_attachment updates (#9119)
2018-10-28 06:42:34 +01:00
status.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-05 19:23:16 +01:00
stream_entry.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-22 17:51:38 +02:00
subscription.rb
Update dependencies for Ruby (2018-04-23) (#7237)
2018-04-23 11:29:17 +02:00
tag.rb
Add type, limit, offset, min_id, max_id, account_id to search API (#10091)
2019-02-26 15:21:36 +01:00
tombstone.rb
Fix missing account association in tombstone model (#9857)
2019-01-18 23:52:09 +01:00
trending_tags.rb
Create Redisable#redis (#9633)
2019-02-02 19:11:38 +01:00
user.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-26 17:04:44 +01:00
web.rb
Add extended about page stub
2017-01-13 03:24:41 +01:00