David Yip 16d5217502

Merge remote-tracking branch 'origin/master' into gs-master ...

Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json

2018-04-18 18:48:12 -05:00

..

admin

Feature: Allow staff to change user emails (#7074)

2018-04-10 09:16:06 +02:00

concerns

Merge pull request #419 from ThibG/glitch-soc/features/bookmarks

2018-04-13 16:38:15 -05:00

form

Add option to show only local toots in timeline preview (#6292)

2018-02-04 06:00:10 +01:00

glitch

Use Html2Text to generate plaintext for keyword mutes. #236.

2018-02-10 10:36:16 -06:00

web

Change user_id column non-nullable (#6435)

2018-02-07 16:35:44 +01:00

account_domain_block.rb

Cache relationships in API (#6482)

2018-02-18 03:14:46 +01:00

account_filter.rb

Clean up admin UI for accounts (#6004)

2017-12-13 12:15:10 +01:00

account_moderation_note.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

account.rb

Merge remote-tracking branch 'origin/master' into gs-master

2018-04-18 18:48:12 -05: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

Account archive download (#6460)

2018-02-21 23:21:32 +01:00

block.rb

Cache relationships in API (#6482)

2018-02-18 03:14:46 +01:00

bookmark.rb

Add backend support for bookmarks

2018-04-11 20:40:29 +02: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

Change belongs_to_required_by_default to true (#5888)

2018-01-19 20:56:47 +01:00

conversation.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

custom_emoji_filter.rb

Change custom emoji search to ILIKE instead of = (#7099)

2018-04-10 15:46:27 +02:00

custom_emoji.rb

Change custom emoji search to ILIKE instead of = (#7099)

2018-04-10 15:46:27 +02:00

domain_block.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

email_domain_block.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

export.rb

Settings export refactor (#1646)

2017-04-13 13:02:02 +02:00

favourite.rb

Full-text search for authorized statuses (#6423)

2018-02-09 23:04:47 +01:00

feed.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

follow_request.rb

Cache relationships in API (#6482)

2018-02-18 03:14:46 +01:00

follow.rb

Cache relationships in API (#6482)

2018-02-18 03:14:46 +01:00

glitch.rb

Move KeywordMute into Glitch namespace.

2017-10-21 14:54:36 -05:00

home_feed.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

identity.rb

CAS + SAML authentication feature (#6425)

2018-02-04 05:42:13 +01:00

import.rb

Ensure the app does not even start if OTP_SECRET is not set (#6557)

2018-02-26 01:31:44 +01:00

instance_filter.rb

Add instance search feature (#4925)

2017-09-13 12:30:07 +02:00

instance.rb

Add Instance class to list admin records (#3443)

2017-05-31 20:38:44 +02:00

invite_filter.rb

Add invite filter (#5862)

2017-12-01 16:40:02 +01:00

invite.rb

Change user_id column non-nullable (#6435)

2018-02-07 16:35:44 +01:00

list_account.rb

Change belongs_to_required_by_default to true (#5888)

2018-01-19 20:56:47 +01:00

list_feed.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

list.rb

Change belongs_to_required_by_default to true (#5888)

2018-01-19 20:56:47 +01:00

media_attachment.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-04-11 00:50:09 +00:00

mention.rb

Change belongs_to_required_by_default to true (#5888)

2018-01-19 20:56:47 +01:00

mute.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-02-19 15:17:14 +00:00

notification.rb

Upgrade Rails to version 5.2.0 (#5898)

2018-04-12 14:45:17 +02:00

preview_card.rb

Validate HTTP response length while receiving (#6891)

2018-03-26 14:02:10 +02:00

remote_follow.rb

Using double splat operator (#5859)

2017-12-06 11:41:57 +01: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

Feature: Improve reports ui (#7032)

2018-04-10 20:27:59 +02:00

report.rb

Feature: Improve reports ui (#7032)

2018-04-10 20:27:59 +02: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

Change belongs_to_required_by_default to true (#5888)

2018-01-19 20:56:47 +01:00

setting.rb

Lists (#5703)

2017-11-18 00:16:48 +01:00

site_upload.rb

Fix avatar and header issues by using custom geometry detector (#6515)

2018-02-21 03:40:12 +01:00

status_pin.rb

Change belongs_to_required_by_default to true (#5888)

2018-01-19 20:56:47 +01:00

status.rb

Direct messages column (#4514)

2018-04-18 13:09:06 +02:00

stream_entry.rb

Merge remote-tracking branch 'origin/master' into merge-upstream

2017-11-17 17:40:00 -06:00

subscription.rb

Change belongs_to_required_by_default to true (#5888)

2018-01-19 20:56:47 +01:00

tag.rb

Fix #6715: Make catalan words with the L geminate letter work in hashtags (#6741)

2018-03-11 14:55:49 +01:00

user.rb

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-03-19 20:17:18 +00:00

web.rb

Add extended about page stub

2017-01-13 03:24:41 +01:00