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 ff67385cfb Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
  discarded upstream changes
- app/controllers/api/v1/bookmarks_controller.rb
  finally merged upstream, some code style fixes
  and slightly changed pagination code
- app/controllers/application_controller.rb
  changed upstream to always return HTML error pages
  slight conflict caused by theming code
- app/models/bookmark.rb
  finally merged upstream, no real conflict
- spec/controllers/api/v1/bookmarks_controller_spec.rb
  finally merged upstream, slightly changed pagination code
2019-11-20 15:36:09 +01:00
..
admin
Remove auto-silence behaviour from spam check (#12117)
2019-10-09 07:11:23 +02:00
concerns
Add bookmarks (#7107)
2019-11-13 23:02:10 +01:00
form
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-10 17:26:08 +02:00
web
Validate Web::PushSubscription (#11971)
2019-09-27 15:24:13 +02:00
account_alias.rb
Addition of update activity distribution by alias, minor correction (#11905)
2019-09-21 09:11:21 +02: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
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_migration.rb
Add (back) option to set redirect notice on account without moving followers (#11994)
2019-09-29 05:03:19 +02: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
Fix account counters being overwritten by parallel writes (#12045)
2019-10-02 04:59:37 +02: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-11-06 14:38:28 +01:00
admin.rb
Add logging of admin actions (#5757)
2017-11-24 02:05:53 +01:00
application_record.rb
Fix records not being indexed sometimes (#12024)
2019-10-01 01:19:11 +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
Add bookmarks (#7107)
2019-11-13 23:02:10 +01: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
Revert "Remove conversation URI (#11423)" (#11424)
2019-07-28 17:47:37 +02:00
custom_emoji_category.rb
Add batch actions and categories to admin UI for custom emojis (#11793)
2019-09-09 22:44:17 +02:00
custom_emoji_filter.rb
Add batch actions and categories to admin UI for custom emojis (#11793)
2019-09-09 22:44:17 +02:00
custom_emoji.rb
Fix audit log error when custom emoji is copied from remote server (#11876)
2019-09-17 23:20:48 +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 table of contents to about page (#11885)
2019-09-19 11:09:05 +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
Fix records not being indexed sometimes (#12024)
2019-10-01 01:19:11 +02:00
featured_tag.rb
Fix featured tags not finding the right tag on save (#11504)
2019-08-07 10:00:58 +02:00
feed.rb
Fix non-numbers being passed to Redis and causing an error (#11697)
2019-08-30 02:49:54 +02:00
follow_request.rb
Fix MergeWorker being queued for remote users (#10355)
2019-03-24 12:36:26 +01:00
follow.rb
Extract counters from accounts table to account_stats table (#9295)
2018-11-19 00:43:52 +01:00
home_feed.rb
Fix performance of home feed regeneration (#12084)
2019-10-06 22:11:17 +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 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
Add invite filter (#5862)
2017-12-01 16:40:02 +01:00
invite.rb
Add invite comments (#10465)
2019-08-19 11:40:42 +02:00
list_account.rb
Add abilityto add oneself to lists (#12271)
2019-11-04 13:02:01 +01: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
marker.rb
Add timeline read markers API (#11762)
2019-09-06 13:55:51 +02:00
media_attachment.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-11-06 14:38:28 +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
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 voters count support (#11917)
2019-09-29 22:58:01 +02:00
preview_card.rb
Fix preview card image not being re-fetched even if link is re-posted (#11981)
2019-09-28 01:33:16 +02:00
relay.rb
Fix relays UI being available in whitelist/secure mode (#11963)
2019-09-27 02:13:34 +02:00
remote_follow.rb
Add account migration UI (#11846)
2019-09-19 20:58:19 +02:00
report_filter.rb
Add moderation API (#9387)
2019-06-20 02:52:34 +02:00
report_note.rb
Fix scope latest of ReportNote (#9630)
2018-12-26 06:38:59 +01:00
report.rb
Change deletes to preserve soft-deleted statuses in unresolved reports (#11805)
2019-09-11 16:32:44 +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
Improvements to image upload validation and creation (#10431)
2019-04-01 07:30:46 +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
Add bookmarks (#7107)
2019-11-13 23:02:10 +01:00
tag_filter.rb
Add search and sort functions to hashtag admin UI (#11829)
2019-09-16 14:27:29 +02:00
tag.rb
Fix admin setting to auto-approve hashtags not affecting query (#12130)
2019-10-10 02:22:04 +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
Fix admin setting to auto-approve hashtags not affecting query (#12130)
2019-10-10 02:22:04 +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
Merge branch 'master' into glitch-soc/merge-upstream
2019-10-27 12:14:01 +01:00
web.rb
Add extended about page stub
2017-01-13 03:24:41 +01:00