mastodon

Commit Graph

Author	SHA1	Message	Date
Patrick Figel	df4ff9a8e1	Add recovery code support for two-factor auth (#1773 ) * Add recovery code support for two-factor auth When users enable two-factor auth, the app now generates ten single-use recovery codes. Users are encouraged to print the codes and store them in a safe place. The two-factor prompt during login now accepts both OTP codes and recovery codes. The two-factor settings UI allows users to regenerated lost recovery codes. Users who have set up two-factor auth prior to this feature being added can use it to generate recovery codes for the first time. Fixes #563 and fixes #987 * Set OTP_SECRET in test enviroment * add missing .html to view file names	8 years ago
Matt Jankowski	cde1f37d93	Use site title on tags#show page (#1802 )	8 years ago
Joachim Viide	ef879a8839	Send initial state in a <script type="application/json"> tag (#1806 )	8 years ago
Matt Jankowski	8b74aa4217	Admin reports controller improvements (#1714 ) * Simplify admin/reports controller filtering for index * Rename parameter to resolved * Fix issue where reports view could not access filter_link_to * Add coverage for admin/reports controller * DRY up resolution of related reports for target account * Clean up admin/reports routes * Add Report#statuses method * DRY up current account action taken params * Rubocop styles	8 years ago
maxypy	a6807201d2	Implementing Subresource Integrity (#1729 ) * Add sprockets-rails to Gemfile * Add sprockets-rails to Gemfile.lock * Update show.html.haml * Update index.html.haml * Update admin.html.haml * Update auth.html.haml * Update embedded.html.haml * Update public.html.haml	8 years ago
Thomas Citharel	c0c56db0fa	Translate admin (#1702 ) * Translate the domain_block panel Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate PubSubHubbub section Signed-off-by: Thomas Citharel <tcit@tcit.fr> * translate account section and correct typos * move reports translation & translate sidebar Signed-off-by: Thomas Citharel <tcit@tcit.fr> * normalize l18n	8 years ago
Alyssa Ross	55b56e3f95	terms: remove redundant words (#1578 ) "at least X" and "X or older" have identical meanings. Using both together feels a little jarring.	8 years ago
Isabelle Knott	447b8bc44e	Do not show media attachment as og:image if it was marked as NSFW (#1693 )	8 years ago
Daijiro Wachi	4f781b17cc	Use input type `number` for Two-factor code (#1683 )	8 years ago
Matt Jankowski	137100dcf3	Clean up well-known routes/controllers (#1649 ) * Add request spec for host meta route returning xml * Add routing spec for xrd routes * Update well-known routes * Move webfinger and host-meta actions to their own controllers	8 years ago
Matt Jankowski	3a9eb81a80	Admin accounts controller cleanup (#1664 ) * Remove unused account_params method in admin/accounts controller * Introduce AccountFilter to find accounts * Use AccountFilter in admin/accounts controller * Use more restful routes admin silence and suspension area * Add admin/silences and admin/suspensions controllers	8 years ago
Matt Jankowski	0e39cc6a35	Settings export refactor (#1646 ) * Refactor Export to take an account and know about the export types * Use Export instance in settings/exports#show	8 years ago
Knut Erik	e1264bbd92	Added norwegian version of terms of service and privacy policy (#1625 )	8 years ago
Ben Roberts	0254ee9795	significant improvement in microformats markup (#1063 ) * significant improvement in microformats markup This is a huge improvement and I believe will close #965. Had these microformats reviewed by others in the community to help ensure they are at least correct, if not complete. I did not want to change the structure of the page, and so there it does not fully mark up the entire ancestry chain, or reply chain, only the direct decendants and direct ancestors are correctly associated, but this is likely fine as the most important bit is to have access to the urls for those toots which are now correctly fetchable. * improve code climate * trying to pass code climate tests * code climate * fix p-summary for content warning posts * fix error introduced when merging via github	8 years ago
David Libeau	c2a31b8032	Fix target blank on "open_in_web" link (#1612 ) When you render the "embed" view in an iframe, this link bugs when clicked, due to missing target blank.	8 years ago
Matt Jankowski	c44a700252	Quick best practice cleanup of views/helpers (#1546 ) * Remove trailing whitespace * Use query methods instead of explicit .blank? checks	8 years ago
Matt Jankowski	7f0a865b05	Allow import/export of mutes list (#1541 ) * Allow export of mutes list * Allow importing of mutes list * Refactor to use Settings::Exports::BaseController and DRY up exports code	8 years ago
Thomas Citharel	d90d23699c	Make Reporting admin section translatable (#1549 ) * Make Reporting admin section translatable And translate it into english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make subject of emails translatable and improve french translation Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Make error pages translatable and translate them in english and french Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate site setting section * Insert instance in registration emails and improve them a bit Signed-off-by: Thomas Citharel <tcit@tcit.fr>	8 years ago
Matt Jankowski	dd1ae3b109	Simplify the way the embed view is created (#1590 ) * Add coverage for embedded status view * Refactor embed view to eliminate @external_links variable	8 years ago
Matt Jankowski	3ddd936b03	Refactor exports controller (#1567 ) * Add basic coverage for settings/exports controller * Remove unused @account variable from settings/exports controller * Add coverage for download export actions * Remove deprecated `render :text` in favor of `send_data` for csv downloads * Add model to handle exports * Use Export class in settings/exports controller * Simplify settings/exports controller methods * Move settings/export to more restful routes	8 years ago
lindwurm	fc47c1d00e	[about] Moving docs link to tootsuite/documentation (#1573 ) related: `1236529e39` Signed-off-by: lindwurm <lindwurm.q@gmail.com>	8 years ago
pinfort	6f5268b02d	Add Japanese translation (#1552 ) * add device.ja.yml * update device.ja.yml * add file simple_form.ja.yml * 👍Added doorkeeper.ja.yml * add ja.yml * Update doorkeeper.ja.yml fixed url to uri * update ja.yml * fix some translations * fix japanese grammar of a translate * fix some translates * fix ja.yml * add ja.jsx * add Japanese user mail views * Added japanese translate locales * Added :ja to available_locales こっちも * Added "日本語" to HUMAN_LOCALES * Imported/Added ja to addLocaleData * update ja.jsx	8 years ago
Eugen Rochko	2a7602cad4	Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master	8 years ago
blackle	06444bf050	Allow user to disable the boost confirm dialog in preferences	8 years ago
Matt Jankowski	4ada50985a	Pagination improvements (#1445 ) * Replace will_paginate with kaminari * Use #page instead of #paginate in controllers * Replace will_paginate.page_gap with pagination.truncate in i18n * Customize kaminari views to match prior styles * Set kaminari options to match prior behavior * Replace will_paginate with paginate in views	8 years ago
Eugen	12f72e1740	When avatar/header are GIF, generate static versions (#1428 ) * When avatar/header are GIF, generate static versions. Account API returns "avatar"/"avatar_static", "header"/"header_static" Static version is the same as original for other cases Web UI de-animates avatars in toots, lists of users Fix #441, fix #596, prerequisite for #1064 * Fix JS test * Add rake task to generate static avatars/headers from GIF ones, add test	8 years ago
Matt Jankowski	d2f6d9b9fb	Fix issue with missing emojify class in views (#1455 ) * Add missing emojify class to landing strip * Add missing emojify class to simple_status partial	8 years ago
Olivier Humbert	082bef3027	French translation update (#1271 ) * Update confirmation_instructions.fr.html.erb consistency across the French translation * Update consistency across the French translation * Update fr.yml a bunch of consistency across the French translation + a few typos * Update doorkeeper.fr.yml consistency across the French translation (punctuation)	8 years ago
Matt Jankowski	e5282e4ec0	Clean up about page (#1282 ) * Add InstancePresenter to expose site details * Clean up about controller, use instance presenter	8 years ago
Eugen	9acdb166e8	Fix #795 , fix #704 , fix #835 - 2FA requires confirmation to be enabled (#1278 ) * Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled TOTP secret is not shown again after 2FA is enabled * Clean up	8 years ago
Thomas Citharel	41f8fde83e	Update french translation (#1148 ) Add french translation for emails sent Signed-off-by: Thomas Citharel <tcit@tcit.fr> Add non-breaking spaces Signed-off-by: Thomas Citharel <tcit@tcit.fr> changes and fixes to the nbsps Signed-off-by: Thomas Citharel <tcit@tcit.fr> French update a few fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr> fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr>	8 years ago
Matt Jankowski	ca44c13455	Use Setting.site_title value for `og:site_name` occurrences (#1194 ) * Add helper method to return Setting.site_title * Use site_title helper in application layout * Use site_title value for og:site_name	8 years ago
Joël Quenneville	d4c94fa004	DRY up reblog vs original status check Checking reblog vs original status was happening in multiple places across the app. For views, this logic was encapsulated in a helper method named `proper_status` but in the other layers of the app, the logic was duplicated. Because the logic is used at all layers of the app, we extracted it into a `Status#proper` method on the model and changed all uses of the logic to use this method. There is now a single source of truth for this condition. We added test coverage to untested methods that got refactored.	8 years ago
Eugen	0adee18d73	Merge branch 'master' into feature-customized-default-locale	8 years ago
Jantso Porali	786e6f94b9	Update Finnish translations, add sample Minio config (#954 )	8 years ago
Eugen Rochko	e3a3422a65	Allow setting of default language through config Setting of locale in controller extracted to Localized concern, the doorkeeper authorized applications controller moved under custom namespace with inclusion of Localized, which resolves the "it sometimes appears in a different random language" bug	8 years ago
Eugen	1c351709bc	Force UTF8 encoding on generated XML (#1140 )	8 years ago
Eugen	6d6a429af8	Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124 ) * Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder StreamEntry is now limited to only statuses, which allows some optimization. Removed extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer and PubSubHubbub::DistributionWorker PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker instead. All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri * All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account	8 years ago
Eugen Rochko	5f54981846	New admin setting: open/close registrations, with custom message, from the admin UI	8 years ago
Eugen Rochko	68f829e11c	Add basic logging of who resolved report	8 years ago
Eugen Rochko	71458dc6df	When taking action on a report (silence/suspend), it dismisses all other reports for that user automatically	8 years ago
Eugen Rochko	b7c1b12367	Make default admin UI page reports. Add admin UI for creating a domain block	8 years ago
Eugen Rochko	2d07cb5771	Catching rack timeout from rails doesn't work	8 years ago
Eugen Rochko	5b12624847	Add proper error page for request timeouts	8 years ago
Eugen Rochko	433cb198fa	Fix landing page sign up form ignoring username field	8 years ago
Eugen Rochko	bde5c0eaf9	Fix some views still not using counter caches	8 years ago
Eugen Rochko	5e26295e06	Fix #700 - hide spoilers on static pages	8 years ago
Eugen Rochko	e8875c6046	Import feature for following/blocking lists (addresses #62 , #177 , #201 , #454 )	8 years ago
Eugen Rochko	de22c202f5	Add counter caches for a large performance increase on API requests	8 years ago
Eugen Rochko	1c6b02f936	Fix #690 - Webfinger should handle new shortform profile URLs now (nice)	8 years ago

1 2 3 4 5 ...

309 Commits (df4ff9a8e13d776e1670c232655db0275a353a0f)