842 Commits (d8fbd74c47de3148d6693b5cb15e7e868f72448e)

Author	SHA1	Message	Date
Thibaut Girka	4b0f27ba78	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
ThibG	50a2854f92	Fix jpeg files sometimes being returned with a .jpe extension (#7881) ... While this isn't exactly *wrong*, files uploaded with a “.jpe” extension will keep that extension, which will often cause them to be served with an incorrect mimetype.	8 years ago
Thibaut Girka	ab5f450700	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields	8 years ago
Eugen Rochko	50689f0d41	Create special case to prefer "jpeg" over "jpe" file extension (#7841)	8 years ago
Eugen Rochko	a58ec29631	Allow selecting default posting language instead of auto-detect (#7828) ... * Allow selecting default posting language instead of auto-detect * Enable default language setting in credentials API * Fix form saving	8 years ago
Eugen Rochko	7eec279c7f	Change language opt-out to language opt-in (#7823) ... * Switch filtered_languages to chosen_languages * Adjust interface * Remove unused translations	8 years ago
Thibaut Girka	db200226b8	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…	8 years ago
Eugen Rochko	ca85658975	Add autofollow option to invites (#7805) ... * Add autofollow option to invites * Trigger CodeClimate rebuild	8 years ago
David Yip	5cff053944	Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions	8 years ago
David Yip	e931cf656d	Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions ... Conflicts: app/models/glitch/keyword_mute.rb	8 years ago
Jenkins	4d8d1fa129	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	17dc07f667	Fix has_one association on Web::PushSubscription (#7767) ... * Fix has_one association on Web::PushSubscription * Fix code style issues	8 years ago
David Yip	8142bd2553	Merge remote-tracking branch 'tootsuite/master' into merge-upstream ... Conflicts: app/models/status.rb The conflict in the Status model was due to 5bf5003384. It was resolved by accepting tootsuite's changes.	8 years ago
Eugen Rochko	59b42188a7	Filter out blocked/muted people from profile timelines (#7747) ... Fix #7741	8 years ago
Yamagishi Kazutoshi	683707839f	Fix fetch of remote image with multiple Content-Type headers (#7749)	8 years ago
Yamagishi Kazutoshi	b7b331ad0d	Add missing dot for remote image (#7751)	8 years ago
David Yip	68373e799b	Merge pull request #534 from glitch-soc/restructure-kw-as-word-lists ... Escape metacharacters in non-whole-word keyword mutes (#463, #533)	8 years ago
David Yip	a640c322c1	Escape metacharacters in non-whole-word keyword mutes. Fixes #533. ... Also addresses #463.	8 years ago
Eugen Rochko	bd0791d800	Add redraft function (#7735) ... * Add redraft function Fix #7010 * Add explicit confirmation * Add explicit confirmation message	8 years ago
David Yip	f009fef40b	Merge pull request #530 from glitch-soc/restructure-kw-as-word-lists ... keyword mute: Store keywords in a list, not a regex	8 years ago
nightpool	5fb013878f	Fix context performance by partially reverting #7083 (#7734) ... * Fix context performance by partially reverting #7083 * Fix code style issue * fix off-by-1 error in thread limits * code style fix	8 years ago
Yamagishi Kazutoshi	dc73241bd9	Detect extname from Content-Type (#7733)	8 years ago
David Yip	26573ad7e6	Thread scopes through #matches?. #454. ... Also add an apply_to_mentions attribute on Glitch::KeywordMute, which is used to calculate scope. Next up: additions to the test suite to demonstrate how scoping works.	8 years ago
Akihiko Odaki	5bf5003384	Do not mark remote status sensitive even if spoiler text is present (#7395) ... Old statuses and statuses from Pawoo, which runs a modified version of Mastodon, may not have been marked sensitive even if spoiler text is present. Such statuses are still not marked sensitve if they are local or arrived before version upgrade. Marking recently fetched remote status sensitive contradicts the behavior. Considering what people expected when they authored such statuses, this change removes the sensitivity enforcement.	8 years ago
David Yip	c55263027a	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
Eugen Rochko	0deb9fa6b9	Remove trending hashtags (#7711) ... * Delete trends_controller.rb * Update routes.rb * Update trending_tags.rb * Update index.js * Update index.js * Update search_results.js * Update async-components.js * Update index.js * Delete trends.js * Delete trends.js * Delete trends_container.js * Delete trends.js * Update search_results.js * Update search_results_container.js	8 years ago
David Yip	37d495eeeb	keyword mute: Store keywords as a list ... This has a couple of advantages over the regex approach: - Keywords are individually addressable, which makes it easier to gather statistics (#363) - Keywords can be individually applied to different feeds, e.g. skipping mentions (#454) It *does* end up creating many more Regexp objects. I'm not yet sure if the difference is significant.	8 years ago
David Yip	3550470c18	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json The above conflicts appear to be a text conflict introduced by glitch-soc's additional level of columns (i.e. moving a bunch of columns under the Misc option). They were resolved via accept-ours.	8 years ago
Eugen Rochko	6e6c0e9613	Use different algorithm for trending tags (#7697)	8 years ago
Jenkins	165b5dc7f5	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	a7d726c383	Improve counter caches on Status and Account (#7644) ... Do not touch statuses_count on accounts table when mass-destroying statuses to reduce load when removing accounts, same for reblogs_count and favourites_count Do not count statuses with direct visibility in statuses_count Fix #828	8 years ago
Eugen Rochko	461542784b	Reduce wasted work in RemoveStatusService due to inactive followers (#7672)	8 years ago
Thibaut Girka	c087738270	Merge branch 'master' into glitch-soc/merge-upstream	8 years ago
Eugen Rochko	e599d7caf2	Rescue Mastodon::DimensionsValidationError in Remoteable (#7662) ... Fix #7660	8 years ago
tateisu	b87a1229c7	optimize direct timeline (#7614) ... * optimize direct timeline * fix typo in class name * change filter condition for direct timeline * fix codestyle issue * revoke index_accounts_not_silenced because direct timeline does not use it. * revoke index_accounts_not_silenced because direct timeline does not use it. * fix rspec test condition. * fix rspec test condition. * fix rspec test condition. * revoke adding column and partial index * (direct timeline) move merging logic to model * fix pagination parameter * add method arguments that switches return array of status or cache_ids * fix order by * returns ActiveRecord.Relation in default behavor * fix codestyle issue	8 years ago
Eugen Rochko	9bd23dc4e5	Track trending tags (#7638) ... * Track trending tags - Half-life of 1 day - Historical usage in daily buckets (last 7 days stored) - GET /api/v1/trends Fix #271 * Add trends to web UI * Don't render compose form on search route, adjust search results header * Disqualify tag from trends if it's in disallowed hashtags setting * Count distinct accounts using tag, ignore silenced accounts	8 years ago
Thibaut Girka	659b8a12ec	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/ca.yml config/locales/nl.yml config/locales/oc.yml config/locales/pt-BR.yml Resolved conflicts by removing upstream-specific changes	8 years ago
Eugen Rochko	63c7b91572	Validate that e-mail resolves with MX and it's not blacklisted (#7631) ... Original patch by @j-a4	8 years ago
Thibaut Girka	b481e4fac1	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: config/locales/simple_form.ja.yml	8 years ago
Eugen Rochko	8378b72eba	Ensure push subscription is immediately removed when application is revoked (#7548) ... * Ensure push subscription is immediately removed when application is revoked * When token is revoked from app, unsubscribe too	8 years ago
Eugen Rochko	4b94e9c65e	Improve payload format of Web Push API now that it's open (#7521) ... > Good lord what is happening in there Previously the contents of the Web Push API payloads closely resembled the structure of JavaScript's [Notification](https://developer.mozilla.org/en-US/docs/Web/API/Notification). But now that the API is open to non-browser apps, and given that there is no required coupling between contents of the payload and a Notification object, here is how I changed the payload: ```json { "access_token": "...", "preferred_locale": "en", "notification_id": "12345", "notification_type": "follow", "title": "So and so followed you", "body": "This is my bio", "icon": "https://example.com/avatar.png" } ``` The title, body and icon attributes are included as a fallback so you can construct a minimal notification if you cannot perform a network request to the API to get more data.	8 years ago
David Yip	e0eebba461	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/controllers/settings/preferences_controller.rb app/lib/user_settings_decorator.rb app/models/user.rb config/locales/simple_form.en.yml	8 years ago
Eugen Rochko	1e02dc8715	Add preference to hide following/followers lists (#7532) ... * Add preference to hide following/followers lists - Public pages - ActivityPub collections (does not return pages but does give total) - REST API (unless it's your own) (does not federate) Fix #6901 * Add preference * Add delegation * Fix issue * Fix issue	8 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	8 years ago
Eugen Rochko	f31e58af9e	Fix nil error in StatusFilter (#7470) ... Fix #7462	8 years ago
Thibaut Girka	45fce0e496	Merge branch 'master' into glitch-soc/merge ... Conflicts: app/controllers/invites_controller.rb app/serializers/initial_state_serializer.rb config/locales/ko.yml	8 years ago
ThibG	be7eeb7856	Catch Paperclip processing failures (fixes #6378) (#7439)	8 years ago
Eugen Rochko	b4fb766b23	Add REST API for Web Push Notifications subscriptions (#7445) ... - POST /api/v1/push/subscription - PUT /api/v1/push/subscription - DELETE /api/v1/push/subscription - New OAuth scope: "push" (required for the above methods)	8 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	8 years ago
David Yip	143878d9da	Merge remote-tracking branch 'glitchsoc/master' into gs-master	8 years ago
Eugen Rochko	42cd363542	Bot nameplates (#7391) ... * Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues	8 years ago
Eugen Rochko	61a9018607	Enable custom emojis in profiles (notes, field values, display names) (#7374) ... Follow-up to #6124	8 years ago
Eugen Rochko	8da4bf0f90	4 profile fields max, store only 255 characters per name/value (#7348) ... Fix #7303	8 years ago
Eugen Rochko	c73ce7b695	Store home feeds for 7 days instead of 14 (#7354) ... * Store home feeds for 7 days instead of 14 Reduces workload for status fan-out to active followers * Fix test for user model	8 years ago
Daggertooth	b25278180a	Escape metachars in keywords	8 years ago
David Yip	7600067a30	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb db/schema.rb	8 years ago
Eugen Rochko	6793bec4c6	Store URIs of follows, follow requests and blocks for ActivityPub (#7160) ... Same URI passed between follow request and follow, since they are the same thing in ActivityPub. Local URIs are generated during creation using UUIDs and are passed to serializers.	8 years ago
David Yip	da70208b45	Merge remote-tracking branch 'origin/master' into merge-upstream	8 years ago
David Yip	106a5d7b83	Remove unnecessary code from MediaAttachment#set_type_and_extension. ... Well, it seems unnecessary, anyway.	8 years ago
David Yip	c816701550	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: .travis.yml Gemfile.lock README.md app/controllers/settings/follower_domains_controller.rb app/controllers/statuses_controller.rb app/javascript/mastodon/locales/ja.json app/lib/feed_manager.rb app/models/media_attachment.rb app/models/mute.rb app/models/status.rb app/services/mute_service.rb app/views/home/index.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/ca.yml config/locales/en.yml config/locales/es.yml config/locales/fr.yml config/locales/nl.yml config/locales/pl.yml config/locales/pt-BR.yml config/themes.yml	8 years ago
ThibG	a24605961a	Fixes/do not override timestamps (#7336) ... * Revert "Fixes/do not override timestamps (#7331)" This reverts commit 581a5c9d29. * Document Snowflake ID corner-case a bit more Snowflake IDs are used for two purposes: making object identifiers harder to guess and ensuring they are in chronological order. For this reason, they are based on the `created_at` attribute of the object. Unfortunately, inserting items with older snowflakes IDs will break the assumption of consumers of the paging APIs that new items will always have a greater identifier than the last seen one. * Add `override_timestamps` virtual attribute to not correlate snowflake ID with created_at	8 years ago
Eugen Rochko	a5293fdf61	Fix n+1 queries in StatusThreadingConcern (#7321)	8 years ago
Eugen Rochko	a3d84e705a	Fix cache_associated no longer working (#7320)	8 years ago
abcang	71a7cea73f	Keep notification when muting_notifications is true (#7311) ... * Keep notification when muting_notifications is true * Retrun mute object * Fix test	8 years ago
Eugen Rochko	cae933510c	Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288) ... Add raw bio fields to the source attribute on GET /api/v1/accounts/verify_credentials	8 years ago
Eugen Rochko	c5dcd7d836	Speed up test suite by not generating RSA keys in test environment (#7296) ... One RSA keypair for all fabricated test accounts is enough	8 years ago
David Yip	5f8f481425	Also treat non-whole-word mutes as case-insensitive. #450.	8 years ago
Eugen Rochko	a872392cd9	Add entity cache (#7271) ... * Add entity cache Use a caching layer for mentions and custom emojis that are dynamically extracted from text. Reduce duplicate text extractions * Fix code style issue	8 years ago
Emelia Smith	60b871d56c	Implement the ability for instances to define a list of disallowed hashtags (#7176) ... The goal here isn't to prevent these hashtags from existing, but just to strongly curtail their usage; The hashtags may still exist in the database via federated status, or from being created prior to this feature.	8 years ago
Emelia Smith	495303d9b8	Prevent suspended accounts from appearing in AccountSearchService (#7246)	8 years ago
Akihiko Odaki	1258efa882	Paginate descendant statuses in public page (#7148)	8 years ago
Yamagishi Kazutoshi	9613a53cb3	Update dependencies for Ruby (2018-04-23) (#7237) ... * Update annotate to version 2.7.3 * Update aws-sdk-s3 to version 1.9.2 * Update browser to version 2.5.3 * Update capistrano to version 3.10.2 * Update domain_name to version 0.5.20180417 * Update http to version 3.2.0 * Update lograge to version 0.10.0 * Update oj to version 3.5.1 * Update parallel_tests to version 2.21.3 * Update puma to version 3.11.4 * Update rubocop to version 0.55.0 * Update scss_lint to version 0.57.0 * Update simplecov to version 0.16.1 * Update tty-command to version 0.8.0 * Update tty-prompt to version 0.16.0 * Update pkg-config to version 1.3.0 * Update fog-local to version 0.5.0 * Update fog-openstack to version 0.1.25 * Update devise-two-factor to version 3.0.3 * bundle update	8 years ago
Eugen Rochko	7db7d68136	Detect and prevent image bombs, max. processable dimension 4096^2 (#7229)	8 years ago
Eugen Rochko	4ca2f73b12	Rescue Mastodon::LengthValidationError in Remoteable (#7228) ... Fix #7198 by allowing records with optional attachments to save	8 years ago
Eugen Rochko	bfe26ef67b	Force convert to JPG for preview card thumbnails to avoid animations (#7109) ... * Force convert to JPG for preview card thumbnails to avoid animations Fix #7093 * Conditionally convert to JPG only if original is GIF Coalesce and strip on all formats to ensure no animated APNGs	8 years ago
David Yip	78c145d3cb	db: make schema.rb version subsume bookmarks migration.	8 years ago
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	8 years ago
Kaito Sinclaire	156b916caf	Direct messages column (#4514) ... * Added a timeline for Direct statuses * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL * Changes to match other timelines in 2.0	8 years ago
Eugen Rochko	bb58fc003b	Fix warning about using SQL in order for Account#partitioned (#7159)	8 years ago
David Yip	813da6788e	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: db/schema.rb	8 years ago
Eugen Rochko	78ed4ab75f	Add bio fields (#6645) ... * Add bio fields - Fix #3211 - Fix #232 - Fix #121 * Display bio fields in web UI * Fix output of links and missing fields * Federate bio fields over ActivityPub as PropertyValue * Improve how the fields are stored, add to Edit profile form * Add rel=me to links in fields Fix #121	8 years ago
David Yip	d66192f21c	Merge remote-tracking branch 'glitchsoc/master' into gs-master ... Conflicts: db/schema.rb	8 years ago
David Yip	b7804028c2	Merge pull request #419 from ThibG/glitch-soc/features/bookmarks ... Bookmarks	8 years ago
David Yip	ed490b781f	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock config/application.rb	8 years ago
Yamagishi Kazutoshi	50529cbceb	Upgrade Rails to version 5.2.0 (#5898)	8 years ago
David Yip	a817f084ea	Merge remote-tracking branch 'tootsuite/master' ... Conflicts: app/controllers/statuses_controller.rb	8 years ago
Thibaut Girka	50eb8f1f61	Add backend support for bookmarks ... Bookmarks behave like favourites, except they aren't shared with other users and do not have an associated counter.	8 years ago
Akihiko Odaki	519119f657	Paginate ancestor statuses in public page (#7102) ... This also limits the statuses returned by API, but pagination is not implemented in Web API yet. I still expect it brings user experience better than making a user wait to fetch all ancestor statuses and flooding the column with them.	8 years ago
Jenkins	33c2bbdda7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Emelia Smith	d9b62e34da	Feature: Improve reports ui (#7032) ... * Further improvements to Reports UI - Clean up notes display - Clean up add new note form - Simplify controller - Allow reopening a report with a note - Show created at date for reports - Fix report details table formatting * Show history of report using Admin::ActionLog beneath the report * Fix incorrect log message when reopening a report * Implement fetching of all ActionLog items that could be related to the report * Ensure adding a report_note updates the report's updated_at * Limit Report History to actions that happened between the report being created and the report being resolved * Fix linting issues * Improve report history builder Thanks @gargron for the improvements	8 years ago
Paul Woolcock	8f800ad691	Change custom emoji search to `ILIKE` instead of `=` (#7099)	8 years ago
Emelia Smith	219a4423d8	Feature: Allow staff to change user emails (#7074) ... * Admin: Show unconfirmed email address on account page * Admin: Allow staff to change user email addresses * ActionLog: On change_email, log current email address and new unconfirmed email address	8 years ago
MIYAGI Hikaru	e6e93ecd8a	Fix GIFV encoding params (#7098) ... - Explicitly specify video codec. When ffmpeg isn't compiled with libx264 but openh264, mpeg4 is selected as video codec. - Swap avarage bitrate and max bitrate.	8 years ago
Akihiko Odaki	498327b2e3	Exclude status itself from context query (#7083) ... ancestor_statuses and descendant_statuses used to include the root status itself, but the behavior is confusing because the root status is not an ancestor nor descendant.	8 years ago
Jenkins	6611100480	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Emelia Smith	e85cffb236	Feature: Report improvements (#6967) (#7000) ... * Implement Assignment of Reports (#6967) * Change translation of admin.report.comment.label to "Report Comment" for clarity As we'll soon add the ability for reports to have comments on them, this clarification makes sense. * Implement notes for Reports This enables moderators to leave comments about a report whilst they work on it * Fix display of report moderation notes * Allow reports to be reopened / marked as unresolved * Redirect to reports listing upon resolution of report * Implement "resolve with note" functionality * Add inverse relationship for report notes * Remove additional database querying when loading report notes * Fix tests for reports * Fix localisations for report notes / reports	8 years ago
David Yip	eb39db7f93	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/mastodon/locales/en.json app/javascript/mastodon/locales/ja.json app/javascript/mastodon/locales/pl.json app/views/accounts/_header.html.haml	8 years ago
David Underwood	123a343d11	[WIP] Enable custom emoji on account pages and in the sidebar (#6124) ... Federate custom emojis with accounts	8 years ago
David Yip	d2cdc2b5a3	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
David Yip	f61aa8e0f7	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb	8 years ago