mastodon

Commit Graph

Author	SHA1	Message	Date
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
Isabelle Knott	edefcfcf42	Fix issue where 'sensitive content click to show' item takes up whole screen on public view (#1692 )	8 years ago
Matt Jankowski	b330d1f000	Organize coverage dirs (#1695 ) * Add `Presenters` group to SimpleCov configuration * Move validators to app/validators, add to simplecov config	8 years ago
Eugen	1a5a54eb4b	Merge branch 'master' into master	8 years ago
Isabelle Knott	447b8bc44e	Do not show media attachment as og:image if it was marked as NSFW (#1693 )	8 years ago
Matt Jankowski	093879c177	Fix language export variables (#1689 ) * Fix naming of JS locale constants * Improve the translation instructions re: const names	8 years ago
Matteo Aquila	905a4faa1c	Update settings_helper.rb	8 years ago
Matteo Aquila	5355b7d930	Update settings_helper.rb	8 years ago
blackle	00cc3066a2	Allow video to be expanded into lightbox	8 years ago
YOSHIOKA Eiichiro	a57d30c680	[l10n] ja: update missing Japanese translations (#1687 )	8 years ago
Musee U	467d32fce3	[l10n] ja: update missing Japanese translations (#1684 )	8 years ago
Hugo Gameiro	282bb55c3c	fix Portuguese translation (#1661 ) * update portuguese translation added the missing fields and improved the translation * pt translations fix * improve last translation commit * fix damn quotes	8 years ago
新都心(Neet Shin)	0e4479bb3a	Update Japanese translation files (#1640 ) * [l10n] ja: Improve Japanese Translations * ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com> * Update ja.jsx * Update doorkeeper.ja.yml * Update ja.yml * Update ja.jsx * Update ja.jsx	8 years ago
Ratmir Karabut	af7e880df5	Update Russian translation (#1570 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error	8 years ago
Svetlozar Todorov	aa7bf1515c	Fix #624 - Add localization for Bulgarian (#645 ) * Add translation files and declarations for Bulgarian * Add a bunch of translations to bg.jsx * Add rest of translations to bg.jsx * Add devise translations * Fix devise translations	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
Koala Yeung	faefd8ec8f	Update javascript English translation files and some defaultValue (#1676 ) * Reorder javascript English locale file * Reorder translation string in order of the locale key. * Add javascript English locale missing language keys * Search all javascript language keys by command: `grep -REho '<FormattedMessage .\/>' ./app/assets/javascripts/.` Add all the missing language keys and their values to `en.jsx`. * Add javascript English locale missing language keys (2) * Find all `defineMessages` calls with this command: `grep -Rl 'defineMessages({.' ./app/assets/javascripts/.` Open all these files. Find the language key (`id`) in these statements. * Add all the missing language keys and their values to `en.jsx`. * Remove javascript English locale obsoleted language keys * Find all language keys that no longer exists in the source code and remove them. The removed keys include: * "compose_form.private" * "compose_form.unlisted" * "getting_started.about_addressing" * "getting_started.about_shortcuts" * "notification.mention" * "search.account" * "search.hashtag" * "tabs_bar.mentions" * "tabs_bar.public" * Javascript English locale file add note * Add notes to contributors about the English translation files. Hope that will make translation process smoother. * Update javascript locale defaultValue in code * Update the defaultValue in code according to the relevant translation in English locale file.	8 years ago
Isabelle Knott	96715d9af5	Clear spoiler when replying to toot that doesn't also have a spoiler (#1662 )	8 years ago
tom	af96e71883	Smoother scrolling on older iOS devices (#1654 ) This may address the scrolling issues mentioned here: https://github.com/tootsuite/mastodon/issues/1622	8 years ago
Thor Harald Johansen	ccaf3dbc5a	Adjustments to the Norwegian translation (#1648 ) * Working translation for Norwegian. * Fixes to Norwegian translation. * Further adjustments to Norwegian translation. * Further adjustments to Norwegian translation.	8 years ago
Isabelle Knott	1ea662963f	Use shift+click instead of alt+click to bypass boost dialog (#1638 )	8 years ago
Eugen	bd834add56	Fix visuals introduced in #1463 (#1634 )	8 years ago
lindwurm	9966bd27c2	[l10n] ja: Improve Japanese Translations (#1631 ) * ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com>	8 years ago
Isabelle Knott	b0ab632531	Fix missing compose box when viewport width is exactly 1024px (#1632 )	8 years ago
Knut Erik	e1264bbd92	Added norwegian version of terms of service and privacy policy (#1625 )	8 years ago
pinfort	38e24a699b	fix Japanese translation (#1623 ) * 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 * fix translations 翻訳の誤りの修正と改善 * freeの訳修正 * いいねをお気に入りに統一 * Revert "いいねをお気に入りに統一" This reverts commit `568d5cccfa`. 間違ってtranslateブランチにコミットしたため取り消し * Revert "freeの訳修正" This reverts commit `565658a605`. * revertでミスったので戻す * Revert "ミスったので戻す" This reverts commit `00be7a748a`, reversing changes made to `b4e1e06503`. * freeの訳修正 * いいねをお気に入りに統一 * 一回戻す * 戻しきれてなかった * 再度変更 * 戻す * 再度変更 * 再度変更 * Update doorkeeper.ja.yml Fixed a lot of unnatural translations * Update ja.yml 資格情報 isn't easy to understanding. so fixed to ログイン情報. * Update ja.yml fixed some unnatural translations * Update simple_form.ja.yml Fixed wrong translate 「アカウント」 to 「アイコン画像」 * Update simple_form.ja.yml * Update doorkeeper.ja.yml * Revert "多くの不自然な翻訳を解消しました。" * Update ja.jsx fixed typo * 文字化け修正	8 years ago
goofy-bz	9b698bf448	Update fr.jsx (#1551 ) fixing to minor typos	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
karlyeurl	dab9b5bd3a	locale-fr: fix typo (#1603 ) In this case, the adjective applies to a feminine noun.	8 years ago
Julien Deswaef	c4baa9fb6b	vector (svg) logo with correct inner shape and colors (#1362 ) * vector (svg) logo with correct inner shape and colors * minimized svg logo	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	aa90798386	Webfinger resource to extract username from resource string (#1607 ) * Add WebfingerResource class to extract usernames * Use WebfingerResource in xrd#webfinger	8 years ago
Rachel H	0930ce5560	Focus textarea when text is inserted (#1320 ) Place space after uploaded filenames	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
Carlos A. Escobar	3064ef96a1	Added missing Spanish translations strings (#1292 ) * Added missing Spanish translations strings * fix bad translation * resolve conflict with tootsuite/master * agreements from spanish community * Add some missing strings	8 years ago
lindwurm	ee69ece7b5	[web] Moving docs link to tootsuite/documentation (#1581 ) related: `1236529e39` and `fc47c1d00e` Signed-off-by: lindwurm <lindwurm.q@gmail.com>	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
Thor Harald Johansen	1f5ff46fd9	Working translation for Norwegian. (#1611 )	8 years ago
Matt Jankowski	13528f50c3	Params compact deprecation warning (#1580 ) * Move filter_link_to class formation to separate method in admin/accounts helper * Remove deprecated #compact method usage on strong parameters	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	b352a8e5d4	Default to json type for webfinger requests (#1583 )	8 years ago
Matt Jankowski	fd102059aa	Clean up stylesheet organization (#1591 )	8 years ago
Matt Jankowski	323671a653	Silence more scope order warnings (#1604 )	8 years ago
Koala Yeung	24eb45425e	Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544 ) * Added Chinese Traditional Hong Kong (zh-HK) for Ruby * Added translations for Ruby. * Added Chinese Traditional Hong Kong (zh-HK) for JS * Added translations for javascript code. * Rearrange language references in mastodon.jsx * Break `addLocaleData` into multiple lines. Make future commit more readable. * Roughly re-sort the languages in alphabetical orders (only manually put English on top because it is default). * Sort application.rb locale with alphabetical order With exception that English (default language) goes first. Improve code readability. * Resort language selection box alphabetically Sort HUMAN_LOCALES in the alphabetical order of display name (except English, the default language, come first). Improve usability.	8 years ago
Eugen	8ead070b94	Improve emoji picker look (#1493 ) * Improve emoji picker look * Add hover animation to emojis in picker	8 years ago
Eugen	b22b2cbfac	Fix #1491 - Fix broken notifications, broken Link header parsing for exclude_types (#1548 )	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
Henry Smith	1921c5416b	Fix console error when scrolling a column with no scrollable content (#1574 )	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
Thomas Citharel	327a6e166f	Update french locale (#1525 ) * Update devise.fr.yml fixing minor typos * add missing strings * Fix a translation and add translation for devise part Signed-off-by: Thomas Citharel <tcit@tcit.fr>	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
Matt Jankowski	89e8e110c8	Imports controller errors (#1553 ) * Add spec for settings/imports controller * Add failing spec for settings/imports#create * Fix broken imports * Refactor ImportWorker	8 years ago
Eugen Rochko	9f7ea77d0c	Merge branch 'master' of github.com:tootsuite/mastodon	8 years ago
Eugen Rochko	960181fd99	Fix look of the modals	8 years ago
Eugen Rochko	2a7602cad4	Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master	8 years ago
Komic	47aacb773b	Better background-photo.jpeg (#1560 ) Fixed the nasty banding & recompressed it at about the same level	8 years ago
Matt Jankowski	82d9336114	Increase breakpoint size for bio on account show (#1559 )	8 years ago
Matt Jankowski	e60286a344	Remove unused methods from StreamEntriesHelper (#1365 ) Removes: - avatar_for_status_url - relative_time - reblogged_by_me_class - favourited_by_me_class	8 years ago
Matt Jankowski	53850bce93	Remove unused AtomBuilderHelper (#1364 ) This was used in the views/atom/user_stream.xml.ruby file, which no longer is used.	8 years ago
blackle	06444bf050	Allow user to disable the boost confirm dialog in preferences	8 years ago
blackle	f53fb6aa66	Bypass boost confirm modal if alt is pressed	8 years ago
Corey Dutson	c9b9225951	Adjust css for user detail page (#1463 ) - details a background for contrast - add 5px padding to the top of the `details-counters` children to line them up with the bio to the right (Which has a 5px padding on the top)	8 years ago
blackle	01e5447e35	Add boost confirm modal	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	b57eed4584	Remove order prior to .find_in_batches (#1470 ) The `Status` class has a default order on it, so when this query gets built and gets all the way to `find_in_batches` there is an order already there. When `find_in_batches` is run it discards any existing order on the query, and emits a warning to the logs if there is one there. This change removes the order prior calling `find_in_batches`, which will stop the logged warning from occurring as well.	8 years ago
Matthias Jouan	3fd5385e7b	Add username as a title for mentions (#1385 ) Add a title attribute on mention links for both notifications and mentions in statuses. Related to #1350	8 years ago
Eugen	2810013b93	API param to exclude notification types from response (#1341 ) * Add exclude_types param to /api/v1/notifications * Exclude notification types in web UI through exclude_types in the API	8 years ago
Matt Jankowski	0687ab8ae3	Clean up generation of account webfinger string (#1477 ) * Consolidate webfinger string creation under Account#to_webfinger_s * Introduce Account#local_username_and_domain for consolidation	8 years ago

1 2 3 4 5 ...

1438 Commits (8ebed7fc68bed3e3a1327294588ec234ff5b2482)