308 Commits (d8fbd74c47de3148d6693b5cb15e7e868f72448e)

Author	SHA1	Message	Date
David Yip	f61aa8e0f7	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: app/javascript/styles/mastodon/components.scss app/models/media_attachment.rb	7 years ago
Akihiko Odaki	40e5d2303b	Validate HTTP response length while receiving (#6891) ... to_s method of HTTP::Response keeps blocking while it receives the whole content, no matter how it is big. This means it may waste time to receive unacceptably large files. It may also consume memory and disk in the process. This solves the inefficency by checking response length while receiving.	7 years ago
Jenkins	837b3804bf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	54b273bf99	Close http connection in perform method of Request class (#6889) ... HTTP connections must be explicitly closed in many cases, and letting perform method close connections makes its callers less redundant and prevent them from forgetting to close connections.	7 years ago
David Yip	ab04be2f84	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: config/i18n-tasks.yml	7 years ago
Eugen Rochko	a568e3ca8e	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818) ... Display summary of attachments in description, and mark up content warning if present, e.g.: Attached: 3 images · Content warning: Dota 2 When text is not supposed to be hidden, it looks more like: Attached: 3 images Here is the text of the toot With #6817, multilinguagility should be assured...	7 years ago
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	ff44b2e92d	Add missing meta description to profiles, some other SEO stuff (#6706) ... - Add missing meta description to profiles - Add canonical rel link to landing page - Remove linebreaks from title tags - Add username to profile title - Add toots/following/followers to profile description tags - Add next/prev rel links to profiles - Do not index follower/following variants of profiles	7 years ago
Akihiko Odaki	ef44c62d17	Do not default site_title with site_hostname in InstanceHelper (#6624) ... site_title is "Mastodon" by default configuration, and there is no need to default site_title with site_hostname in InstanceHelper.	7 years ago
David Yip	f4b2478af1	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml	8 years ago
Eugen Rochko	79bc3d5845	Add direction tags to HTML e-mails for RTL languages (#6373)	8 years ago
David Yip	48d79007f6	Merge remote-tracking branch 'origin/master' into merge-upstream-20180121	8 years ago
Norayr Chilingarian	48cd6dc6ca	armenian translations initial commit (#6320) ... * adding armenian translations * updating config files for armenian translations * armenian translation fix * fixing spaces	8 years ago
David Yip	071c2c9c85	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/styles/mastodon/components.scss	8 years ago
Eugen Rochko	45afdf1781	Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305)	8 years ago
David Yip	89a9d629f7	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock	8 years ago
Eugen Rochko	5276c0a090	HTML e-mails for UserMailer (#6256) ... - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	8 years ago
Jenkins	722b3f567f	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	e4a241abef	Fix bad URL schemes being accepted (#6219) ... * Fix actors accepting invalid URI schemes or different host between URI and URL * Fix statuses accepting invalid URI scheme or different host to actor * Adjust tests to new requirements * Improve readability of mismatching_origin?/invalid_origin? methods	8 years ago
Jenkins	c69a23ae46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Yamagishi Kazutoshi	3c18964256	Fallback default thumbnail in instance status API (#6177)	8 years ago
Eugen Rochko	02e3e1ec09	Fix nil error in log_target_from_history helper (#6173)	8 years ago
Jenkins	933840bebf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Branko Kokanovic	21b9da6418	Adding Serbian latin translations (#6146) ... Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.	8 years ago
Jenkins	fa9b7ece2e	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Branko Kokanovic	7d376e41be	Adding Serbian translation (#6133) ... * Adding Serbian translation * i18n-tasks normalize	8 years ago
Jenkins	e7fa7fce25	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Peter	f38e6a14f2	Add Slovak translation (#6052) ... * Add Slovak translation * Slovak translation: i18n-normalize	8 years ago
Jenkins	82236a3703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	ad75ec8b5b	Add filters to admin UI for custom emojis (#6003)	8 years ago
Eugen Rochko	20a6584d2d	Clean up admin UI for accounts (#6004) ... * Add staff filter to admin UI for accounts, remove obsolete columns * Only display OStatus section in admin UI for accounts when OStatus data	8 years ago
David Yip	a057ed5cfe	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	8 years ago
Yamagishi Kazutoshi	6e3f176b8e	Add Galician language support (#5955)	8 years ago
Jenkins	8ca91cef45	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Yamagishi Kazutoshi	b21db9bbde	Using double splat operator (#5859)	8 years ago
Jenkins	933eafdcd3	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Yamagishi Kazutoshi	74320971e2	Add invite filter (#5862)	8 years ago
Jenkins	ad46bc9772	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	4c6b5dbe96	Add semi-support for Video/Image objects in ActivityPub (#5848) ... * Add semi-support for Video/Image objects in ActivityPub Video and Image objects will create corresponding status records with manually crafted text contents (title + URL) * Extract html-url-finding logic into JsonLdHelper * Fallback to id when url missing, extract supported object types	8 years ago
Jenkins	167fe2ab08	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Eugen Rochko	e84fecb7e9	Add logging of admin actions (#5757) ... * Add logging of admin actions * Update brakeman whitelist * Log creates, updates and destroys with history of changes * i18n: Update Polish translation (#5782) Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Split admin navigation into moderation and administration * Redesign audit log page * 🇵🇱 (#5795) * Add color coding to audit log * Change dismiss->resolve, log all outcomes of report as resolve * Update terminology (e-mail blacklist) (#5796) * Update terminology (e-mail blacklist) imho looks better * Update en.yml * Fix code style issues * i18n-tasks normalize	8 years ago
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	8 years ago
Eugen Rochko	3e90987c8b	Fix some rubocop style issues (#5730)	8 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at 3023725936	8 years ago
Eugen Rochko	7bb8b0b2fc	Add moderator role and add pundit policies for admin actions (#5635) ... * Add moderator role and add pundit policies for admin actions * Add rake task for turning user into mod and revoking it again * Fix handling of unauthorized exception * Deliver new report e-mails to staff, not just admins * Add promote/demote to admin UI, hide some actions conditionally * Fix unused i18n	8 years ago
nullkal	b6e2e999bd	Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467) ... * Show the local couterpart of emoji when it exists in admin/custom_emojis * Fix indentation * Fix error * Add class table-action-link to Overwrite link * Make it enable to overwrite emojis * Make Code Climate happy	8 years ago
David Yip	870d71b78b	Merge branch 'master' into gs-master	8 years ago
puckipedia	0cb329f63a	Allow ActivityPub Note's tag and attachment to be single objects (#5534)	8 years ago
David Yip	4fa2f7e82d	Set up /settings/keyword_mutes. #164. ... This should eventually be accessible via the API and the web frontend, but I find it easier to set up an editing interface using Rails templates and the like. We can always take it out if it turns out we don't need it.	8 years ago
Håkan Eriksson	a2b600428c	Swedish translation (#5406) ... * Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete	8 years ago
nullkal	633426b261	Add moderation note (#5240) ... * Add moderation note * Add frozen_string_literal * Make rspec pass	8 years ago
Akihiko Odaki	63f0979799	Validate id of ActivityPub representations (#5114) ... Additionally, ActivityPub::FetchRemoteStatusService no longer parses activities. OStatus::Activity::Creation no longer delegates to ActivityPub because the provided ActivityPub representations are not signed while OStatus representations are.	8 years ago
Eugen Rochko	1e02ba111a	Add emoji autosuggest (#5053) ... * Add emoji autosuggest Some credit goes to glitch-soc/mastodon#149 * Remove server-side shortcode->unicode conversion * Insert shortcode when suggestion is custom emoji * Remove remnant of server-side emojis * Update style of autosuggestions * Fix wrong emoji filenames generated in autosuggest item * Do not lazy load emoji picker, as that no longer works * Fix custom emoji autosuggest * Fix multiple "Custom" categories getting added to emoji index, only add once	8 years ago
Akihiko Odaki	48d77ea1eb	Fix filterable_languages method of SettingsHelper (#4966)	8 years ago
Eugen Rochko	8f8e677630	Clean up and improve generated OpenGraph tags (#4901) ... - Return all images as og:image - Return videos as og:image (preview) and og:video - Return profile:username on profiles	8 years ago
Eugen Rochko	1caf11ddcc	Fix language filter codes (#4841) ... * Fix language filter codes CLD3 returns BCP-47 language identifier, filter settings expect identifiers in the ISO 639-1 format. Convert between formats, and exclude duplicate languages from filter choices (zh-CN->zh) * Fix zh name	8 years ago
Adam Thurlow	6994664a13	swift-enable the paperclip! 📎 (#2322)	8 years ago
Eugen Rochko	e95bdec7c5	Update status embeds (#4742) ... - Use statuses controller for embeds instead of stream entries controller - Prefer /@:username/:id/embed URL for embeds - Use /@:username as author_url in OEmbed - Add follow link to embeds which opens web intent in new window - Use redis cache in development - Cache entire embed	8 years ago
Eugen Rochko	0d5d11eeff	Add _:inReplyToAtomUri to ActivityPub (#4702)	8 years ago
Eugen Rochko	00840f4f2e	Add handling of Linked Data Signatures in payloads (#4687) ... * Add handling of Linked Data Signatures in payloads * Add a way to sign JSON, fix canonicalization of signature options * Fix signatureValue encoding, send out signed JSON when distributing * Add missing security context	8 years ago
unarist	5927b43c0f	Ignore empty response in ActivityPub::FetchRemoteStatusService (#4661) ... * Ignore empty response in ActivityPub::FetchRemoteStatusService This fixes `NoMethodError: undefined method `[]' for nil:NilClass` error. * Check json.nil? in JsonLdHelper#supported_context?	8 years ago
Eugen Rochko	72bb3e03fd	Support more variations of ActivityPub keyId in signature (#4630) ... - Tries to avoid performing HTTP request if the keyId is an actor URI - Likewise if the URI is a fragment URI on top of actor URI - Resolves public key, returns owner if the owner links back to the key	8 years ago
Yamagishi Kazutoshi	10e9a9a3f9	Use URI.join even when S3 enabled (#4652)	8 years ago
nightpool	efec02f153	use existing inflections instead of custom helper (#4624) ... * use existing inflections instead of custom helper * use ActiveSupport versions	8 years ago
nullkal	075d6a1e13	Show what protocol is used for accounts in admin/accounts#index (#4622) ... * Show what protocol used for in admin/accounts#index * Add frozen_string_literal	8 years ago
Eugen Rochko	ca7ea1aba9	Redesign public profiles (#4608) ... * Redesign public profiles * Responsive design * Change public profile status filtering defaults and add options - No longer displays private/direct toots even if you are permitted access - By default omits replies - "With replies" option - "Media only" option * Redesign account grid cards * Fix style issues	8 years ago
Eugen Rochko	4e75f0d889	Hook up URL-based resource look-up to ActivityPub (#4589)	8 years ago
Eugen Rochko	dd7ef0dc41	Add ActivityPub inbox (#4216) ... * Add ActivityPub inbox * Handle ActivityPub deletes * Handle ActivityPub creates * Handle ActivityPub announces * Stubs for handling all activities that need to be handled * Add ActivityPub actor resolving * Handle conversation URI passing in ActivityPub * Handle content language in ActivityPub * Send accept header when fetching actor, handle JSON parse errors * Test for ActivityPub::FetchRemoteAccountService * Handle public key and icon/image when embedded/as array/as resolvable URI * Implement ActivityPub::FetchRemoteStatusService * Add stubs for more interactions * Undo activities implemented * Handle out of order activities * Hook up ActivityPub to ResolveRemoteAccountService, handle Update Account activities * Add fragment IDs to all transient activity serializers * Add tests and fixes * Add stubs for missing tests * Add more tests * Add more tests	8 years ago
Yamagishi Kazutoshi	bb96ba13cf	Fallback to site_hostname when site_title is empty (#4394)	8 years ago
Eugen Rochko	a390abdefb	Use the same emoji data on the frontend and backend (#4284) ... * Use the same emoji data on the frontend and backend * Move emoji.json to repository, add tests This way you don't need to install node dependencies if you only want to run Ruby code	8 years ago
Eugen Rochko	c2c93f8cd6	Fix deprecation warning for non-pipeline assets (#4267)	8 years ago
Eugen Rochko	8c45cd0e36	Improve ActivityPub representations (#3844) ... * Improve webfinger templates and make tests more flexible * Clean up AS2 representation of actor * Refactor outbox * Create activities representation * Add representations of followers/following collections, do not redirect /users/:username route if format is empty * Remove unused translations * ActivityPub endpoint for single statuses, add ActivityPub::TagManager for better URL/URI generation * Add ActivityPub::TagManager#to * Represent all attachments as Document instead of Image/Video specifically (Because for remote ones we may not know for sure) Add mentions and hashtags representation to AP notes * Add AP-resolvable hashtag URIs * Use ActiveModelSerializers for ActivityPub * Clean up unused translations * Separate route for object and activity * Adjust cc/to matrices * Add to/cc to activities, ensure announce activity embeds target status and not the wrapper status, add "id" to all collections	8 years ago
Eugen Rochko	1618b68bfa	HTTP signatures (#4146) ... * Add Request class with HTTP signature generator Spec: https://tools.ietf.org/html/draft-cavage-http-signatures-06 * Add HTTP signature verification concern * Add test for SignatureVerification concern * Add basic test for Request class * Make PuSH subscribe/unsubscribe requests use new Request class Accidentally fix lease_seconds not being set and sent properly, and change the new minimum subscription duration to 1 day * Make all PuSH workers use new Request class * Make Salmon sender use new Request class * Make FetchLinkService use new Request class * Make FetchAtomService use the new Request class * Make Remotable use the new Request class * Make ResolveRemoteAccountService use the new Request class * Add more tests * Allow +-30 seconds window for signed request to remain valid * Disable time window validation for signed requests, restore 7 days as PuSH subscription duration (which was previous default due to a bug)	8 years ago
Eugen Rochko	e2685ccc81	Fix #4149, fix #1199 - Store emojis as unicode (#4189) ... - Use unicode when selecting emoji through picker - Convert shortcodes to unicode when storing text input server-side - Do not convert shortcodes in JS anymore	8 years ago
のら	2d6128672f	Togglable filter links (#4021) ... * Togglable filter links * Rename is_selected to selected?	8 years ago
Gyuhwan Park	4cddef1cea	i18n: Add korean translation (#4064) ... * Added Korean Translation (based on japanese) * Update korean translation * Update korean translation: fix syntax error * Updated korean translation * Update korean translation * Update ko.json Translate non-translated parts * Update ko.yml Translated missed parts - and fixed some typos * Create simple_form.ko.yml * Updated korean translation * i18n: fix test fails	8 years ago
Yamagishi Kazutoshi	92f1c474f3	Add fa-fw class to user agent icon (#4047)	8 years ago
Eugen Rochko	f7301bd5b9	Add overview of active sessions (#3929) ... * Add overview of active sessions * Better display of browser/platform name * Improve how browser information is stored and displayed for sessions overview * Fix test	8 years ago
unarist	b16b69350e	Fix RTL detection on Ruby side (#3867) ... This fixes below bugs: * pipe characters being counted as RTL character * only first word being checked	8 years ago
masarakki	ff142eb64d	setting-for-account-deletable (#3852)	8 years ago
Eugen Rochko	8015fd7600	Improve RTL detection (#3682) ... - Use plaintext - Strip out URLs - Strip out mentions - Strip out hashtags - Strip out whitespace from "overall" count - Consistent between JS and Ruby	8 years ago
Yamagishi Kazutoshi	0a0b9a271a	Improve RuboCop rules (compatibility to Code Climate) (#3636) ... 08f8de84eb/Gemfile.lock (L38) Code Climate is using RuboCop v0.46.0. Change several rules to maintain compatibility.	8 years ago
Akihiko Odaki (@fn_aki@pawoo.net)	e98559c3ff	Resolve custom application stylesheet with Webpack (#3373) ... This implementation is a bit smaller and still has the following benefits: * No need of app/javascript/packs/custom.js For custom stylesheet, it typically has only "require('../styles/custom.scss')" and is redundant. * No need to extract vendor stylesheet to another asset Extracting vendor stylesheet could be forgotten by developers who do not use custom stylesheet.	8 years ago
Eugen Rochko	62ca37884a	Fix #2922 - Load stylesheet from "custom.css" entrypoint when present (#3332) ... * Fix #2922 - Load stylesheet from "custom.css" entrypoint when present This is pretty much the same way it worked as before, albeit with having to create app/javascript/packs/custom.js with require('../styles/custom.scss') (or whatever you want really), which will be a blank slate for you to import whatever you want * Remove old assets directory * Extract font-awesome into common.css and always load it	8 years ago
Matt Jankowski	3002a89419	Remove unused style helper (#3145)	8 years ago
Matt Jankowski	8e4fc5d5d2	Improve how params from controller are permitted in filter helper (#3129) ... The `params` variable here was quite overloaded. It exists via the controller to hold the request params, and was sometimes being used in this helper as that object, but other times was being used as a local variable, or to pass to another method, and this was confusing. This change renames the args for a method away from `params` for more clarity, and extracts the actual usage of the controller-provided `params` to a better-named method for clarity.	8 years ago
Matt Jankowski	25e5aa645d	Skip asset pipeline for static file in public/ (#3125)	8 years ago
alpaca-tc	e89e4355eb	Add filter to AccountFilter (#2968)	8 years ago
spla	a51c8074df	Add catalan language (#3084) ... * Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225	8 years ago
Hiroaki Ninomiya	cb50ecdb07	chore(landing_strip): hide signup path unless the instance allows registration. (#3055)	8 years ago
Koala Yeung	cbd673601c	Add Thai langauge (#2903) ... * Updated Thai language * locale: remove unused translation in Thai * locale: add Thai to settings menu and application * locale: fix activerecord.th.yml format	8 years ago
Özcan Zafer AYAN	983593ddf4	Add Turkish yml file (#2878) ... * Add Turkish yml file * Add translation files for Turkish * Deleted click_to_edit key and val Deleted click_to_edit: Düzenlemek için ilgili ayara tıklayınız line	8 years ago
Eugen Rochko	81584779cb	More robust PuSH subscription refreshes (#2799) ... * Fix #2473 - Use sidekiq scheduler to refresh PuSH subscriptions instead of cron Fix an issue where / in domain would raise exception in TagManager#normalize_domain PuSH subscriptions refresh done in a round-robin way to avoid hammering a single server's hub in sequence. Correct handling of failures/retries through Sidekiq (see also #2613). Optimize Account#with_followers scope. Also, since subscriptions are now delegated to Sidekiq jobs, an uncaught exception will not stop the entire refreshing operation halfway through Fix #2702 - Correct user agent header on outgoing http requests * Add test for SubscribeService * Extract #expiring_accounts into method * Make mastodon:push:refresh no-op * Queues are now defined in sidekiq.yml * Queues are now in sidekiq.yml	8 years ago
Yamagishi Kazutoshi	2ab7dc9a55	Use URI.join for generate asset URL (#2741) ... * Use URI.join for generate asset URL * to String	8 years ago
Eugen Rochko	f5bf5ebb82	Replace sprockets/browserify with Webpack (#2617) ... * Replace browserify with webpack * Add react-intl-translations-manager * Do not minify in development, add offline-plugin for ServiceWorker background cache updates * Adjust tests and dependencies * Fix production deployments * Fix tests * More optimizations * Improve travis cache for npm stuff * Re-run travis * Add back support for custom.scss as before * Remove offline-plugin and babili * Fix issue with Immutable.List().unshift(...values) not working as expected * Make travis load schema instead of running all migrations in sequence * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time	8 years ago
Ira	438ce5809f	Add Hebrew interface translation. (#2573) ... * follow the instructions for registering the language as stated on the Tootsuite's docs. * Added translation strings from latest master Adding &rlm; characters to many strings that are misdirected in the interface. A tiny grammar fix Updates of Hebrew strings to v1.3.1 Hebrew translation of the mailer templates. Fix strings and a missing comma. Just discovered two string keys were updated. this should lay Travis' mind to rest at last. Remove mentions before counting characters to decide RTL ratio Fixes for PR #2573 updated strings for latest master Undo RTL counting, moved out to another branch for future consideration...	8 years ago
yhirano	8325866c61	Downgrade rubocop 0.48.1 => 0.46.0 (#2628) ... * downgrade rubocop 0.48.1 => 0.46.0 * exclude vendor/**/* from rubocop target files * add frozen_string_literal comment line * fix percent literal delimited by ( and ) * fix alignment * remove comment disabling unknown cop	8 years ago
ButterflyOfFire	9a085e138e	Update settings_helper.rb (#2556) ... Correcting language name arabic = العربية	8 years ago
Eugen Rochko	b48c9013aa	Bump version, improve how version is stored for better commit history (#2526)	8 years ago
Ashley	1736badf28	Added '(dev)' to the title in development mode (#2524) ... * Added different title for dev * Changed indentation	8 years ago