646 Commits (33f56811e38bc330de9dcfa6794c29a176a30311)

Author	SHA1	Message	Date
ysksn	9dd5e329ab	Remove empty strings (#5732)	7 years ago
Eugen Rochko	2151fd3150	Display moderator badge (green), admin badge changed to red (#5728)	7 years ago
Eugen Rochko	fbef909c2a	Add option to block direct messages from people you don't follow (#5669) ... * Add option to block direct messages from people you don't follow Fix #5326 * If the DM responds to a toot by recipient, allow it through * i18n: Update Polish translation (for #5669) (#5673)	7 years ago
Anna e só	0e6c4cb796	l10n: PT-BR translation updated (#5681) ... * Improved e-mail messages; delted repeated words * pt-BR.json translations updated * Revert "pt-BR.json translations updated" This reverts commit 108c460531. * Updated pt-BR.json * pt-BR.yml updated	7 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	7 years ago
Quenty31	eb97bd8af6	i10n OC: Memorial (#5615) + #5467 (#5623) ... * Changed ĩ => ï * Changed ĩ => ï * Add ability to disable login and mark accounts as memorial (#5615)	7 years ago
Eugen Rochko	1032f3994f	Add ability to disable login and mark accounts as memorial (#5615) ... Fix #5597	7 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	7 years ago
MitarashiDango	38d072446b	add account search condition (instance domain) (#5577)	7 years ago
Nolan Lawson	0692991b54	Add ServiceWorker caching for static assets (#5524)	7 years ago
SerCom_KC	29609fbb6a	Updating Chinese (Simplified) translations (#5508) ... * i18n: (zh-CN) fix punctuations and spaces Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines * i18n: (zh-CN) fix punctuation * i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677 * i18n: (zh-CN) Update missing translations * i18n: (zh-CN) Fixing errors * i18n: (zh-CN) Fix indent error * i18n: (zh-CN) Fix language tag * i18n: (zh-CN) Remove quotes * i18n: (zh-CN) Update translation (#5485) * i18n: (zh-CN) Remove whitespaces, x -> × * i18n: (zh-CN) Rewording on time distance * i18n: (zh-CN) Overall improvements * i18n: (zh-CN) i18n-tasks normalization * i18n: (zh-CN) Add missing translation	7 years ago
Nolan Lawson	3de22a82bf	Refactor initial state: reduce_motion and auto_play_gif (#5501)	7 years ago
nullkal	781105293c	Feature: Unlisted custom emojis (#5485)	7 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	7 years ago
Nolan Lawson	8980aa804f	Fix reduced motion breaking public galleries (#5423)	7 years ago
KY	f72936b4e6	Fix #5082 - disable retweet link for followers only toot (#5397) ... * Fix #5082 - disable retweet link for followers only toot * Hide reblog count when it is a direct message	7 years ago
Nolan Lawson	fa0be3f834	Add option to reduce motion (#5393) ... * Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml	7 years ago
Lynx Kotoura	b3b4b5a2eb	Adjust public hashtag pages (#5357)	7 years ago
KY	1bdd694a0a	Fix #5351 - Redirection with page params after copy emoji (#5387) ... * Fix #5351 - Redirection with page params after copy emoji * Add page params to copy emoji link	7 years ago
takayamaki	27101f1beb	fix presented og:url is incorrect (#5320)	7 years ago
Nolan Lawson	6a50329a9c	Only preload JS in /web pages (#5325)	7 years ago
takayamaki	552d22bec9	sign_in and sign_up views present og meta infos (#5308)	7 years ago
Eugen Rochko	6e9e0c14e6	Fix dependency of error page generation on database (#5280)	7 years ago
nullkal	633426b261	Add moderation note (#5240) ... * Add moderation note * Add frozen_string_literal * Make rspec pass	7 years ago
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237)	7 years ago
Eugen Rochko	49cc0eb3e7	Improve admin UI for custom emojis, add copy/disable/enable (#5231)	7 years ago
Eugen Rochko	b406e3cc4c	Fix #5050 - Use summary_large_image only with media attachments (#5219)	7 years ago
Lynx Kotoura	43577e9f59	Fix style of email domain block table (#5218)	7 years ago
utam0k	b3af3f9f8c	Implement EmailBlackList (#5109) ... * Implement BlacklistedEmailDomain * Use Faker::Internet.domain_name * Remove note column * Add frozen_string_literal comment * Delete unnecessary codes * Sort alphabetically * Change of wording * Rename BlacklistedEmailDomain to EmailDomainBlock	7 years ago
Yamagishi Kazutoshi	178f718a9b	Separate notifications preferences from general preferences (#4447) ... * Separate notifications preferences from general preferences * Refine settings/notifications/show * remove preferences.notifications	7 years ago
Jeong Arm	0db47196fb	Fix stupid typo (#5184)	7 years ago
Jeong Arm	c30e492587	Korean translation (#5185) ... * Add missing Korean translations * Add Korean email confirmation template * Fix Korean typo	7 years ago
Jeong Arm	d841af4e80	Append confirmation link as plain text (#5146) ... * Append confirmation link as plain text Some mail application is malfunctioning with links. * Change description text	7 years ago
Eugen Rochko	47ecd652d3	Make Chrome splash screen same color as web UI's background color (#5169)	7 years ago
Eugen Rochko	0b3f1ec62a	Reorganize preferences page (#5161)	7 years ago
Eugen Rochko	5b45c1646a	Remove dependency on db during assets:precompile (#5138)	7 years ago
Eugen Rochko	3b60832214	New error page graphic. Other error page improvements (#5099) ... - 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault	7 years ago
Eugen Rochko	2c8e3fbbfb	Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)	7 years ago
Eugen Rochko	2f079573ed	In detail status view, display attachment uncropped if there's only one (#5054) ... * In detail status view, display attachment uncropped if there's only one * Make media spoiler the size of the media it hides, enable on static	7 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	7 years ago
Eugen Rochko	9c8e602163	Fix custom emojis not detected when used in content warning (#5049)	7 years ago
Eugen Rochko	846cd4e838	Switch from EmojiOne to Twemoji, different emoji picker (#5046) ... * Switch from EmojiOne to Twemoji, different emoji picker * Make emoji-mart use a local spritesheet * Fix emojify test * yarn manage:translations	7 years ago
Andrew	0401a24558	Add support for multiple themes (#4959) ... * Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return	7 years ago
unarist	4aea3f88a6	Hide sensitive image in default on the public pages (#5009) ... Additionally, this restores previous background / text color for media spoiler.	7 years ago
Eugen Rochko	09a94b575e	Admin interface for listing, adding and removing custom emojis (#5002) ... * Admin interface for listing, adding and removing custom emojis * Only display local ones in the list	7 years ago
Eugen Rochko	81cec35dbf	Custom emoji (#4988) ... * Custom emoji - In OStatus: `<link rel="emoji" name="coolcat" href="http://..." />` - In ActivityPub: `{ type: "Emoji", name: ":coolcat:", href: "http://..." }` - In REST API: Status object includes `emojis` array (`shortcode`, `url`) - Domain blocks with reject media stop emojis - Emoji file up to 50KB - Web UI handles custom emojis - Static pages render custom emojis as `<img />` tags Side effects: - Undo #4500 optimization, as I needed to modify it to restore shortcode handling in emojify() - Formatter#plaintext should now make sure stripped out line-breaks and paragraphs are replaced with newlines * Fix emoji at the start not being converted	7 years ago
BruWalfas	c155d843f4	A few updates to the Spanish translation and some typos fixing (#4997) ... * So Spanish. Much changes. Wow. * Some little fixes * Updated es.yml, and fixed some ortographical errors * Some little changes to simple_form.es.yml * Yeah, so much translations * Spanish e-mail messages * Remove unused message	7 years ago
Yamagishi Kazutoshi	dcf1139ebd	Do not add image size without meta to OGP (regression from #4901) (#4995)	7 years ago
Yamagishi Kazutoshi	9e0985d9e4	Add `strip_insignificant_zeros: true` option to `number_to_human` (#4993)	7 years ago
Lynx Kotoura	4c14ff659b	Oauth code in input form and add description message (#4986) ... * Oauth code in a input form and add description * New authcode description	7 years ago
Mingye Wang	c8969dca35	Minor Chinese check & jsx addition (#4973) ... * zh-*: transition from "like" back to "fav" This commit reverts the translation for the yellow-star "fav" button back to "fav" in Chinese. Some ambuiguity between "like" and "fav" is deliberately used in zh-TW/HK by using the existing phrase "最爱" (favorite (adj.), lit. love-most) instead of "收藏" (favourite (v.), "collect") in some instances. Fixes #3511. * zh-*: apply suggestions for PR #4557 * zh-cn: de-monetize ya account In Chinese two separate characters, 账 and 帐, can be used to spell the word for account (账/帐户). However, the one with a 贝 on the left is evolved from the latter specifically for monetary purposes. Since people usually can't figure out which one to use, it might be a good idea to use the original not-so-money one. * zh-*: complete jsx translation	7 years ago
Lynx Kotoura	1e3b1d7211	Adjust landing pages 2 (#4967) ... * Adjust landing pages 2 Fix styles of terms page Remove action buttons from timeline in about page Adjust styles of short description Adjust form inputs Set autocomplete off for username and email box in registration form. Remove line breakings. * Revert removing action buttons	7 years ago
Eugen Rochko	2bbf987a0a	Redesign video player (#4911) ... * Redesign video player * Use new video player on static public pages too * Use media gallery component on static public pages too * Pause video when hiding it * Full-screen sizing on WebKit * Add aria labels to video player buttons * Display link card on public status page * Fix fullscreen from modal sizing issue * Remove contain: strict property to fix fullscreen from columns	7 years ago
Eugen Rochko	9239e4ce4d	Uploads for admin site settings (#4913) ... * Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up	7 years ago
nullkal	da77f65c46	Add instance search feature (#4925)	7 years ago
nullkal	9e2ff3ef71	Make instance names in into links to user list in the instance (#4924)	7 years ago
unarist	af10c9fbff	Add section for protocol specific information on the admin page (#4910) ... This PR adds section for protocol specific information, then always show both of OStatus and ActivityPub. Specifically, this will help admins to check PuSH subscription status and unsubscribe manually, even `protocol` has been changed. This also includes below changes: * Add `overflow: hidden` to prevent float leaking * Add missing fields for ActivityPub	7 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	7 years ago
unarist	47d48fed8d	Reset preview image if avatar/header image selection was cancelled (#4893)	7 years ago
Anna e só	c2bee07dbc	l10n: Full PT-BR translation (#4882) ... * devise.pt-BR.yml now fully translated * pt-BR.json now fully translated * pt-BR.yml partially translated; 46 lines left * pt-BR.yml now fully translated * simple_form.pt-BR.yml fully translated * doorkeeper.pt-BR.yml now fully translated * E-mail instructions on app/views/user_mailer added and fully translated * PT-BR translation for #4871 * Deleted an unwanted caracter on pt-BR.yml * Fixing typos on pt-BR.yml * Added translation for Pinned toots tab on pt-BR.json * Added missing translation for navigation_bar.pins	7 years ago
Eugen Rochko	7d7844a47f	Default follows for new users (#4871) ... When a new user confirms their e-mail, bootstrap their home timeline by automatically following a set of accounts. By default, all local admin accounts (that are unlocked). Can be customized by new admin setting (comma-separated usernames, local and unlocked only)	7 years ago
Quent-in	bc077018b8	i10n minors changes for 1.6 (#4867) ... * wrong preposition + typo * wrong preposition + typo * Typo * Typo * minor changes * minor changes	7 years ago
Lynx Kotoura	3c45d3963a	Scrollable tables in settings pages (#4857) ... * Scrollable tables in settings pages * Add space before curly brace	7 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	7 years ago
Quent-in	b00cc4b9bd	i10n OC / FR update Pinned toots (#4842) ... * Added column.pins New strings * Added column.pins * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * Update password_change.oc.html.erb * Update password_change.oc.text.erb * Update reset_password_instructions.oc.html.erb * Update reset_password_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb	7 years ago
Lynx Kotoura	4c3dd0b254	Adjust status embeds (#4808) ... * Adjust status embeds Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal. * Remove trailing whitespace * Using width from the variable	7 years ago
Eugen Rochko	09cffaaf04	Fix #4551 - Use correct syntax for content preloading (#4798)	7 years ago
Lynx Kotoura	cfe39fb58d	Adjust settings pages (#4765) ... * views: Adjust heading positions * Adjust settings pages Adjust label. Adjust tables. Adjust admin/reports/* pages. Fix 2FA QR code style for narrow devices. Widen several pages. Increase contrast. * Remove trailing whitespace	7 years ago
Yamagishi Kazutoshi	6fd2e8c3c5	Fix profile page when use system's font (#4774)	7 years ago
m4sk1n	0b32338e3f	Add link to 'noscript' message (#4561) ... * Add link to 'noscript' message Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * remove indent	7 years ago
Yamagishi Kazutoshi	2305f7c391	Use system's default font on non web UI pages (#4553) ... * Use system's default font on non web UI pages * Remove import for Redirect	7 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	7 years ago
Eugen Rochko	15093f9113	Shorten display of large numbers on public profiles (#4711)	7 years ago
Yamagishi Kazutoshi	3ac7b353f8	Fix missing at-sign (regression from #4688) (#4705)	7 years ago
Yamagishi Kazutoshi	00f9f16f94	Change timezone of the datetime to what browser specifies (#4688)	7 years ago
Yamagishi Kazutoshi	b88635202f	Add label for application scopes (#4691) ... * Add label for application scopes * hint	7 years ago
Eugen Rochko	9caa90025f	Pinned statuses (#4675) ... * Pinned statuses * yarn manage:translations	7 years ago
nullkal	80393a23d0	Use checkboxes for application scope setting (#4671)	7 years ago
Eugen Rochko	c1b086a538	Fix up the applications area (#4664) ... - Section it into "Development" area - Improve UI of application form, index, and details	7 years ago
Daigo 3 Dango	696c2c6f2f	Add Mastodon::Source.url (#4643) ... * Add Mastodon::Source.url * Update spec * Refactor Move things frmo Mastodon::Source to Mastodon::Version	7 years ago
Colin Mitchell	871c0d251a	Application prefs section (#2758) ... * Add code for creating/managing apps to settings section * Add specs for app changes * Fix controller spec * Fix view file I pasted over by mistake * Add locale strings. Add 'my apps' to nav * Add Client ID/Secret to App page. Add some visual separation * Fix rubocop warnings * Fix embarrassing typo I lost an `end` statement while fixing a merge conflict. * Add code for creating/managing apps to settings section - Add specs for app changes - Add locale strings. Add 'my apps' to nav - Add Client ID/Secret to App page. Add some visual separation - Fix some bugs/warnings * Update to match code standards * Trigger notification * Add warning about not sharing API secrets * Tweak spec a bit * Cleanup fixture creation by using let! * Remove unused key * Add foreign key for application<->user	7 years ago
nightpool	efec02f153	use existing inflections instead of custom helper (#4624) ... * use existing inflections instead of custom helper * use ActiveSupport versions	7 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	7 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	7 years ago
unarist	5b9ae7981e	Update /admin/accounts/:id view for ActivityPub (#4600) ... * Add protocol field * Switch protocol specific information according to active protocol * Hide PuSH subscription related buttons if ActivityPub is active	7 years ago
Eugen Rochko	3c6503038e	Add protocol handler. Handle follow intents (#4511) ... * Add protocol handler. Handle follow intents * Add share intent * Improve code in intents controller * Adjust share form CSS	7 years ago
Eugen Rochko	a2aeacbfee	Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586)	7 years ago
Lynx Kotoura	dcbc1af38a	Fix short description in about/more page (#4554)	7 years ago
TheInventrix	c9fd6f386c	unify short description styling (#4548) ... apply same style class to the About description on both the landing page and the about/more page	7 years ago
Lynx Kotoura	a3e53bd442	Adjust tags and accounts page (#4534) ... * Adjust tag and accounts page * Remove units from 0px paddings	7 years ago
Eugen Rochko	df605f0f8b	Add "signed in as" header to some pages (#4523)	7 years ago
Masoud Abkenar	4b6cd1dfdb	i18n: update Persian translation (#4470) ... * i18n: update Persian translation * i18n: fix quotes	7 years ago
unarist	155ba8fd3a	Make salutation of email localizable (#4454)	7 years ago
Yamagishi Kazutoshi	f91284d230	Do not create empty a element when there is no e-mail (#4455) ... Empty a element is created when there is no business e-mail input.	7 years ago
Lynx Kotoura	ea33cdc30b	Set contact address in about/more as mailto link (#4450) ... * Set contact address as mailto link To be able to copy long email address * Set style for mailto link	7 years ago
Lynx Kotoura	57a794d8eb	Fix autocomplete option in haml files (#4438) ... * Fix autocomplete in two_factor.html.haml * Fix autocomplete in registrations edit.html.haml * Fix autocomplete in passwords edit.html.haml * Fix autocomplete in _registration.html.haml * Fix autocomplete in new.html.haml * Fix autocomplete in show.html.haml * Add autocomplete option to sessions new.html.haml * Add autocomplete option to 2FA new.html.haml * Add autocomplete option to 2FA show.html.haml	7 years ago
Eugen Rochko	8c0dd33ce4	Fix current session not being displayed in sessions list (#4424)	7 years ago
Ondřej Hruška	4115043dc7	Added external link icons to joinmastodon navbar buttons (#4368)	7 years ago
Yamagishi Kazutoshi	e5c0aa6493	Send short account URL to remote instance (regression from #3844) (#4355) ... * Send short account URL to remote instance (regression from #3844) Resolve #4347 * remove format: 'json'	7 years ago
Eugen Rochko	1306d637a2	Fix oddities with public profile CSS (#4341) ... * Fix oddities with public profile CSS * Remove trailing whitespace	7 years ago