mastodon

Commit Graph

Author	SHA1	Message	Date
Zac Anger	7b397b1452	Return early from submit if no text. (#1962 )	8 years ago
Matt Jankowski	cc1361c149	Media controller specs (#2022 ) * Add spec for media controller * Add MediaAttachment.attached scope * Simplify methods in media controller	8 years ago
Eugen	15ec4ae07b	Fix #1972 , fix #1870 - Fix special characters in XML, add tests (#1988 ) Also improve efficiency of the mastodon:maintenance:add_static_avatars task	8 years ago
Eugen	e43071a2f9	Fix #1897 - Return reblogged: false on unreblog (was wrongly named variable) (#1989 )	8 years ago
Matt Jankowski	21a767dcfa	Improve handling of HTTP_ACCEPT for webfinger (#2008 ) This change includes: - Improve the spec coverage for incoming request to the webfinger action - For requests without an accept header (ie, what a browser might look like), return a JSON response. - For requests with an explicit format of xml or json, return that format. - For requests using an accept header, return that format. Also adds failing spec showing webfinger does not return xml, which covers the issue described in: https://github.com/tootsuite/mastodon/issues/1983	8 years ago
Tomohiro Suwa	3399dd7a66	Fix nil query_username (#2013 )	8 years ago
alpaca-tc	630de52fdd	Required foreign keys (#2003 ) * Add `required: true` option to foreign column * Fixes NoMethodError ``` > Favourite.new.valid? NoMethodError: undefined method `reblog?' for nil:NilClass ```	8 years ago
Christophe Gesché	4082e1ac7f	Update fr.jsx "clear" (Nettoyer peut-être ambigu) (#1987 ) Un utiliser mal expérimenté pourrait comprendre "retirer les erreurs". Ici il s'agit d'une suppression pure et simple, pas une épuration/nettoyage. clear would be translated "remove" instead of "cleaning" Cleaning can be unterstood "keep but clean"	8 years ago
tom	6b8e95ea00	Make contents of boost confirmation dialog scroll (#1710 ) This is necessary for boosting long posts on small screens - see this post for video: https://slime.global/@masklayer/102308	8 years ago
Patrick Figel	ffb99325ca	Add gif auto-play/pause preference This introduces a new per-user preference called "Auto-play animated GIFs", which is enabled by default. When a user disables this setting, gifs in toots become click-to-play. Previews of animated gifs were changed to display the video play button so that users can distinguish them from regular images. This setting also affects account avatars in the detailed account view, which was changed to use the same hover-to-play mechanism that is used for animated avatars in timelines. Fixes #1652	8 years ago
Dale Price	f3b86c1bda	Add mask-icon.svg (#1572 ) (#1585 ) * Add mask-icon (#1572) * use updated svg logo for mask-icon	8 years ago
Hugo Gameiro	6685106daa	Add Brazilian Portuguese and fix European Portuguese (#1966 ) * update portuguese translation added the missing fields and improved the translation * pt translations fix * improve last translation commit * fix damn quotes * add pt_br to index.jsx * add pt-BR to import index.jsx * add pt-BR to mastodon.jsx * add pt-BR to settings_helper.rb * add pt-BR to application.rb * order alphabetically pt.jsx * create pt-BR.jsx * Create devise.pt-BR.yml * language improvements to devise.pt.yml * created doorkeeper.pt-BR.yml * fixes to doorkeeper.pt.yml * create pt-BR.yml * improvements to pt.yml * Create simple_form.pt-BR.yml * Improvements to simple_form.pt.yml * improvements to pt.yml	8 years ago
May Kittens Devour Your Soul	8ad6722eea	Create hr.jsx (#1945 ) * Create hr.jsx Start of Croatian translation * Update settings_helper.rb * Update application.rb * Update application.rb * Update index.jsx	8 years ago
Yuki Nakagawa	548ff54714	Optimize user setting page for mobile browser (#1924 ) * Remove overflow because it blocks scrolling on mobile safari. * Add “-webkit-overflow-scrolling: touch;” to enable smooth scroll on mobile safari and other webkit browsers. * Use radio buttons in user setting page. Because select tags with long text are not fit in the width of mobile devices. * Add flex property to fit labels to devise width. * Change font size of select. It causes auto zooming on mobile safari.	8 years ago
Yamagishi Kazutoshi	6afe70db95	Add human locales for zh-tw (#1984 )	8 years ago
usagi-f	b87a08e160	Add function color remaining text (#1980 )	8 years ago
anon	f8ae12909c	Fix tiny typo, and added link to terms and conditions in confirmation email for Japanese. (#1975 ) (#1975 )	8 years ago
saturday06	d87ee1167e	Assign user locale on signup (#1982 )	8 years ago
Keiji, Yoshimi	7a5086729a	reduce unneed query when post without attachements. (#1907 ) * reduce unneed query when post without attachements. This commit reduce following query: ``` MediaAttachment Load (0.9ms) SELECT "media_attachments".* FROM "media_attachments" WHERE "media_attachments"."status _id" IS NULL AND 1=0 ORDER BY id asc ``` * fixed for more simple changes.	8 years ago
Eugen	1955a3f444	Do not display "reset password" in admin UI for remote accounts (#1960 )	8 years ago
Eugen	8ebed7fc68	Fix #1957 - WhatLanguage can return null. Fallback to 'en' (#1959 )	8 years ago
Eugen	f902a335f9	Fix #1870 - Strip control characters out of strings in AtomSerializer (#1876 ) * Fix #1870 - Strip control characters out of strings in AtomSerializer * Adjust according to comment by @alpaca-tc	8 years ago
Eugen	e4af4898de	Add language detection (#1772 ) * Add language detection via WhatLanguage and (de)serialization of it through Atom * Fix default language in ProcessFeedService * Re-add newline before 'react-rails' Gem to fix groupings Fixes Code Climate issue	8 years ago
Eugen	6d70a80263	Onboarding modal (#1883 ) * Basic onboarding modal that's shown to users once * Lay out pages 2 through 5, add images, style modals (#1509) * Lay out pages 2 through 5 Added images and laid out pages 2 through 5 in the jsx file. SCSS will come, still working on just seeing if this works at all. * Fix jsx errors, add images to modal pages, style modal pages * Add animations to onboarding pager changes, improve wording and styling * Finishing touches on the onboarding * Add missing propTypes * Update wording	8 years ago
Matt Jankowski	f87b51fda8	I18n health warnings (#1949 ) * Rename admin.domain_block to admin.domain_blocks in prep for i18n improvement * Use implicit controller/action path for i18n in admin/domain_blocks * Add DomainBlock#accounts has_many * Avoid i18n health warning for `en` locale by using symbol scope with :count * Remove unused i18n key: plaintext_secret_html * Remove unused i18n key two_factor_auth.warning * Remove final will_paginate i18n keys * Remove unused key two_factor_auth.recovery_codes * Remove unused key: admin.reports.comment.none * Remove unused reports. i18n namespace (moved to admin.reports) * Ignore keys from locales which override activemodel and activerecord errors * Revert "Remove unused key: admin.reports.comment.none" This reverts commit `350ef2685f`. * Update i18n key reference to match moved location * Add missing `en` keys to i18n * Tell i18n-tasks to ignore missing attributes that dont need overwriting * Add i18n-tasks unused to travis	8 years ago
alpaca-tc	19f63ff801	Check @recipient.user at the first (#1939 )	8 years ago
Eugen	babbb2135e	Fix #1813 - Alleviate extra requests when processing mentions (#1938 ) The <link rel="mentioned" /> tag refers to accounts by href. So we were matching the DB by the url attribute, and falling back to HTTP look-up. However, GS and Mastodon use profile URLs as URIs, too, and the match for that was missing. This could potentially alleviate some extra network requests	8 years ago
Effy Elden	acd33101c5	Merge branch 'master' into fix/cache_blocking	8 years ago
Matt Jankowski	e0b5a94a4b	Clean up check that account needs a webfinger update (#1932 )	8 years ago
Matt Jankowski	26ec042f38	Remove trailing whitespace in terms.no.html (#1933 )	8 years ago
Matt Jankowski	73b0af5c93	Simplify the og:image and og:description code in stream_entries/show (#1934 )	8 years ago
Matt Jankowski	7efde22c3a	Use local vars in partials (#1935 ) * Use local vars in accounts/header partial * Use local variable in 2fa recovery codes partial	8 years ago
abcang	90760eae4c	fix regex filter (#1845 ) * fix regex filter * fixed br to linebreak and, stlip tags. * change to send raw content * changed to unescape in reducer	8 years ago
tackeyy	fc34e0e191	Remove .keep in models (#1892 )	8 years ago
alpaca-tc	de72db99fa	Add presence validation to Import (#1928 ) ``` An `ActiveRecord::StatementInvalid` occurred while `POST </settings/import>` was processed by `imports#create` Exception ---------------- PG::NotNullViolation: ERROR: null value in column "type" violates not-null constraint ```	8 years ago
mshrtkch	2c329f2b69	Fix translation related to "mute" (#1926 )	8 years ago
alpaca-tc	8f8319852c	Fixed NoMethodError in UnfollowService (#1918 )	8 years ago
Matt Jankowski	75f416a492	Fix yaml issue in ja locale (#1916 ) * Fix yaml parse issue in ja.yml locale * Fix issue in locales/ja.jsx	8 years ago
Naouak	24baaa17e8	Syntax error in japanese localisation (#1920 ) assets:precompile was failling because of this missing comma.	8 years ago
Erwan Leboucher	c99fc08a0d	Add missing french translation. (#1906 ) * Add missing french translation. Causing this error: [React Intl] Missing message: "navigation_bar.mutes" for locale: "fr", * Update fr.jsx	8 years ago
Yuki Nakagawa	a8f45c0838	Enlarge font size to avoid autozooming of iPhone. (#1911 )	8 years ago
新都心(Neet Shin)	f2997c9715	Update Japanese Translate (#1903 ) * [Update ja.jsx] Add Muted, Video_error and sorted * [Update ja] Added Recovery code's translation * [Update ja] Added Two-fact/Recovery's translation * Update ja.jsx	8 years ago
Eugen	5d710b1139	Make file attachment on MediaAttachment optional (#1865 ) Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI	8 years ago
Keiji Yoshimi	fd81916e86	cache blockings for reducing queries.	8 years ago
Eugen	8a58942c80	Fix up recovery codes design a little (#1866 )	8 years ago
Matt Jankowski	3834e1e69b	View spec fix (#1888 ) * Add option to disable verify partial doubles * Add show_landing_strip? helper method * Use show_landing_strip? helper in accounts and stream entries views * Fix naming in view specs	8 years ago
Eugen	95bcbaa434	Fix #1852 - Ensure feeds have valid <title> tags (#1875 )	8 years ago
Isabelle Knott	911338bdcc	Show error message if video cannot be loaded (#1879 )	8 years ago
Eugen	e332552816	Indicate when a toot is part of a chain with a "reply all" icon (#1869 )	8 years ago
Eugen	0d83569899	Fix cross-origin integrity (#1871 ) See <https://glitch.social/users/bea/updates/434>	8 years ago
Eugen	515434ed87	English localization for mention notification was missing (#1867 )	8 years ago
Naouak	3d3e32befb	Check for a custom css file to help customization of instances (#1368 ) * User can create a custom.scss to customize their instance without modifying gitted files. * Add documentation for customization. * Forgot the helper file * Fix Style to pass codeclimate * Requests from maintainer.	8 years ago
alpaca-tc	00392d3c63	ActiveRecord::NotFound is not defined (#1864 )	8 years ago
Marcin Cieślak	1c8477eab2	Give SINGLE_USER a chance to register (#1820 ) An attempt to open a brand new Mastodon instance configured as SINGLE_USER_MODE=true will cause an exception. Enable temporary registration if we have no users in the database Fixes #1817	8 years ago
Matt Jankowski	6670e6d33f	Add password reset for users from admin accounts area (#1841 )	8 years ago
Henry Smith	9d2f55ecc3	Remove isRequired from optional prop (#1843 )	8 years ago
Henry Smith	b7ec2fd492	Fix function call name typo (#1851 )	8 years ago
Matt Jankowski	3b8908c114	About page contact email (#1839 ) * Correct site_contact_email typo * Separate about more page into partials, add specs	8 years ago
Alex Dunn	0f889523e4	views/about: use Setting.site_title instead of hardcoding (#1508 )	8 years ago
Zac Anger	f4045ba3d9	Add eslint-plugin-jsx-a11y (#1651 ) * Add eslint-plugin-jsx-a11y. * Fix npm script. * Adjust npm scripts so test also runs lint. * Fix existing lint errors. * Don't break on a11y issues. * Add role and tabIndex. * Add vim and Mac files to .gitignore and .dockerignore. * Handle htmlFor (partially), a that's actually a button. * Fix missing tabIndex. * Add cursor:pointer to load-more * Revert change to load_more. * Fixes based on review. * Update yarn.lock. * Don't try to install fsevents on Linux (hides warning noise).	8 years ago
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
Amakasu Ryoma	f0f6a3279a	Update ja.jsx (#1822 ) * Add getting_started.apps * Add search_results.total * Fix notifications.settings	8 years ago
Alda Marteau-Hardi	bddd36f260	Add a classname to the loading bar (#1826 )	8 years ago
Keiji, Yoshimi	b857551617	fixed privacy mistake of japanese translation of privacy.change (#1832 )	8 years ago
alpaca-tc	f9d7ec8971	ActiveRecord::Relation does not respond to `#id` (#1834 )	8 years ago
Matt Jankowski	40fd1de488	Account search service refactor (#1791 ) * Begin coverage for account search service * Coverage for hashtag query * Coverage for calling local vs remote find based on domain presence * Spec to check that exact matches are not duped * Coverage of resolve option * Coverage for account being provided * Start to refactor account search service * Isolate query username and domain methods * Isolate exact_match method * Extract methods for local and remote results * Simplify local vs remote and account isoliation * Extract methods for local and remote results * Simplify de-dupe of exact match * Simplify logic to check for non exact remotes * Cache some methods * Remove nil from exact_match from results array * Return exact matches first * Use find_remote even with no domain Account.find_local is just an alias for Account.find_remote(user, nil) - so we can not bother with the conditional here, and call find_remote directly.	8 years ago
ThibG	31f0bcf804	Refresh webfinger (#1323 ) * Refresh local info for remote accounts when webfinger returns new values It only refreshes account info if one of the URLs or the public-key changes, in which cases it refreshes the full info, re-downloading the feeds from that user. Some special handling should probably be done when the public key changes, but I have been unable to find any use for it in Mastodon yet. * Re-fetch remote users we aren't subscribed to. This might induce performance issues, we might want to only do that for users we explicitly attempted to subscribe but failed to. * Refactor changes * Do not refresh existing remote account details more than once a day * Avoid re-fetching webfinger info in tests unless otherwise specified	8 years ago
Matt Jankowski	09540192c9	Rename admin/accounts_helper to admin/filter_helper (#1816 ) - Add some spec coverage for both methods - Add explicit constant call-outs for where the params are from	8 years ago
Koala Yeung	08059ddda9	jslint: fix jslint warnings (#1704 ) * jslint: remove trailing space * jslint: fix no-nested-ternary issue Follow the jslint [no-nested-ternary](http://eslint.org/docs/rules/no-nested-ternary) rule. Rewritten ternary with if-then.	8 years ago
Koala Yeung	ec9999cdfe	Update Traditional Chinese, HK (zh-HK) translation (#1759 ) * Fix missing string in javascript locale (zh-HK) * Change javascript locale (zh-HK) * Fix some other strings that were still English. * Improve `search.status_by`. * Fix `notification.follow`. ("開始開始你") * Changes according to user feedback. * "Back": "較前顯示" -> "返回" * "Home": "家" -> "主頁" * Update ruby locale (zh-HK) * Fix missing translation * Normalize yml * Update translation strings	8 years ago
Fjoerfoks	4ba6acd518	Update nl.jxs (#1766 ) Some rewording and switching to infinitive localization.	8 years ago
Ratmir Karabut	5d8d827436	Update Russian translation (#1733 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error	8 years ago
Matt Jankowski	cde1f37d93	Use site title on tags#show page (#1802 )	8 years ago
Thor Harald Johansen	4bebeb27d3	More Norwegian translations (#1805 ) * Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation. * Yet more improvements to the Norwegian translation. * More Norwegian translations. Better terminology.	8 years ago
Joachim Viide	ef879a8839	Send initial state in a <script type="application/json"> tag (#1806 )	8 years ago
Alex Dunn	0655f16cc1	[css] reduce spacing between text elements on about pages (#1510 )	8 years ago
ThibG	a9529d3b4b	Allow running mastodon on a different domain as the one used for identifying users (#1267 ) * Allow running mastodon on a different domain as the one used for identifying users * Alter documentation of WEB_DOMAIN to make clear it shouldn't be used unless the admin knows what they are doing * Compare to web_domain instead of local_domain when dealing with feeds/API * Correctly identify mentions to local accounts Mentions URLs point to the person's web profile, i.e., the user page served on WEB_DOMAIN.	8 years ago
Patrick Figel	fe8dd58bc1	Add list of muted user to UI and Getting Started (#1799 ) Add the same UI that already exists for blocked users for muted ones and add it to the "Getting Started" menu.	8 years ago
Matt Jankowski	f5cd138323	Improve i18n chooser (#1804 ) * Add locale spec with failing locale plus region check * Use a more accurate locale when supplied by browser headers Previously we were using a matching option which would use the first locale available which matched the locale portion, even if a region was specified. This changes to first try to find an exact match, and then fall back to the region, and then fall back to the default. * Clean up default_locale method	8 years ago
Luc Didry	fa89deb4eb	Add title attribute to URLs in statuses (#1755 ) Since URLs in statuses are truncated, it would be pleasant to see the full URL when hovering the URL (like on twitter, yes).	8 years ago
Matt Jankowski	26a892dd90	Fix invalid byte sequence issue in nl.jsx (#1751 )	8 years ago
Effy Elden	8321884eef	Change usage of gsub to delete, as per Code Climate/Rubocop recommendation (#1753 )	8 years ago
西小倉宏信	290e8ef854	Remove .keep in models (#1748 )	8 years ago
JP DeVries	1467515d3d	Use landmark regions on columns (#1732 ) Closes mastodon#1720	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
Eugen Rochko	41c697fd81	Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master	8 years ago
Eugen	c5afe573da	Fix drag & drop overlay not appearing on firefox (#1721 )	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
R Tucker	c4d39b1b3d	quick typo fix in en.jsx: Rejec -> Reject (#1701 )	8 years ago
Eugen	ac54da9394	Fix #1220 , fix #1671 - Hook up comment box to the Redux comment value (#1699 ) Fix username styling regression introduced in #1063 Fix report screen background regression introduced in #1415	8 years ago
Eugen	043862f411	Fix #1609 , fix #1628 - Revert #1397 (#1700 ) When transmitting data in a HTML-encoded element like <content type="html" />, relying on newlines being preserved is not wise, since HTML by itself does not care for newlines - it cares for <p> and <br> Additional fix: reset NSFW toggle after sending toot	8 years ago
INAGAKI Hiroshi	5619099564	translation: Fix comment out issue in en.jsx (#1698 )	8 years ago
Koala Yeung	ce80d0b0a9	Fix minor jslint issue (#1697 ) * Undefined propType in react component `ColumnSettings`. Add proper PropTypes definition.	8 years ago
Eugen Rochko	5f8155482a	Add overlay style to buttons, continue video after expanding it	8 years ago
Matteo Aquila	efcf9448da	Update settings_helper.rb	8 years ago
Eugen Rochko	e70b84b1dc	Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox	8 years ago
Rachel H	9362700137	Convert emoji shortnames when sending status (#1666 )	8 years ago
Koala Yeung	1206627c59	Add Dutch translation (nl) (#1682 ) * Dutch language files for Ruby code * Created RoR translation ymls: * config/locales/devise.nl.yml * config/locales/doorkeeper.nl.yml * config/locales/nl.yml * config/locales/simple_form.nl.yml * Modified RoR config and helper * app/helpers/settings_helper.rb * config/application.rb * Dutch language javascript locale * Created javascript locale files: * app/assets/javascripts/components/locales/index.jsx * app/assets/javascripts/components/locales/nl.jsx * Reference the newly created locale files: * app/assets/javascripts/components/containers/mastodon.jsx * Fix syntax error in locale file (nl) * Fix missing translate in js locale (nl) * Convert all ruby Dutch locale (nl) file to utf8 Fix yml conversion issues. * Fix duplicated key in devise.nl.yml * Fix indentation error in doorkeeper.nl.yml	8 years ago

1 2 3 4 5 ...

1510 Commits (baabbce6727555bf7047c5e989ac0ad75aa847fc)