catstodon

mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-25 03:58:07 +01:00

Author	SHA1	Message	Date
ik-fib	47a3036ea6	Add Mastodon version to user agent (#2253 )	2017-04-21 17:26:23 +02:00
Yamagishi Kazutoshi	60a9b938b4	Upgrade jQuery to v2.x (#2246 ) Fix #2199 and minifying assets file. jQuery v1.x is supports legacy browsers. But, Mastodon does not support legacy browsers. I think jQuery v1.x is unnecessary.	2017-04-21 16:46:32 +02:00
Jérémy Benoist	b3329c362e	Open authorized application in a new window (#2250 ) Like it's already done when you click on an application from a toot, it's opening in a new window. `0254ee9795/app/views/stream_entries/_detailed_status.html.haml (L41)`	2017-04-21 16:44:14 +02:00
Ash Furrow	a0ed88a99b	Adds version to about/more and API (#2181 ) * Adds version. * Cleans up code. * Removes standalone endpoint and adds version to instance endpoint. * Addresses feedback from #2181.	2017-04-21 03:30:59 +02:00
May Kittens Devour Your Soul	25d2853db2	Croatian language updates & fixes (#2203 ) * Update hr.jsx * Update and rename simple.form.hr.yml to simple_form.hr.yml fixed file name * Update hr.yml * Update hr.yml	2017-04-21 03:30:15 +02:00
Quent-in	1930051bde	Adjustment of oc.jsx (#2214 )	2017-04-21 03:30:01 +02:00
Ash Furrow	6c34eafe02	Enables the Polish translation. (#2235 )	2017-04-21 03:29:11 +02:00
jeroenpraat	bbff431e3a	Updated Dutch strings and added Dutch onboarding modal strings (#2243 ) * A bit of more explanation * Update nl.yml * That's more elegant * More consistent and adding missing translation * Update * Update * Added Dutch onboarding modal strings	2017-04-21 03:29:00 +02:00
Mingye Wang	3660a321f0	zh*: minor jsx whitespace fix (#2231 )	2017-04-21 03:28:45 +02:00
Yeechan Lu	e06f307c2d	Fix Chinese (China) translation availability (#2230 )	2017-04-21 03:28:38 +02:00
Matt Jankowski	2dda356e3f	Clean up settings/preferences controller (#2237 ) * Add missing fields group on preferences page * Clean up settings/preferences controller * Extract a UserSettingsDecorator	2017-04-21 03:26:52 +02:00
Andrey Blinov	972f6bc861	Fix Textarea height should be reset upon sending toot #2189 (#2236 )	2017-04-20 23:53:54 +02:00
Shel R	d2514445e1	Repair most egregious mistakes in onboarding modal (#1964 ) * Repair most egregious mistakes The deployed changes broke the pedagogy and curriculum built into the design of the onboarding modals, which had been reviewed and approved by various other contributors. While the changed layouts of the pages make some of the original decisions impossible to re-implement without substantial work, these changes should at least make the modals not outright terrible. The empty confusing description of Mastodon was replaced with an actual basic explanation of federation. The language was modified to be friendly and conversational again. Grammatical errors were fixed. The explanations of local and federated timelines were re-ordered to be in the direct that the menus go, top to bottom, and the sentence was re-added which explains that they are what "public timelines" refers to (since this phrasing is used elsewhere in the UI) and suggests the user use them to discover who to follow. A figure of the profile picture that lives above the compose box was padded to page two to serve as a landmark for less technically literate users to easily find the compose box and understand that the next page is moving upwards, so that they can find the search bar. Ideally, the elephant artwork should be either removed or replaced with something less depressing. Room should be made to point users at the notifications column's settings icon because "how do I turn off the notification noise" is one of the most asked questions of new users and those icons are not easily noticeable. This last part may be made obsolete if the settings UI is later re-worked. * Change copy This commit addresses copy change suggestions made in the PR discussion * Add periods to ends of sentences missing periods * Made "Home" "Federated" "Local" and "Notifications" lowercase * Separate explanation of "connecting" and the word "instance" into two sentences, to make the sentence less dense.	2017-04-20 18:20:40 +02:00
Alda Marteau-Hardi	daa46f14c4	French translation cleanup (#2223 ) * Alphabetically order translation keys * Fix some missing gender neutral translations in french * Add a comment to remind contributors to order translations by key	2017-04-20 17:19:05 +02:00
Matt Jankowski	1ada494bb2	Admin settings controller refactor, add specs, cleanup (#2225 ) * Add render_views for admin/settings spec * Add coverage for admin/settings#update * Add coverage for admin/settings typecasting open_registrations setting * Simplify how admin/settings finds the value for updating * Rely on activerecord to not update a value that hasnt changed * Add coverage for non-existent setting * Use a constant for boolean settings	2017-04-20 17:18:09 +02:00
Yamagishi Kazutoshi	fdb2689a14	Fix PropTypes warning in OnboardingModal (#2191 )	2017-04-20 13:22:54 +02:00
Matt Jankowski	598d3defd5	Use default locale for html lang in layouts (#2212 )	2017-04-20 13:09:31 +02:00
Matt Jankowski	7f8044d913	Link to profile/feed/salmon from admin/accounts show page (#2186 )	2017-04-20 04:00:02 +02:00
Eugen	cae2a26ee3	Fix #2120 - Use Status#as_tag_timeline on public hashtag page (#2182 ) * Fix #2120 - Use Status#as_tag_timeline on public hashtag page * Update tags_controller.rb	2017-04-20 03:54:02 +02:00
Eugen	2e4afccd9d	Fix #2108 - Fix gif uploads (#2171 ) * Fix #2108 - Fix gif uploads Add specs for media attachment gifv conversion * Add ffmpeg to travis * Make travis install ffmpeg, not libav * Switch travis to trusty	2017-04-19 23:21:00 +02:00
Darshak Parikh	43caf1fa5f	Add some Spanish translatoins (#2170 )	2017-04-19 22:19:41 +02:00
alpaca-tc	2c0d756ad9	Extract error messages to locale file (#2162 )	2017-04-19 22:19:32 +02:00
jeroenpraat	f06cba3f60	Dutch language strings: a few important fixes (#2163 )	2017-04-19 22:19:19 +02:00
György Nádudvari	09dad88853	Fixed hungarian translation (#2158 )	2017-04-19 19:21:44 +02:00
Tomohiro Suwa	7832425fdd	Fix css for toot button when uploading images (#2161 )	2017-04-19 19:21:23 +02:00
fsubal	abe16a7026	fix broken style when follower has long description (#2159 )	2017-04-19 19:20:51 +02:00
Eugen	baabbce672	Fix double-escaping of display names in <title> (#2155 )	2017-04-19 17:46:24 +02:00
Eugen	1d47910d3b	Fix possibility of unrightful webfinger redirect (#2147 ) * Fix possibility of unrightful webfinger redirect * Add more tests for FollowRemoteAccountService	2017-04-19 17:28:35 +02:00
Matt Jankowski	708bdd53f1	Remove unused view files in accounts/ (#2153 )	2017-04-19 17:19:23 +02:00
Yamagishi Kazutoshi	2510119f19	Add meta tags for OGP to following & follow page (#2052 ) * Add meta tags for OGP to following & follow page * simplify render helper * Follow up #2133 * og:type is only accounts/show * revert accounts/{following,followers}	2017-04-19 17:17:32 +02:00
matsurai25	fe1ddc3b96	fix Japanese search result translation (#2149 ) add 'result' mean, '件' only mean count unit.	2017-04-19 16:41:30 +02:00
Matteo Aquila	a3486e0543	Completed Italian translation (#2151 ) * Added it.jsx * Update index.jsx * Update mastodon.jsx	2017-04-19 16:40:45 +02:00
matsurai25	30183c0a74	fix search text 'zero' (#2150 )	2017-04-19 16:40:24 +02:00
geta6	15a4fc5dcc	Automatically change the size of textarea (#2128 )	2017-04-19 15:39:46 +02:00
Matt Jankowski	a8e1afc30a	Simplify render in controllers (#2144 )	2017-04-19 15:37:42 +02:00
Eugen	bfbc2ca0d8	Attachment list for uncached attachments (#2110 ) * For undownloaded attachments, set type :unknown, display them as a list in the web UI * Fix case when attachment type is set explicitly	2017-04-19 15:37:18 +02:00
alpaca-tc	5ce8a1811a	Replace User.count -> User.confirmed.count (#2127 )	2017-04-19 14:58:27 +02:00
Yamagishi Kazutoshi	dca0ffa1a1	Remove unnecessary word from Japanese locale (#2143 )	2017-04-19 14:54:47 +02:00
abcang	70891a99a9	Fix html escape characters in the URL (#2138 ) * fix character escaping in URL * add tests * put a comma after the last item * add HTML escape test	2017-04-19 14:52:18 +02:00
857b	3572f4423f	enable to scroll the setting's page sidebar (#1347 ) * enable to scroll the setting's page sidebar add scroll:auto and use margin instead of padding for the bottom * Update admin.scss * Update admin.scss * Update admin.scss	2017-04-19 14:30:23 +02:00
Isabelle Knott	97012487ed	Do not show link preview card if toot has a spoiler (#1617 ) * Do not show link preview card if toot has a spoiler * == to ===	2017-04-19 14:28:00 +02:00
Ash Furrow	9a7ea7c870	Moves from hamburger icon to asterisk. (#2116 )	2017-04-19 14:21:14 +02:00
chrolis	1ac41c873a	Improve visibility of mute, block, report menu in Japanese (#2131 )	2017-04-19 14:21:00 +02:00
Misty De Meo	2bb54d5c57	Update title text for "reply all" button (#2118 )	2017-04-19 14:20:04 +02:00
Matt Jankowski	8bac0350d1	Restful refactor of accounts/ routes (#2133 ) * Add routing specs for accounts followers and following actions * Use more restful route naming for public account follow pages Moves two actions: - accounts#followers to accounts/follower_accounts#index - accounts#following to accounts/following_accounts#index Adds routing spec to ensure prior URLs are preserved.	2017-04-19 13:52:37 +02:00
Kota Ouchi	c0b30c56db	Update ja.yml (follow for #2118 ) (#2137 ) * Update ja.yml (follow for #2118) * typo fix	2017-04-19 13:44:07 +02:00
Eugen	c6a4ab3b92	Remove unused fonts (#2103 )	2017-04-18 23:34:50 +02:00
Eugen	e09ab2c0bd	Fix #1642 , fix #1912 - Dictate content-type file extension (#2078 ) * Fix #1642, fix #1912 - Previous change (#1718) did not modify how original file was saved on upload * Fix for when file is missing	2017-04-18 23:15:44 +02:00
Matt Jankowski	297c11dba2	Language detection refactor (#2099 ) * Extract detect_language to separate class * Use default locale, not just en * Add spec to confirm that whatlanguage cant identify empty string * Allow account locale to override default in language detector * PostStatusService supplies an account to detect language	2017-04-18 22:20:12 +02:00
happycoloredbanana	0a7588282a	Remove API authentication for public statuses (after review) (#1919 )	2017-04-18 21:58:57 +02:00
Mingye Wang	3ed219f907	Polish zh-cn js translation (#2090 ) * Polish zh-cn js translation * fixes for problems pointed out by gumblex in #2044 * more effectively differentiate between following/follower * Fix missing period (zh-cn js) Maybe squash this commit? * Fix duplicate word (zh-cn js)	2017-04-18 21:29:31 +02:00
Matt Jankowski	55e1503522	Instances list in admin (#2095 ) * Add admin/instances index action * Add link to instances admin page * View lists instances * Instances, grouped by domain, ordered by count * Use Account.remote scope * Extract method: Account.by_domain_accounts	2017-04-18 21:09:07 +02:00
Matt Jankowski	66d8f99a30	Admin reports with accounts (#2092 ) * Add a ReportFilter class * Add reports and targeted_reports relationships to Account * Use ReportFilter from admin/reports controller * Link to admin/reports filtered views from admin account show view * Add indexes to reports.account_id and reports.target_account_id	2017-04-18 19:36:18 +02:00
Tomohiro Suwa	f23281e31e	Disable toot button when above 500 characters (#2088 ) * Disable toot button when above 500 characters * Consider multibyte characters * Consider spoiler_text	2017-04-18 19:35:55 +02:00
spf	9783d8b6c0	fix admin input display (#1633 )	2017-04-18 17:25:44 +02:00
JP DeVries	7525971561	Moving aria-label to div.column (#1769 ) * Use landmark regions on columns Closes mastodon#1720 * Moving aria-label to div.column	2017-04-18 17:21:25 +02:00
Matt Jankowski	84b5fae8e3	Simplify renders in views (#2084 ) * Simplify render in mailer views * Simplify render in about/more view * Simplify render in accounts follow views * Simplify render in recovery code views * Simplify render in stream entry embed * Simplify render in stream entries status partial * Simplify render in authorize follow new view	2017-04-18 17:15:30 +02:00
ik-fib	23ecc681c4	Add "Mastodon" to user agent (#2073 ) Remove non-const version string Freeze option is unnecessary	2017-04-18 16:04:13 +02:00
Keiji, Yoshimi	82bbf57e7a	Translate onboarding dialog to japanese (#2062 ) * translate onboarding modal to japanese * fixed translation by feedback	2017-04-18 16:03:27 +02:00
839	e2a1b574ab	Avoid dynamic methods due to processing speed (#2080 )	2017-04-18 15:57:46 +02:00
Andrey Blinov	880590ad0d	Fix header icons in navigation bar (#2081 )	2017-04-18 15:57:16 +02:00
Koala Yeung	0a1b024600	Add Occitan (oc) translation (#2077 ) * Added oc.yml * Added `config/locales/oc.yml`. Translated in General Occitan (Quent-in). * Added oc.jsx (Occitan translation) * Written in General Occitan (lengadocian) * Added `app/assets/javascripts/components/locales/oc.js` * Added doorkeeper.oc.yml * Added `config/locales/doorkeeper.oc.yml` (Quent-in) * Added simple_form.oc.yml * Added `config/locales/simple_form.oc.yml` (Quent-in). * Merge en.yml changes into oc.yml Added new strings for translations * Fix typo in oc.yml * Update javascript locale support (oc) * Update ruby locale list (oc) * Fix oc.yml * Remove obsoleted translations * Moved old translation of `reports` to `admin.reports`	2017-04-18 15:21:16 +02:00
Ratmir Karabut	50ed72767d	Update Russian translation (#1967 ) * 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 * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency	2017-04-18 15:20:37 +02:00
geta6	75910abd8f	Add hasMore field to account timeline (#2066 )	2017-04-18 13:10:49 +02:00
Eugen Rochko	42d54dc9ea	Adjust visuals of non-autoplaying GIFV	2017-04-18 01:57:50 +02:00
Eugen Rochko	57d784f1e4	Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif	2017-04-18 01:25:50 +02:00
Matt Jankowski	16d50f60d1	Remove unused methods (#1730 ) * Remove unused method #set_counters_maps from api controller * Remove unused method #set_account_counters_maps from api controller * Remove unused method Account#followers_domains * Remove unused User.prolific scope * Add mastodon:users:admins task to list all admin emails * Use interpolated query style in Account.triadic_closures * Coverage for Account.triadic_closures	2017-04-18 01:21:55 +02:00
Eugen Rochko	f5cd0b4956	Rename cache key to exclude_account_ids_for:id, adjust formatting	2017-04-18 01:14:02 +02:00
Eugen Rochko	2fd0473aa1	Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking	2017-04-18 01:09:57 +02:00
Damien Erambert	9cefb5731d	Add FR locales to the onboarding modal (#1976 ) * Add FR locale for the onboarding modal component * Slightly increase the max-width and max-height of the onboarding modal This is done so it doesn't break with locales whose strings would be too long * Update FR locales for onboarding upon PR comments	2017-04-18 01:02:02 +02:00
Mingye Wang	00a85f31ca	Add simplified Chinese js translation (#2044 ) This single-file commit, heavily based on the zh-hk version as of `ec9999c`, fixes the missing js locale. Intentional, significant departures from current zh-cn yml localizations have been marked with rationales given.	2017-04-18 01:01:32 +02:00
Matt Jankowski	389f8f8249	Instance helper to replace site title helper (#2038 ) * Move site title helper to instance helper (name change only) * Remove newline in <title> tag * Add site_hostname helper method to wrap up local_domain value * Use site_hostname helper in places that need local_domain value	2017-04-18 00:16:32 +02:00
jeroenpraat	e1e15adf1d	Updated, improved and fixed Dutch language strings (#2030 ) * Fixed some words * Improved and more consistent * Fixes and a bit less 'je' * Improved and more consistent * Another round of improvements and consistency * More improvements and less 'je' * Update * Updated with admin strings * More improvements and additions - not complete yet, but most is there * This is what we call in Dutch 'the English disease' :-) * fix comma * admin.reportsi * not needed * hopefully now fixed	2017-04-18 00:16:03 +02:00
Matt Jankowski	f96f8d0176	Use .presence instead of ternary on site description for og: content (#2033 )	2017-04-17 23:19:45 +02:00
Sam Hewitt	a05e7582e4	optimized logo (#2020 ) - adjusted elements to fit the pixel grid for better scaling - optimized the PNG asset and the SVG asset	2017-04-17 21:49:51 +02:00
Andrey Blinov	7d1e653ec1	Fix import pt_br locale in mastodon.jsx (#2011 )	2017-04-17 21:01:42 +02:00
Zac Anger	7b397b1452	Return early from submit if no text. (#1962 )	2017-04-17 20:30:38 +02:00
Matt Jankowski	cc1361c149	Media controller specs (#2022 ) * Add spec for media controller * Add MediaAttachment.attached scope * Simplify methods in media controller	2017-04-17 20:02:00 +02:00
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	2017-04-17 19:58:54 +02:00
Eugen	e43071a2f9	Fix #1897 - Return reblogged: false on unreblog (was wrongly named variable) (#1989 )	2017-04-17 19:58:38 +02:00
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	2017-04-17 19:58:03 +02:00
Tomohiro Suwa	3399dd7a66	Fix nil query_username (#2013 )	2017-04-17 19:57:02 +02:00
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 ```	2017-04-17 15:54:33 +02:00
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"	2017-04-17 15:15:14 +02:00
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	2017-04-17 12:27:19 +02:00
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	2017-04-17 12:14:03 +02:00
Dale Price	f3b86c1bda	Add mask-icon.svg (#1572 ) (#1585 ) * Add mask-icon (#1572) * use updated svg logo for mask-icon	2017-04-17 10:39:54 +02:00
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	2017-04-17 10:38:27 +02:00
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	2017-04-17 10:38:13 +02:00
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.	2017-04-17 10:37:00 +02:00
Yamagishi Kazutoshi	6afe70db95	Add human locales for zh-tw (#1984 )	2017-04-17 10:35:06 +02:00
usagi-f	b87a08e160	Add function color remaining text (#1980 )	2017-04-17 10:34:33 +02:00
anon	f8ae12909c	Fix tiny typo, and added link to terms and conditions in confirmation email for Japanese. (#1975 ) (#1975 )	2017-04-17 10:32:09 +02:00
saturday06	d87ee1167e	Assign user locale on signup (#1982 )	2017-04-17 10:29:08 +02:00
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.	2017-04-17 04:23:13 +02:00
Eugen	1955a3f444	Do not display "reset password" in admin UI for remote accounts (#1960 )	2017-04-16 23:15:58 +02:00
Eugen	8ebed7fc68	Fix #1957 - WhatLanguage can return null. Fallback to 'en' (#1959 )	2017-04-16 23:12:19 +02:00
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	2017-04-16 20:32:27 +02:00
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	2017-04-16 20:32:17 +02:00
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	2017-04-16 20:32:00 +02:00
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 350ef2685fadc069e619bb6d1066190de195d942. * 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	2017-04-16 19:37:01 +02:00
alpaca-tc	19f63ff801	Check @recipient.user at the first (#1939 )	2017-04-16 18:04:05 +02:00
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	2017-04-16 18:01:48 +02:00
Effy Elden	acd33101c5	Merge branch 'master' into fix/cache_blocking	2017-04-17 01:41:33 +10:00
Matt Jankowski	e0b5a94a4b	Clean up check that account needs a webfinger update (#1932 )	2017-04-16 16:38:29 +02:00
Matt Jankowski	26ec042f38	Remove trailing whitespace in terms.no.html (#1933 )	2017-04-16 16:38:13 +02:00
Matt Jankowski	73b0af5c93	Simplify the og:image and og:description code in stream_entries/show (#1934 )	2017-04-16 16:38:02 +02:00
Matt Jankowski	7efde22c3a	Use local vars in partials (#1935 ) * Use local vars in accounts/header partial * Use local variable in 2fa recovery codes partial	2017-04-16 16:37:49 +02:00
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	2017-04-16 16:33:38 +02:00
tackeyy	fc34e0e191	Remove .keep in models (#1892 )	2017-04-16 16:28:52 +02:00
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 ```	2017-04-16 16:28:26 +02:00
mshrtkch	2c329f2b69	Fix translation related to "mute" (#1926 )	2017-04-16 16:07:58 +02:00
alpaca-tc	8f8319852c	Fixed NoMethodError in UnfollowService (#1918 )	2017-04-16 14:55:43 +02:00
Matt Jankowski	75f416a492	Fix yaml issue in ja locale (#1916 ) * Fix yaml parse issue in ja.yml locale * Fix issue in locales/ja.jsx	2017-04-16 14:55:04 +02:00
Naouak	24baaa17e8	Syntax error in japanese localisation (#1920 ) assets:precompile was failling because of this missing comma.	2017-04-16 14:54:09 +02:00
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	2017-04-16 14:15:03 +02:00
Yuki Nakagawa	a8f45c0838	Enlarge font size to avoid autozooming of iPhone. (#1911 )	2017-04-16 14:05:16 +02:00
新都心(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	2017-04-16 13:42:16 +02:00
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	2017-04-16 12:51:30 +02:00
Keiji Yoshimi	fd81916e86	cache blockings for reducing queries.	2017-04-16 12:20:38 +09:00
Eugen	8a58942c80	Fix up recovery codes design a little (#1866 )	2017-04-16 04:32:57 +02:00
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	2017-04-16 03:40:33 +02:00
Eugen	95bcbaa434	Fix #1852 - Ensure feeds have valid <title> tags (#1875 )	2017-04-16 02:40:36 +02:00
Isabelle Knott	911338bdcc	Show error message if video cannot be loaded (#1879 )	2017-04-16 01:12:47 +02:00
Eugen	e332552816	Indicate when a toot is part of a chain with a "reply all" icon (#1869 )	2017-04-15 22:48:41 +02:00
Eugen	0d83569899	Fix cross-origin integrity (#1871 ) See <https://glitch.social/users/bea/updates/434>	2017-04-15 22:48:30 +02:00
Eugen	515434ed87	English localization for mention notification was missing (#1867 )	2017-04-15 22:48:17 +02:00
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.	2017-04-15 22:47:48 +02:00
alpaca-tc	00392d3c63	ActiveRecord::NotFound is not defined (#1864 )	2017-04-15 21:17:59 +02:00
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	2017-04-15 16:46:27 +02:00
Matt Jankowski	6670e6d33f	Add password reset for users from admin accounts area (#1841 )	2017-04-15 16:44:59 +02:00
Henry Smith	9d2f55ecc3	Remove isRequired from optional prop (#1843 )	2017-04-15 16:44:28 +02:00
Henry Smith	b7ec2fd492	Fix function call name typo (#1851 )	2017-04-15 16:41:22 +02:00
Matt Jankowski	3b8908c114	About page contact email (#1839 ) * Correct site_contact_email typo * Separate about more page into partials, add specs	2017-04-15 13:33:25 +02:00
Alex Dunn	0f889523e4	views/about: use Setting.site_title instead of hardcoding (#1508 )	2017-04-15 13:28:09 +02:00
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).	2017-04-15 13:27:27 +02:00
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	2017-04-15 13:26:03 +02:00
Amakasu Ryoma	f0f6a3279a	Update ja.jsx (#1822 ) * Add getting_started.apps * Add search_results.total * Fix notifications.settings	2017-04-15 13:24:33 +02:00
Alda Marteau-Hardi	bddd36f260	Add a classname to the loading bar (#1826 )	2017-04-15 13:17:54 +02:00
Keiji, Yoshimi	b857551617	fixed privacy mistake of japanese translation of privacy.change (#1832 )	2017-04-15 13:17:20 +02:00
alpaca-tc	f9d7ec8971	ActiveRecord::Relation does not respond to `#id` (#1834 )	2017-04-15 13:16:24 +02:00
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.	2017-04-15 03:17:07 +02:00
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	2017-04-15 03:16:05 +02:00
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	2017-04-15 03:09:55 +02:00
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.	2017-04-15 02:57:26 +02:00
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	2017-04-15 02:48:30 +02:00
Fjoerfoks	4ba6acd518	Update nl.jxs (#1766 ) Some rewording and switching to infinitive localization.	2017-04-15 02:44:33 +02:00
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	2017-04-15 02:43:51 +02:00
Matt Jankowski	cde1f37d93	Use site title on tags#show page (#1802 )	2017-04-15 02:37:20 +02:00
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.	2017-04-15 02:33:37 +02:00
Joachim Viide	ef879a8839	Send initial state in a <script type="application/json"> tag (#1806 )	2017-04-15 02:32:42 +02:00
Alex Dunn	0655f16cc1	[css] reduce spacing between text elements on about pages (#1510 )	2017-04-15 02:29:32 +02:00
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.	2017-04-15 02:15:46 +02:00
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.	2017-04-15 01:23:49 +02:00
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	2017-04-15 01:12:39 +02:00
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).	2017-04-14 13:22:56 +02:00
Matt Jankowski	26a892dd90	Fix invalid byte sequence issue in nl.jsx (#1751 )	2017-04-14 13:00:03 +02:00
Effy Elden	8321884eef	Change usage of gsub to delete, as per Code Climate/Rubocop recommendation (#1753 )	2017-04-14 12:50:00 +02:00
西小倉宏信	290e8ef854	Remove .keep in models (#1748 )	2017-04-14 12:43:29 +02:00
JP DeVries	1467515d3d	Use landmark regions on columns (#1732 ) Closes mastodon#1720	2017-04-14 11:12:59 +02:00
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	2017-04-14 11:10:28 +02:00
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	2017-04-14 11:09:20 +02:00
Eugen Rochko	41c697fd81	Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master	2017-04-13 22:25:07 +02:00
Eugen	c5afe573da	Fix drag & drop overlay not appearing on firefox (#1721 )	2017-04-13 22:21:34 +02:00
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	2017-04-13 21:49:07 +02:00
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.	2017-04-13 19:50:19 +02:00
R Tucker	c4d39b1b3d	quick typo fix in en.jsx: Rejec -> Reject (#1701 )	2017-04-13 19:37:04 +02:00
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	2017-04-13 19:36:41 +02:00
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	2017-04-13 19:23:36 +02:00
INAGAKI Hiroshi	5619099564	translation: Fix comment out issue in en.jsx (#1698 )	2017-04-13 17:11:18 +02:00
Koala Yeung	ce80d0b0a9	Fix minor jslint issue (#1697 ) * Undefined propType in react component `ColumnSettings`. Add proper PropTypes definition.	2017-04-13 17:10:48 +02:00
Eugen Rochko	5f8155482a	Add overlay style to buttons, continue video after expanding it	2017-04-13 17:01:09 +02:00
Matteo Aquila	efcf9448da	Update settings_helper.rb	2017-04-13 16:16:39 +02:00
Eugen Rochko	e70b84b1dc	Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox	2017-04-13 16:14:11 +02:00
Rachel H	9362700137	Convert emoji shortnames when sending status (#1666 )	2017-04-13 16:03:45 +02:00
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	2017-04-13 16:02:23 +02:00
Isabelle Knott	edefcfcf42	Fix issue where 'sensitive content click to show' item takes up whole screen on public view (#1692 )	2017-04-13 16:00:56 +02:00
Matt Jankowski	b330d1f000	Organize coverage dirs (#1695 ) * Add `Presenters` group to SimpleCov configuration * Move validators to app/validators, add to simplecov config	2017-04-13 16:00:31 +02:00
Eugen	1a5a54eb4b	Merge branch 'master' into master	2017-04-13 16:00:20 +02:00
Isabelle Knott	447b8bc44e	Do not show media attachment as og:image if it was marked as NSFW (#1693 )	2017-04-13 15:59:43 +02:00
Matt Jankowski	093879c177	Fix language export variables (#1689 ) * Fix naming of JS locale constants * Improve the translation instructions re: const names	2017-04-13 15:59:12 +02:00
Matteo Aquila	905a4faa1c	Update settings_helper.rb	2017-04-13 15:32:31 +02:00
Matteo Aquila	5355b7d930	Update settings_helper.rb	2017-04-13 15:31:38 +02:00
blackle	00cc3066a2	Allow video to be expanded into lightbox	2017-04-13 09:09:45 -04:00
YOSHIOKA Eiichiro	a57d30c680	[l10n] ja: update missing Japanese translations (#1687 )	2017-04-13 14:39:14 +02:00
Musee U	467d32fce3	[l10n] ja: update missing Japanese translations (#1684 )	2017-04-13 13:40:58 +02:00
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	2017-04-13 13:25:34 +02:00
新都心(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	2017-04-13 13:23:45 +02:00
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	2017-04-13 13:23:23 +02:00
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	2017-04-13 13:16:28 +02:00
Daijiro Wachi	4f781b17cc	Use input type `number` for Two-factor code (#1683 )	2017-04-13 13:13:17 +02:00
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	2017-04-13 13:09:07 +02:00
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	2017-04-13 13:04:23 +02:00
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	2017-04-13 13:02:02 +02:00
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.	2017-04-13 12:57:41 +02:00
Isabelle Knott	96715d9af5	Clear spoiler when replying to toot that doesn't also have a spoiler (#1662 )	2017-04-13 03:17:34 +02:00
tom	af96e71883	Smoother scrolling on older iOS devices (#1654 ) This may address the scrolling issues mentioned here: https://github.com/tootsuite/mastodon/issues/1622	2017-04-13 02:50:56 +02:00
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.	2017-04-13 02:17:26 +02:00
Isabelle Knott	1ea662963f	Use shift+click instead of alt+click to bypass boost dialog (#1638 )	2017-04-13 02:15:45 +02:00
Eugen	bd834add56	Fix visuals introduced in #1463 (#1634 )	2017-04-12 20:54:49 +02:00
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>	2017-04-12 20:41:50 +02:00
Isabelle Knott	b0ab632531	Fix missing compose box when viewport width is exactly 1024px (#1632 )	2017-04-12 20:40:03 +02:00
Knut Erik	e1264bbd92	Added norwegian version of terms of service and privacy policy (#1625 )	2017-04-12 20:28:56 +02:00
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 568d5cccfa0b6620ccb6c9db8346c52c0396d99f. 間違ってtranslateブランチにコミットしたため取り消し * Revert "freeの訳修正" This reverts commit 565658a60583ff7e1e7a63ef597bf3ac6118e1bf. * revertでミスったので戻す * Revert "ミスったので戻す" This reverts commit 00be7a748a6a2ae85a62be847172424278c52ec7, reversing changes made to b4e1e06503c77e079cb2569a53ab4d6fcfcfd116. * 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 * 文字化け修正	2017-04-12 20:19:38 +02:00
goofy-bz	9b698bf448	Update fr.jsx (#1551 ) fixing to minor typos	2017-04-12 20:11:09 +02:00
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	2017-04-12 20:04:33 +02:00
karlyeurl	dab9b5bd3a	locale-fr: fix typo (#1603 ) In this case, the adjective applies to a feminine noun.	2017-04-12 19:54:16 +02:00
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	2017-04-12 19:10:52 +02:00
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.	2017-04-12 13:09:58 -04:00
Matt Jankowski	c44a700252	Quick best practice cleanup of views/helpers (#1546 ) * Remove trailing whitespace * Use query methods instead of explicit .blank? checks	2017-04-12 18:24:18 +02:00
Matt Jankowski	aa90798386	Webfinger resource to extract username from resource string (#1607 ) * Add WebfingerResource class to extract usernames * Use WebfingerResource in xrd#webfinger	2017-04-12 18:22:38 +02:00
Rachel H	0930ce5560	Focus textarea when text is inserted (#1320 ) Place space after uploaded filenames	2017-04-12 18:21:07 +02:00
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	2017-04-12 18:20:44 +02:00
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	2017-04-12 17:16:40 +02:00
lindwurm	ee69ece7b5	[web] Moving docs link to tootsuite/documentation (#1581 ) related: `1236529e39` and `fc47c1d00e` Signed-off-by: lindwurm <lindwurm.q@gmail.com>	2017-04-12 17:13:19 +02:00
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>	2017-04-12 17:11:49 +02:00
Thor Harald Johansen	1f5ff46fd9	Working translation for Norwegian. (#1611 )	2017-04-12 17:07:51 +02:00
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	2017-04-12 16:12:56 +02:00
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	2017-04-12 16:12:42 +02:00
Matt Jankowski	b352a8e5d4	Default to json type for webfinger requests (#1583 )	2017-04-12 16:03:37 +02:00
Matt Jankowski	fd102059aa	Clean up stylesheet organization (#1591 )	2017-04-12 16:01:59 +02:00
Matt Jankowski	323671a653	Silence more scope order warnings (#1604 )	2017-04-12 15:58:08 +02:00
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.	2017-04-12 08:50:50 +02:00
Eugen	8ead070b94	Improve emoji picker look (#1493 ) * Improve emoji picker look * Add hover animation to emojis in picker	2017-04-11 23:23:34 +02:00
Eugen	b22b2cbfac	Fix #1491 - Fix broken notifications, broken Link header parsing for exclude_types (#1548 )	2017-04-11 22:53:58 +02:00
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	2017-04-11 22:00:43 +02:00
Henry Smith	1921c5416b	Fix console error when scrolling a column with no scrollable content (#1574 )	2017-04-11 21:58:28 +02:00
lindwurm	fc47c1d00e	[about] Moving docs link to tootsuite/documentation (#1573 ) related: `1236529e39` Signed-off-by: lindwurm <lindwurm.q@gmail.com>	2017-04-11 21:57:05 +02:00
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>	2017-04-11 21:54:40 +02:00
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	2017-04-11 21:52:09 +02:00
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	2017-04-11 21:40:14 +02:00
Eugen Rochko	9f7ea77d0c	Merge branch 'master' of github.com:tootsuite/mastodon	2017-04-11 21:30:48 +02:00
Eugen Rochko	960181fd99	Fix look of the modals	2017-04-11 21:24:17 +02:00
Eugen Rochko	2a7602cad4	Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master	2017-04-11 20:43:56 +02:00
Komic	47aacb773b	Better background-photo.jpeg (#1560 ) Fixed the nasty banding & recompressed it at about the same level	2017-04-11 19:51:13 +02:00
Matt Jankowski	82d9336114	Increase breakpoint size for bio on account show (#1559 )	2017-04-11 19:35:06 +02:00
Matt Jankowski	e60286a344	Remove unused methods from StreamEntriesHelper (#1365 ) Removes: - avatar_for_status_url - relative_time - reblogged_by_me_class - favourited_by_me_class	2017-04-11 19:32:02 +02:00
Matt Jankowski	53850bce93	Remove unused AtomBuilderHelper (#1364 ) This was used in the views/atom/user_stream.xml.ruby file, which no longer is used.	2017-04-11 19:31:22 +02:00
blackle	06444bf050	Allow user to disable the boost confirm dialog in preferences	2017-04-11 10:10:16 -04:00
blackle	f53fb6aa66	Bypass boost confirm modal if alt is pressed	2017-04-11 08:34:14 -04:00
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)	2017-04-11 14:20:18 +02:00
blackle	01e5447e35	Add boost confirm modal	2017-04-10 22:35:55 -04:00
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	2017-04-11 01:11:41 +02:00
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	2017-04-11 00:38:58 +02:00
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.	2017-04-11 00:38:34 +02:00
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	2017-04-11 00:35:35 +02:00
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	2017-04-10 23:45:29 +02:00
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	2017-04-10 22:58:06 +02:00
Chris Martin	ae57b3a8c5	Add more specific class names to notification divs (#1120 )	2017-04-10 22:41:52 +02:00
Rachel H	f690320fb9	Keep newlines in xml (#1397 )	2017-04-10 21:32:45 +02:00
Stephen Burgess	553170b77a	Fix #1097 When onClick is falsy, do not make status content clickable (#1434 )	2017-04-10 21:31:26 +02:00
Jessica Stokes	8a6096a3de	Allow typing a toot while an image uploads (#1429 ) This patch stops disabling the toot text field when an image is uploading. Instead, you can type to your heart's content and when the image uploads it'll append the image URL, and restore the position of your cursor to wherever it was in the toot text just prior. Effectively, the image URL is appended to the toot, and typing is not interrupted at all! ✨	2017-04-10 21:30:58 +02:00
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	2017-04-10 21:27:52 +02:00
Matt Jankowski	dbe9f33fdc	Admin base controller (#1465 ) * Add Admin::BaseController to wrap admin area Extracts the setting of the `admin` layout and verifying that users are admins to a common base class for the admin/ controllers. * Add basic coverage for admin/reports and admin/settings controllers	2017-04-10 21:27:03 +02:00
Corey Dutson	087ca3009b	Adjust background of emoji panel (#1461 ) Addresses #1451 which notes the emoji picker is too light. I agree, so I submit this adjustment. Changes: Changed the background to a darkened version of another system color	2017-04-10 20:56:14 +02:00
Jessica Stokes	db7c7d1af1	Improve scrolling behaviour (#1415 ) * Replace column margin with padding This improves horizontal scrolling behaviour significantly; scrolled flex elements are... a little weird. * Move clear column button styling to css	2017-04-10 16:27:30 +02:00
Ram Lmn	42fb4faa0f	Fix icon and emoji sizes (#1403 ) Fixes icons and emoji size issues described in #1233.	2017-04-10 13:02:09 +02:00
Ratmir Karabut	9043b32183	Add Russian translation (ru) (#1023 ) * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency	2017-04-10 12:52:06 +02:00
Jantso Porali	e30bbb1cb0	Fix for Import issue from URL (#1416 )	2017-04-10 12:49:34 +02:00
Gavin Mogan	8bdf02812c	Add search to emoji picker (#1395 )	2017-04-10 09:58:09 +02:00
Eugen	93db265be7	Do not store last visited URL from API controllers (#1330 ) Sign-in redirects you back to last visited URL, but in case of API requests, this sometimes redirected users to an API URL that, of course, greeted them with an {"error":"The access token is invalid"}	2017-04-09 22:21:52 +02:00
Eugen	c172919745	Fix #1339 - better Atom titles (#1343 )	2017-04-09 20:55:54 +02:00
Eugen	15d442cf9d	Fix /api/v1/accounts/update_credentials tests (#1357 )	2017-04-09 20:23:14 +02:00
Hugo Gameiro	4ea4ef9d0f	update portuguese translation (#1280 ) added the missing fields and improved the translation	2017-04-09 18:49:26 +02:00
ThibG	d19ed18388	Get handle from atom feed's author/email field instead of guessing from URL (#1344 ) The goal of this change is to enhance Mastodon's handling of remote domains for which the APIs reside on a different host (see issue #1032). Indeed, when a remote user unknown to Mastodon is mentionned, only its profile URL (e.g. https://social.example.org/users/User) is known, and Mastodon has to build a @username@domain handle for it. To do so, Mastodon fetches the user's atom feed (e.g., https://social.example.org/users/User.atom) and uses its content to get the username part of the handle, and the URL's host part to build the domain (e.g., @User@social.example.org). This handle is then used for a Webfinger request. In the case where example.org serves the Webfinger info for @User@example.org and all feeds and APIs are hosted at social.example.org, Mastodon will still build @User@social.example.org and fail at resolving the account's details through Webfinger. This patch changes this behaviour by using the author's email address from the atom feed to build the handle. In Mastodon-generated atom feeds, the email address is always the handle it expects for federation.	2017-04-09 18:43:48 +02:00
David Authier	f0bd439486	Use HTTP Accept-Language to detect locale (#1166 ) * Use HTTP Accept-Language to detect locale * Fix gem order to comply with codeclimate * Sort gem to comply with rubocop * I18n.default_locale fallback when there is no accept-language header	2017-04-09 18:40:24 +02:00
David Celis	d4fe6cd2bf	Allow users to update their Account in the API (#1179 ) * Allow users to update their Account in the API It would be nice for API clients to be able to allow users to update their accounts without having to wrap Mastodon in a web view. This patch adds an API endpoint to let users submit a PATCH for their account. Signed-off-by: David Celis <me@davidcel.is> * Add /api/v1/accounts/update_credentials to the API docs Signed-off-by: David Celis <me@davidcel.is>	2017-04-09 18:33:40 +02:00
Matt Jankowski	ea6c930c04	Helper cleanup (#1348 ) * Remove unused helper files * Add coverage for application helper * Add coverage for StreamEntriesHelper #display_name	2017-04-09 17:11:37 +02:00
StefOfficiel	12e29c9660	Update fr.jsx (#1329 ) * Update fr.jsx * Remove duplicate translation	2017-04-09 14:58:08 +02:00
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)	2017-04-09 14:55:58 +02:00
Jonathan Klee	ba2aea3a80	add empty notifications french translation (#1111 )	2017-04-09 14:54:02 +02:00
Matt Jankowski	e5282e4ec0	Clean up about page (#1282 ) * Add InstancePresenter to expose site details * Clean up about controller, use instance presenter	2017-04-09 14:47:25 +02:00
Brian Mock	53eb31f124	Fixes #1311 margin shouldn't stay fixed (#1312 )	2017-04-09 14:45:26 +02:00
Matt Jankowski	388ec0d5b6	Search cleanup (#1333 ) * Clean up SQL output in Tag and Account search methods * Add basic coverage for Tag.search_for * Add coverage for Account.search_for * Add coverage for Account.advanced_search_for	2017-04-09 14:45:01 +02:00
Rachel H	b1881a3d48	Fix nonworking clear notices button (#1316 )	2017-04-09 11:35:23 +02:00
Eugen	b89f007862	Make public timelines API not require user context/app credentials (#1291 ) * Make /api/v1/timelines/public and /api/v1/timelines/tag/:id public Fix #1156 - respect query params when generating pagination links in API * Apply pagination fix to more APIs	2017-04-08 23:39:31 +02:00
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	2017-04-08 22:20:08 +02:00
Pavel Djundik	470eb0042e	Improve responsiveness of registration form and closed banner (#1265 )	2017-04-08 18:31:50 +02:00
Pavel Djundik	fc146a19cc	Improve about page responsiveness (#1252 )	2017-04-08 15:28:23 +02:00
Eugen	982fef811e	Fix #1141 , fix #1126 - Avatar/profile info fetching (#1215 ) * Fix #1141, fix #1126 - Work through UpdateRemoteProfileService for both <feed> and <entry> top-level tags * Improve code quality, remove line unrelated to fix	2017-04-08 13:26:03 +02:00
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>	2017-04-08 13:11:16 +02:00
Markus Amalthea Magnuson	157f0a2aa7	Add titles to more icons, and change clear notifications icon. (#1101 )	2017-04-08 13:07:55 +02:00
Nicolai von Neudeck	c803f5b440	Updated German translation (#1248 ) Fixed various spelling and grammar mistakes. Used more gender-neutral language.	2017-04-08 13:04:58 +02:00
Alda Marteau-Hardi	35eff3f2d0	Add some missing strings to prevent some React warning in the console (#1230 )	2017-04-08 12:16:16 +02:00
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	2017-04-08 12:15:40 +02:00
Eugen	7d5ea5c170	Merge pull request #1224 from chrisheninger/patch-1 Add SVG version of logo to repo	2017-04-08 11:37:37 +02:00
Eugen	33849acfa7	Merge pull request #1218 from R0ckweb/patch-2 Fix #1141 on remote follow	2017-04-08 11:37:13 +02:00
Eugen	c141f0a886	Merge pull request #1216 from tootsuite/fix-default-locale-regression Fix #1165 - Default locale no longer breaks form submissions	2017-04-08 11:36:43 +02:00
Eugen	55d03da303	Merge pull request #1213 from tootsuite/fix-accounts-initial-case Fix #801 - Respect webfinger's canonical response of username/domain	2017-04-08 11:36:35 +02:00
Kurtis Rainbolt-Greene	40703b96fa	Merge branch 'master' into fix-default-locale-regression	2017-04-07 20:50:21 -07:00
Kurtis Rainbolt-Greene	1e4453405b	Merge branch 'master' into patch-2	2017-04-07 20:48:27 -07:00
Chris Heninger	0ad694f96b	Add SVG version of logo to repo	2017-04-07 20:40:18 -07:00
Shel R	fef478781d	Merge branch 'master' into master	2017-04-07 22:21:21 -04:00
Shel R	9f43e3b428	Merge branch 'master' into patch-4	2017-04-07 22:02:26 -04:00
Yann GUERN	485d75a805	#1141 on remote follow The async action is send before persist, account.id not yet generated Pull queue receive 'nil' so no profile update.	2017-04-08 03:24:35 +02:00
Eugen Rochko	4b621188ad	Fix #1165 - before_action was called before protect_from_forgery	2017-04-08 02:30:50 +02:00
Eugen Rochko	b2a7218ab7	Fix #801 - Respect webfinger's canonical response of username/domain	2017-04-08 01:07:42 +02:00
Eugen	1961825ff9	Merge pull request #1183 from thoughtbot/cp-post-status-service-specs Add specs for PostStatusService	2017-04-07 22:30:28 +02:00
Chad Pytel	ad5ddd5e95	Use I18n for media attachment validation errors These are currently user facing errors, but are not localized. This adds the ability for these messages to be localized.	2017-04-07 14:23:18 -04:00
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.	2017-04-07 14:18:30 -04:00
Eugen	4e41cd9ab8	Merge pull request #1146 from tootsuite/fix-object-type-nil-exception Fix nil#object_type error	2017-04-07 13:08:51 +02:00
Eugen	c9b23a93c7	Merge branch 'master' into fix-object-type-nil-exception	2017-04-07 13:07:36 +02:00
Eugen	0adee18d73	Merge branch 'master' into feature-customized-default-locale	2017-04-07 13:07:03 +02:00
Eugen Rochko	8a6d8de60a	Fix nil#object_type error	2017-04-07 13:05:34 +02:00
Jantso Porali	786e6f94b9	Update Finnish translations, add sample Minio config (#954 )	2017-04-07 12:58:12 +02:00
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	2017-04-07 12:40:26 +02:00
Eugen Rochko	624a9a7136	Re-add forgotten <author> element on standalone <entry>	2017-04-07 12:21:00 +02:00
Eugen	1c351709bc	Force UTF8 encoding on generated XML (#1140 )	2017-04-07 11:09:14 +02:00
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	2017-04-07 05:56:56 +02:00
Matt Jankowski	97ae53daa8	Reduce size of background-photo.jpeg Reduced by running through `guetzli` image optimizer.	2017-04-06 16:24:57 -04:00
Eugen Rochko	51d7caaf19	Fix wrong pubsub channel on public timelines	2017-04-06 04:03:23 +02:00
Eugen	a9c0062e80	Merge pull request #1013 from blackle/master Catch more errors in process_follows so it doesn't fail	2017-04-06 02:35:34 +02:00
Eugen Rochko	dbd529109e	Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService, slightly optimized FanOutOnWriteService again	2017-04-06 02:26:59 +02:00
blackle	540d6efe88	Catch more errors in process_follows so it doesn't fail	2017-04-05 20:04:13 -04:00
Eugen Rochko	5442083b3c	Split SalmonWorker into smaller parts, move profile updating into another job	2017-04-05 21:43:10 +02:00
André Lewin	bf7cefa516	Merge branch 'master' into master	2017-04-05 20:28:58 +02:00
Eugen Rochko	5b95be1c42	Replace calls to FeedManager#inline_render and #broadcast	2017-04-05 19:45:18 +02:00
Eugen	c9ebd5d19f	Fix wrong variable used in publish channel	2017-04-05 18:58:32 +02:00
Eugen	1b8c244dff	Add proper message to PushUpdateWorker, use redis directly	2017-04-05 18:48:41 +02:00
Eugen	3d8b80e1cc	Merge branch 'master' into broadcast-to-worker	2017-04-05 18:44:33 +02:00
tom	8989569dd4	Update components.scss Use nicer scrollbars in MS edge	2017-04-05 12:10:25 -04:00
Eugen Rochko	220bc48e8e	Only render public payload once in FanOutOnWrite	2017-04-05 14:26:17 +02:00
Eugen Rochko	8530f9413b	Replace ActionCable broadcast call with simple redis publish	2017-04-05 13:28:46 +02:00
Eugen	1904a1aa14	Merge pull request #919 from JantsoP/master More updates to Finnish language	2017-04-05 10:27:12 +02:00
Eugen	6b566c6b88	Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic ApplicationWorker for shared worker behavior	2017-04-05 10:23:52 +02:00
JantsoP	20b53e6add	Merge branch 'master' into master	2017-04-05 10:07:17 +02:00
JantsoP	b8a867adcc	updated translation Updated some translations after seeing them in service. Should be better now	2017-04-05 09:56:10 +02:00
Brad Urani	6a1da87cd3	Eliminate unnecessary queries and query clauses with none and all	2017-04-05 06:02:58 +00:00
Kurtis Rainbolt-Greene	22dcadedb4	We're going to want these nice helper methods, lets share them with a parent class that matches Rails 5 practices (application level abstraction)	2017-04-04 21:14:37 -07:00
Kurtis Rainbolt-Greene	7bed4e51db	Moved to the worker	2017-04-04 20:51:44 -07:00
Kurtis Rainbolt-Greene	9638894233	Moving in the inline render	2017-04-04 20:51:18 -07:00
Kurtis Rainbolt-Greene	220051b8b2	I don't actually think we need that.	2017-04-04 20:48:22 -07:00
Kurtis Rainbolt-Greene	0069c01285	Moving the queue_at into the worker	2017-04-04 20:39:14 -07:00
Kurtis Rainbolt-Greene	dc5704b0b0	This method isn't used anymore	2017-04-04 20:38:07 -07:00
Kurtis Rainbolt-Greene	96ef933820	Replacing the broadcast method with the one defined in the feed manager	2017-04-04 20:36:03 -07:00
Kurtis Rainbolt-Greene	1e96ce378e	By pushing this into a worker we can reduce the amount of time the feed manager using workers eat up a connection	2017-04-04 20:23:40 -07:00
Eugen	4c92f15664	Merge branch 'master' into add_more_tests_to_models	2017-04-05 03:27:38 +02:00
Eugen	afdcdce551	Merge pull request #839 from SirCmpwn/profile-readability Improve readability of text on profiles	2017-04-05 03:23:16 +02:00
Drew DeVault	c106b6d3e0	Improve readability of text on profiles	2017-04-04 21:13:23 -04:00
Eugen	e76dd52b08	Merge pull request #818 from JantsoP/master Updated Finnish Translation	2017-04-05 03:09:20 +02:00
Eugen	117b22e905	Merge pull request #852 from peterkeen/email-whitelist-817 [#817] Add email whitelist	2017-04-05 03:04:58 +02:00
Eugen	909d81923e	Merge pull request #898 from SirCmpwn/remote-follow-improvements Remote follow improvements	2017-04-05 02:54:03 +02:00
Eugen	2edeb3fe1c	Merge pull request #858 from krainboltgreene/patch-6 Use active record shorthand	2017-04-05 02:53:39 +02:00
Drew DeVault	f7e35d90db	Remote follow improvements This stores the @username@instance you provide in your session and reuses it the next time you remote follow someone from this instance.	2017-04-04 20:52:31 -04:00
Eugen Rochko	bda37489ac	Remove PuSH subscriptions when delivery is answered with a 4xx error	2017-04-05 02:34:33 +02:00
Samy KACIMI	79ef756f64	fix rubocop issues	2017-04-05 00:47:17 +02:00
Samy KACIMI	81c76fe375	add more tests to models	2017-04-05 00:29:56 +02:00
axolotl	8736ef50ad	Added Esperanto translation inside the javascripts folder	2017-04-04 20:54:42 +02:00
Eugen Rochko	6fd865c000	Spawn FeedInsertWorker to deliver status into personal feed	2017-04-04 19:21:37 +02:00
Kurtis Rainbolt-Greene	731e650681	Use active record shorthand	2017-04-04 09:04:07 -07:00
Pete Keen	e9a6da6bc7	[#817 ] Add email whitelist This adds the ability to filter user signup with a whitelist instead of or in addition to a blacklist. Fixes #817	2017-04-04 11:20:15 -04:00
Eugen Rochko	5f54981846	New admin setting: open/close registrations, with custom message, from the admin UI	2017-04-04 15:28:12 +02:00
JantsoP	10a8666e04	updated line 28 about GitHub	2017-04-04 15:07:15 +02:00
Eugen	405c495c23	Merge pull request #804 from fhalna/development Accessibility Fix.	2017-04-04 14:52:27 +02:00
Eugen Rochko	82aaedec46	Reduce number of items in feeds, optimize regeneration worker slightly, make regeneration worker unique, (only schedule/execute once at a time)	2017-04-04 13:58:34 +02:00
Eugen Rochko	b1f3499c38	Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge	2017-04-04 13:43:36 +02:00
Eugen Rochko	b21f7c28f6	Move OStatus processing back into default queue	2017-04-04 13:02:49 +02:00
Eugen Rochko	ce9df2fa82	Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods, do not re-create a dynamic class on each feed push call, make sure redis-rb uses hiredis	2017-04-04 13:01:14 +02:00
halna_Tanaguru	3abb0f7bc7	Merge branch 'master' into development	2017-04-04 12:06:53 +02:00
JantsoP	db4a41cf58	Merge branch 'master' into master	2017-04-04 08:41:46 +02:00
JantsoP	b8243c1b49	changed line 25 for better translation	2017-04-04 08:26:59 +02:00
Eugen Rochko	eb023beb49	Fix #808 - smaller elephant friend PNG for frontpage	2017-04-04 02:03:16 +02:00
Eugen Rochko	b510a56c0c	Only call regeneration worker after first login after a 14 day break	2017-04-04 02:00:10 +02:00
Eugen Rochko	4c53af64f0	Fix ActionController::Parameters in API issue	2017-04-04 01:33:34 +02:00
Eugen Rochko	f722bd2387	Separate background jobs into different queues. ATTENTION: new queue "pull" must be added to the Sidekiq invokation in your systemd file The pull queue will handle link crawling, thread resolving, and OStatus processing. Such tasks are more likely to hang for a longer time (due to network requests) so it is more sensible to not make the "in-house" tasks wait for them.	2017-04-04 00:53:20 +02:00
Eugen Rochko	8232f76c48	Add check for visibility.nil? even though it can't ever be, to check for race conditions	2017-04-03 22:54:46 +02:00
halna_Tanaguru	3f30ae1f97	accessibility fix eanable focus on ClearColumnButton	2017-04-03 22:45:29 +02:00
axolotl	0700521ef3	added Esperanto (eo)	2017-04-03 20:22:50 +02:00
Eugen Rochko	68f829e11c	Add basic logging of who resolved report	2017-04-03 19:35:00 +02:00
Eugen Rochko	71458dc6df	When taking action on a report (silence/suspend), it dismisses all other reports for that user automatically	2017-04-03 19:19:54 +02:00
Eugen Rochko	b7c1b12367	Make default admin UI page reports. Add admin UI for creating a domain block	2017-04-03 18:55:06 +02:00
David Baumgold	5652f00d81	GitHub should be capitalized	2017-04-03 11:44:11 -04:00
JantsoP	a229840ffe	fixed typo	2017-04-03 14:16:03 +02:00
JantsoP	bfa99981e5	Merge branch 'master' into master	2017-04-03 13:50:57 +02:00
JantsoP	ae95f35fe6	add finnish translation add finnish translation	2017-04-03 13:34:26 +02:00
JantsoP	22f88b845a	add finnish translation add finnish translation	2017-04-03 13:33:43 +02:00
JantsoP	eabb86b124	add finnish language add finnish language	2017-04-03 13:32:10 +02:00
Eugen	5d854f37b4	Merge pull request #764 from ticky/tweak-quick-start-area Fix the position of the Mastodon mascot in the UI	2017-04-03 12:59:16 +02:00
JantsoP	69fc95a2f5	Create Finnish translation for Mastodon Create Finnish translation for Mastodon	2017-04-03 12:09:33 +02:00
Marvin Kopf	1236a12cae	add mute option in status dropdown	2017-04-03 10:44:08 +02:00
Jessica Stokes	2d384850cb	Fix the position of the Mastodon mascot in the UI The Mastodon mascot was previously anchored to the bottom, and that was since broken. This restores that behaviour! It also disables the double-scrollbar behaviour that was caused by this area allowing overflow-y in addition to its parent doing so.	2017-04-03 13:16:14 +10:00
Eugen	d2358aefec	Merge branch 'master' into master	2017-04-03 01:07:53 +02:00
Eugen	61894582b8	Merge pull request #746 from eramdam/feature/improve-french-locales Feature/improve french locales (again)	2017-04-03 00:25:56 +02:00
Kazhnuz	c76d20c2a0	Add forgotten comma	2017-04-02 23:39:41 +02:00
Damien Erambert	4f7cce25ac	Add more lcoales in fr.jsx	2017-04-02 14:23:40 -07:00
Kazhnuz	633e5ec6f6	Update French Translation	2017-04-02 23:18:01 +02:00
Eugen	09b4b65fde	Merge pull request #740 from 0x70b1a5/master remove black border on video mute/spoiler buttons	2017-04-02 22:22:56 +02:00
Eugen	48cb2dccd2	Merge pull request #741 from eramdam/feature/improve-french-locales Improve/add some French locales	2017-04-02 22:22:44 +02:00
Eugen Rochko	a23e4380b2	Avoid re-loading already loaded relationships. Also fixes issue where wrong button would be displayed in account lists for unloaded relationships	2017-04-02 22:02:38 +02:00
Eugen Rochko	aaa4d1b0fb	Keep track of which timelines are connected live to avoid redundant refreshes on navigation	2017-04-02 21:44:06 +02:00
Eugen Rochko	2d07cb5771	Catching rack timeout from rails doesn't work	2017-04-02 21:12:18 +02:00
Tobias Merkle	f25fc04ea1	single-quotes	2017-04-02 14:55:13 -04:00
Tobias Merkle	ca21be3e16	remove black border on buttons	2017-04-02 14:54:24 -04:00
Eugen Rochko	5b12624847	Add proper error page for request timeouts	2017-04-02 19:43:44 +02:00
Olivia Mossberg	30da6440d0	Merge branch 'master' of github.com:tootsuite/mastodon It's just an upstream merge	2017-04-02 17:04:31 +02:00
Olivia Mossberg	f4b5fe9caf	Fix word-break in account profiles word-break:break-all is a surefire way to break things. It should be set to normal. This merge just set it back to what it should be. Tested on Firefox 52.0.2 and Chrome 56.0.2924.87 with no detected errors.	2017-04-02 16:54:24 +02:00
Eugen Rochko	4b7dca4713	Fix wording "show reblogs" -> "show boosts", order reports chronologically in admin UI	2017-04-02 16:45:49 +02:00
Eugen Rochko	d6b965cf08	Fix issue with feed merge-in code as well	2017-04-02 15:58:25 +02:00
Eugen Rochko	e809caa0e1	Fix feed regeneration bug	2017-04-02 15:46:31 +02:00
Eugen Rochko	34aff3e269	Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master	2017-04-02 12:36:26 +02:00
Damien Erambert	3ed75efc31	Add fr locale for community_timeline in fr.jsx	2017-04-01 23:45:53 -07:00
Eugen Rochko	433cb198fa	Fix landing page sign up form ignoring username field	2017-04-02 04:13:22 +02:00
Tobias Merkle	ae43978433	improve video button visibililty	2017-04-01 21:02:30 -04:00
Eugen Rochko	a8c2e44fee	Fix broken reference	2017-04-01 22:29:20 +02:00
Eugen Rochko	808017ff18	Paperclip will complain on its own if this variable is missing	2017-04-01 22:16:26 +02:00
Eugen Rochko	60ebfa182f	Made modal system more generic	2017-04-01 22:11:28 +02:00
Maxime BORGES	f693ab69f3	Fix word-break in profile's note on profile page and profile component	2017-04-01 20:17:28 +02:00
Eugen Rochko	13dfd8d109	Improve mobile tabs a little	2017-04-01 15:17:35 +02:00
Eugen Rochko	d93d6f5124	Fix reworked search	2017-03-31 22:45:56 +02:00
Eugen Rochko	b4046c5957	Rework search	2017-03-31 21:11:09 +02:00
shel	f20f6b25b9	Merge branch 'master' into patch-2	2017-03-31 10:34:14 -04:00
Eugen Rochko	680f9efe9c	Fix web UI profile clickable area overlapping with follow button area	2017-03-31 14:23:44 +02:00
Eugen Rochko	bde5c0eaf9	Fix some views still not using counter caches	2017-03-31 14:02:07 +02:00
Eugen Rochko	5e26295e06	Fix #700 - hide spoilers on static pages	2017-03-31 13:54:36 +02:00
Eugen Rochko	3ac4455160	:active and :focus states same as :hover for buttons	2017-03-31 12:08:51 +02:00
Eugen Rochko	bf61bc1b96	Fix drag & drop overlay flickering	2017-03-31 11:48:25 +02:00
Eugen Rochko	e8875c6046	Import feature for following/blocking lists (addresses #62 , #177 , #201 , #454 )	2017-03-30 19:42:33 +02:00
Eugen Rochko	de22c202f5	Add counter caches for a large performance increase on API requests	2017-03-30 15:06:59 +02:00
Eugen Rochko	333e44c3fc	Improve emojis - use SVGs where possible	2017-03-29 22:27:24 +02:00
Eugen Rochko	bb7006bda1	Hide drag & drop area on drop event regardless of success	2017-03-28 14:17:24 +02:00
Eugen Rochko	139fc994e2	Fix #408 - link @ names in bios	2017-03-28 14:16:08 +02:00
Eugen Rochko	1c6b02f936	Fix #690 - Webfinger should handle new shortform profile URLs now (nice)	2017-03-28 11:25:43 +02:00
shel	76188d61f2	Clarify post privacy warning I was informed that the current warning if you @ a remote server in a private post is inadequate. These are suggested changes to better inform users.	2017-03-26 12:49:14 -04:00
Eugen Rochko	c334541011	Add tooltip to privacy dropdown	2017-03-26 13:30:57 +02:00
Eugen Rochko	f864fee116	Fix up some localizations	2017-03-26 13:22:38 +02:00
Eugen Rochko	efbbd42216	Fix style issue	2017-03-26 13:13:41 +02:00
Eugen Rochko	dddb2eb84f	Merge branch 'feature/language_zh-cn' of https://github.com/leopku/mastodon into leopku-feature/language_zh-cn	2017-03-26 13:10:04 +02:00
Eugen Rochko	6ec6fe259a	Compose form layout fixes	2017-03-26 13:08:15 +02:00
leopku	d5d5afff9c	🌐 add simplified chinese language	2017-03-26 14:13:18 +08:00
shel	5f7c997654	Change to using variables Thanks garg	2017-03-25 20:42:49 -04:00
shel	2b7e3d56c8	Increase color contrast Privacy descriptions were very difficult to reason. This is the minimal level of color contrast to be WCAG AA compliant.	2017-03-25 20:02:36 -04:00
shel	c66dc0d114	Clarify privacy options Descriptions of differences between scope are more clear	2017-03-25 19:59:38 -04:00
Eugen Rochko	1fd88e3bad	Fix up visual indicators for compose form privacy	2017-03-25 20:24:30 +01:00
Eugen Rochko	b8f9de8636	Improve sign up page on small screens	2017-03-25 20:13:34 +01:00
Eugen Rochko	a9303e7062	When replying to status with content warning, prefill content warning	2017-03-25 19:30:56 +01:00
Eugen Rochko	ad1af951fb	Temporary spacing fix	2017-03-25 19:27:31 +01:00
Eugen Rochko	bd1ceb1daa	Privacy dropdown i18n	2017-03-25 19:22:24 +01:00
Eugen Rochko	99ca63a543	Fix public profile pagination links	2017-03-25 19:16:17 +01:00
Eugen Rochko	d8c5a83827	Redesigned compose form	2017-03-25 19:14:12 +01:00
Eugen Rochko	9bf4c34919	Fix #675 - return created_at in notifications API	2017-03-24 03:55:45 +01:00
Eugen Rochko	d7c6c6dbe1	Fancier drag & drop indicator, emoji icon for emoji, upload progress (fix #295 )	2017-03-24 03:55:45 +01:00
Eugen Rochko	d6ed2eb512	Prettier account and stream entry URLs	2017-03-22 19:55:14 +01:00
Eugen Rochko	33fac87e81	Shorter timeout on FetchAtomService	2017-03-22 17:41:52 +01:00
Eugen Rochko	5aa3df017b	Fix full-text search query quotation, improve tag search performance with an index, add ability to open status by URL from search (fix #53)	2017-03-22 17:36:34 +01:00
Eugen Rochko	88f32708c3	Web UI support for the new omnisearch	2017-03-22 04:09:28 +01:00
Eugen Rochko	acfee0945c	Merge branch 'master' into feature-omnisearch this merge is necessary,	2017-03-22 03:34:58 +01:00
Eugen Rochko	8aae42f3d8	German toot -> "tröt"	2017-03-22 03:22:44 +01:00
Eugen Rochko	1b09c3cb17	More efficient single account retrieval (0.9ms vs 50ms before)	2017-03-22 03:21:38 +01:00
Eugen Rochko	05cf086766	New API method: /api/v1/search Returns accounts, statuses, hashtags arrays	2017-03-22 02:32:27 +01:00
Eugen Rochko	98571b0ce4	Don't list "direct" under default post privacy settings	2017-03-21 19:45:25 +01:00
Eugen Rochko	8803ca9efe	Improved landing page	2017-03-21 19:18:37 +01:00
Eugen Rochko	6b1db5c2b2	Add landing strip	2017-03-20 03:36:29 +01:00
Eugen Rochko	56d998cbdb	Export follow/block lists as CSV	2017-03-19 20:29:41 +01:00
Eugen Rochko	08b96f1b9f	Fix wrong HTTP status codes on error pages	2017-03-19 20:03:28 +01:00
Eugen Rochko	2816b1bf8e	Federate header images, fix open-uri http->https redirection error	2017-03-18 22:51:20 +01:00
Eugen Rochko	5cfc9c7487	Forgot to hook up API with the latest method	2017-03-17 21:02:47 +01:00
Eugen Rochko	ac406a31b0	Start page links a bit more readable	2017-03-17 20:49:34 +01:00
Eugen Rochko	ad0d82d3ce	Make account search blazing fast and rank followers/followees higher in the results	2017-03-17 20:48:14 +01:00
shel	38dceb3bf7	Promote Apps (#670 ) "Various apps are available" is now a hyperlink	2017-03-17 16:16:39 +01:00
Eugen Rochko	017350e0ea	Add method for retrieving triadic closures	2017-03-16 20:10:51 +01:00
Eugen Rochko	6be7bde243	Fix #525 - Add instance information API	2017-03-15 23:12:48 +01:00
Eugen Rochko	7b58c1a694	Merge branch 'mastodon-site-api' of https://github.com/marrus-sh/ardipithecus into marrus-sh-mastodon-site-api	2017-03-15 22:55:58 +01:00
Eugen Rochko	74ae158c2f	Add "direct" visibility level in the backend. Web UI is not yet adjusted to allow choosing it, yet	2017-03-15 22:55:45 +01:00
Eugen	e245115f47	Merge branch 'master' into mastodon-site-api	2017-03-15 22:55:22 +01:00
Eugen Rochko	02349b3269	Obfuscate filenames better, double rate limits	2017-03-14 15:59:21 +01:00
Eugen Rochko	952bce3023	Replace howler.js with simple <audio />, will hopefully resolve some weird mobile browser behaviours	2017-03-13 17:12:30 +01:00
Eugen Rochko	a5daa806f2	Fix casuality of processing remote mentions such that notifications about them would be processed only after the entire status is processed	2017-03-13 16:34:15 +01:00
Eugen Rochko	47bf592db7	Try to detect iOS and not autoplay any videos Technically the check for iOS from components is a side effect, because it's neither in state nor props, but the user agent does not change, so I think that's okay.	2017-03-07 09:54:57 +01:00
Eugen Rochko	1fb3e8988b	Revert earlier fix due to new bug reports	2017-03-06 02:25:41 +01:00
Eugen Rochko	d6cb4bbe99	Performance improvement for profiles	2017-03-06 01:50:35 +01:00
Eugen Rochko	03a857f59a	Use more widely supported MP4 format for gifv's	2017-03-06 00:30:03 +01:00
Eugen Rochko	8d93f0ca56	Increase max bitrate of converted webms, slightly optimized counter queries (Because postgres can tell that count(*) needs no extra checks, but counting a specific column requires them)	2017-03-05 23:43:58 +01:00
Eugen Rochko	6382ef2bc6	Add vsync -cfr option when converting gif to webm	2017-03-05 23:27:25 +01:00
Eugen Rochko	79b08c5f0a	Higher quality webms? Might improve conversation of some types of gifs	2017-03-05 23:13:21 +01:00
Eugen Rochko	85fce04d1b	Detect videos with no sound, handle them like gifv	2017-03-05 22:55:24 +01:00
Eugen Rochko	4fb95c91fb	Fix wrongful matching of last period in extended usernames Fix anchor tags in some wikipedia URLs being matches as a hashtag	2017-03-05 18:08:19 +01:00
Eugen Rochko	5f4e402204	Improved /api/v1/accounts/:id/statuses with new params: only_media, exclude_replies Redirect /:username to /users/:username Redirect /:username/:id to /users/:username/updates/:id Updated API documentation and sponsors	2017-03-05 17:27:17 +01:00
Eugen Rochko	07b166af64	Make gifvs always use media gallery component	2017-03-05 02:04:31 +01:00
Eugen Rochko	caf5b8e975	Fix #431 - convert gif to webm during upload. Web UI treats them like it did before. In the API, attachments now can be either image, video or gifv. Gifv is to be treated like images in terms of behaviour, but are videos by file type.	2017-03-04 23:02:24 +01:00
Eugen Rochko	5d100293fb	Rename "the whole known network" timeline to "federated timeline" Remove note about following Gargron@mastodon.social from getting started text	2017-03-04 00:19:18 +01:00
Eugen Rochko	6b81d10030	Add digest e-mails	2017-03-04 00:00:48 +01:00
Eugen Rochko	4690236724	Make confirmation text more specific	2017-03-02 19:25:11 +01:00
Eugen Rochko	b9345b3fc6	Fix #620 - Add confirmation dialog for notifications clear	2017-03-02 19:24:12 +01:00
Eugen Rochko	4d23a85c29	Fix up storybook	2017-03-02 18:55:15 +01:00
Eugen Rochko	c64a1c25c4	Fix #231 - Muting	2017-03-02 18:49:32 +01:00
Kit Redgrave	442fdbfc53	Mute button progress so far. WIP, doesn't entirely work correctly.	2017-03-01 22:31:21 -06:00
Eugen Rochko	89fc2d7f48	Fix #372 - Emoji picker	2017-03-02 00:57:55 +01:00
Eugen Rochko	95ebfa5610	Simplify passing of prop	2017-03-01 13:57:30 +01:00
Eugen Rochko	1fa2e7cc86	Merge branch 'mastodon-paste-support' of https://github.com/marrus-sh/ardipithecus into marrus-sh-mastodon-paste-support	2017-03-01 13:54:52 +01:00
Kibigo	91c79f2445	Better smart/dumb component separation	2017-03-01 02:56:15 -08:00
Kibigo	5f6f7aaa27	Making the back button a little smarter	2017-02-28 22:24:34 -08:00
Kibigo	e84c1dc95f	Support for pasting images from clipboard	2017-02-28 18:52:46 -08:00
Eugen Rochko	5960bac11e	Fix incorrect detection of local vs remote user in web UI	2017-03-01 02:00:21 +01:00
Eugen Rochko	3208979655	Fix typo	2017-03-01 01:57:48 +01:00
Eugen Rochko	fbdb3bcf1e	Revert infinite scroll in timelines back to looking at ID of oldest loaded status; do not preload submitted statuses into community/public timelines, unless those timelines have already been loaded; do not close streaming API connections for community/public timelines, once they have been established (most users navigate back to them eventually)	2017-03-01 01:43:29 +01:00
Eugen Rochko	e1b00757a6	Fix #291 - Add visual indication that numbers for remote users may be inaccurate	2017-03-01 01:18:34 +01:00
Eugen Rochko	7f0d1b8cc0	If a status is within 40 statuses from the top of a home feed, do not reinsert it when someone boosts it	2017-03-01 01:07:11 +01:00
Eugen Rochko	92569b1f0d	Improved dropdowns	2017-03-01 00:53:11 +01:00
Eugen Rochko	955e9088d7	Fix #561 - Detect presence of audio in video, hide mute toggle when none	2017-02-28 23:48:41 +01:00
Eugen Rochko	d180aaa2a7	Fix #186 - Add RTL support to the compose form textarea and statuses output	2017-02-28 01:52:31 +01:00
Eugen Rochko	809455aaae	Add elephant friend to missing indicator	2017-02-28 00:43:36 +01:00
Eugen	9214b5d02e	Add new illustration	2017-02-27 22:51:24 +01:00
Kibigo	4d2af0d664	Character counter fix	2017-02-27 04:32:41 -08:00
Kibigo	620f70e42c	Adds site metadata access to the API	2017-02-27 04:06:25 -08:00
Eugen Rochko	af5cb0f853	Only use bigger compose form/search form font on mobile layout	2017-02-27 00:46:45 +01:00
Eugen Rochko	175a9b9caa	Fix #104 - Style OAuth authorized applications page Add ability to search accounts by display name	2017-02-27 00:15:00 +01:00
Eugen Rochko	2826e6dada	Fix #612 - Set font size to 16px in compose form and search form to prevent iOS from zooming in on them	2017-02-26 23:30:18 +01:00
Eugen Rochko	5f511324b6	Add validation of media attachments, clean up mastodon-own exception classes	2017-02-26 23:23:06 +01:00
Eugen Rochko	063432d7e3	Merge branch 'fix_462' of https://github.com/rmhasan/mastodon into rmhasan-fix_462	2017-02-26 23:09:18 +01:00
Eugen Rochko	4fbdf100c4	Add <MissingIndicator /> when status or account are not found, skip alerts for those errors	2017-02-26 23:06:27 +01:00
Eugen Rochko	4bb8ff7c8e	Merge branch 'fix_626' of https://github.com/rmhasan/mastodon into rmhasan-fix_626	2017-02-26 22:44:31 +01:00
Eugen Rochko	b44dd38360	Fix broken dependency on inner react utility function	2017-02-26 01:34:56 +01:00
Eugen Rochko	e2209e1104	Fix local timeline showing unread status of TWKN timeline	2017-02-26 01:27:22 +01:00
Eugen Rochko	2c50687279	Improve compose form performance, upgrade JS dependencies. LightingBox now allows to cycle through multiple images	2017-02-26 01:23:44 +01:00
Eugen Rochko	3e9d794ea5	Add tuning documentation, add <content> tags back to most salmons, make status pagination headers generation more lax about next page existing	2017-02-25 03:34:37 +01:00
Eugen Rochko	9d4cad6307	Improve glow	2017-02-23 02:14:35 +01:00
Eugen Rochko	53ae431867	Skip remote media URLs that don't have a hostname	2017-02-22 19:55:14 +01:00
Eugen Rochko	3202bdd744	Fix #555 - Use a better URL parser	2017-02-22 19:35:11 +01:00
Eugen Rochko	c96fd24f48	Improve status reselect, do not display "load more" when no next link available	2017-02-22 16:30:09 +01:00
Eugen Rochko	c77a54fe0a	Fix #651 - Do not reinsert original status into all followers feeds upon un-reblogging. Check if the reblog was in the feed in the first place. It might have been filtered on distribution.	2017-02-22 15:52:47 +01:00
Eugen Rochko	974d712fbe	Improve performance of compose form	2017-02-22 15:43:07 +01:00
Eugen Rochko	5997bb47a8	Fix #38 - Unread indicator when new content appears above the fold	2017-02-21 00:10:49 +01:00
Eugen	f338cc6c94	Fix scroll to top not registering because of wrong debounce usage	2017-02-20 19:01:47 +01:00
Eugen Rochko	e8ea9669c9	Fix links and wording	2017-02-19 22:42:38 +01:00
Eugen Rochko	6b4ef92c6f	Adjust naming of public timeline -> "local timeline" vs "whole known network"	2017-02-19 21:49:14 +01:00
Eugen Rochko	c50256d25c	Fix infinite scrolling breaking after navigation	2017-02-19 21:37:04 +01:00
Eugen Rochko	4aa5ebe591	Split public timeline into "public timeline" which is local, and "whole known network" which is what public timeline used to be Only domain blocks with suspend severity will block PuSH subscriptions Silenced accounts should not appear in conversations unless followed	2017-02-19 20:25:54 +01:00
Rakib Hasan	dfd4a42b35	added if else clause in fetchContext So that if we get an error, then we will only delete status if it is an 404 error	2017-02-19 10:55:22 +00:00
Rakib Hasan	9433d03705	Removed try clause from create action in status controller Using catch statement in api_controller.rb to catch NotPermitted Exception, and render error message	2017-02-19 08:29:56 +00:00
Rakib Hasan	87a6bed9e9	previous commit was creating the status regardless of mix of video and images in status, just wasn't rendering the show action. I moved the validation before the status creation	2017-02-19 08:28:33 +00:00
Rakib Hasan	6f9ecd899e	revisted fix for #462 Moved validation to services/post_status_service.rb	2017-02-19 08:28:33 +00:00
Rakib Hasan	6d2301988f	Fix for issue #462 Modified uploadCompose action to send media ids of attached media when sending a request. Modified create method in MediaController to check if when posting a video, there are no other media attached to the status by looking at the media ids sent from the uploadCompose action.	2017-02-19 08:28:33 +00:00
Rakib Hasan	910df0f795	Removing dispatch of fetchContextFail No need to flash error message when status is not found. The column will display the message "status not found"	2017-02-19 08:21:45 +00:00
Rakib Hasan	8e760d5f62	adding new react class StatusNotFound	2017-02-19 08:21:37 +00:00
Rakib Hasan	9e0dbb7337	Fixing issue #626 The status is not showing anymore after clicking on it	2017-02-19 08:21:05 +00:00
Eugen Rochko	9e99b8c068	Fix #642 - Add "empty column" text to home/notifications	2017-02-18 02:37:59 +01:00
shel	6a6d8f60c4	Add target="_blank" to github link This makes so clicking the link to the github opens in a new tab or windows. I just keep getting frustrated clicking the link to github and then losing my place in my home timeline >_> that's all	2017-02-17 14:50:50 -05:00
nicolas	ca57f17d3d	French translation update	2017-02-17 10:27:00 +01:00
Eugen Rochko	a1e96ae94f	Add foreign key to prevent reblogs of non-existent (after race conditions) statuses from happening Fix issue with detailed status view not supporting unreblogging/unfavouriting	2017-02-17 02:33:10 +01:00
Eugen Rochko	5ddad41245	Do not display non-Status stream entries anymore	2017-02-17 02:20:52 +01:00
Eugen Rochko	dbd80465c8	Fix small styling issues	2017-02-17 02:05:15 +01:00
Eugen Rochko	f2931af61e	Quick fix for avatars with the same URL not being perceived as updated and in need of re-download	2017-02-17 01:50:01 +01:00
Eugen Rochko	8b16f81882	Close dropdown when clicking items	2017-02-17 01:44:06 +01:00
Eugen Rochko	0cbf3a146f	Speed up/optimize loading of statuses, context and cards by not re-fetching what is already loaded	2017-02-17 01:34:37 +01:00
Eugen Rochko	8132cf8153	Add GET /api/v1/accounts/:id/statuses/media that returns only statuses with media attachments Make replies default to privacy settings of the status being replied to	2017-02-17 01:30:24 +01:00
Eugen Rochko	d0f087db2d	Add UI to view report details, remove reported statuses, quick links to resolve/silence/suspend from report	2017-02-17 00:42:52 +01:00
Eugen Rochko	24ba7c9762	Adding index overview for reports in admin UI	2017-02-16 02:28:10 +01:00
Eugen Rochko	f722aa8c75	Fix Salmon issue	2017-02-16 01:59:34 +01:00
Eugen Rochko	5426f06ac2	Fix admin UI for accounts somewhat	2017-02-15 00:22:58 +01:00
Eugen Rochko	0a2427f79b	Fix #634 - Only include innermost-level statuses in report UI Fix #635 - Include the initially-reported status in report UI even if it's not among the user's most recent statuses	2017-02-15 00:01:52 +01:00
Eugen Rochko	3b81baaaaf	Adding POST /api/v1/reports API, and a UI for submitting reports	2017-02-14 20:59:26 +01:00
Eugen Rochko	40a4053732	Disable PuSH for blocked domains	2017-02-14 04:01:37 +01:00
Eugen Rochko	63886bdc59	Fix #587 - Display TOTP secret next to QR code	2017-02-13 20:56:03 +01:00
Eugen Rochko	ec521e6bfc	Add remote mentions warning when composing a private status	2017-02-13 18:38:00 +01:00
Eugen Rochko	2ab7bd13e2	Merge branch 'patch-5' of https://github.com/yiskah/mastodon into yiskah-patch-5	2017-02-13 17:22:40 +01:00
Eugen Rochko	677e95031e	Clean up collapsible components	2017-02-13 17:20:18 +01:00
Eugen Rochko	2d8a4c4390	Add "next" link to Atom feeds	2017-02-13 15:38:45 +01:00
Eugen	63b3cb37db	Merge pull request #627 from halcy/style-fixes Activity stream background should use $color5	2017-02-13 15:16:15 +01:00
Your Name	e4a7e8222e	Activity stream background should use $color5	2017-02-13 12:31:52 +00:00
Eugen Rochko	8e08ae5bb9	Add IDs to salmon slaps even if they are transient. Add title, too, mostly in case of debugging incoming salmons. Add <thr:in-reply-to /> to favourite salmons because it seems to be required by GS.	2017-02-13 13:30:33 +01:00
Eugen Rochko	df63461ff0	Add handler for salmons of undoing favourites	2017-02-12 19:50:18 +01:00
Eugen Rochko	720ff55262	Adding more unit tests. Fixing Salmon slaps XML	2017-02-12 17:30:15 +01:00
Eugen Rochko	446267d1bf	Deduplicate delete salmons (send only one per mentioned-account domain)	2017-02-12 17:30:15 +01:00
Eugen Rochko	db814543c0	Take out private toot distribution out of PuSH again	2017-02-12 01:31:04 +01:00
Eugen Rochko	0518492158	Stop trying to shoehorn all Salmon updates into the poor database-connected StreamEntry model. Simply render Salmon slaps as they are needed	2017-02-12 01:19:14 +01:00
shel	968fae2603	Add privacy disclaimer I haven't had a chance to test this, because I don't currently have a fully functioning computer I can set up a dev-environment on, but this should make it so when a user toggles a post to be private, a disclaimer appears clarifying what "private" really means.	2017-02-11 17:42:19 -05:00
shel	3893ff1604	Add privacy disclaimer Add variable for text of privacy disclaimer	2017-02-11 16:47:01 -05:00
Eugen Rochko	94d2182717	Resolve issue with rendering authorize/reject Salmon slaps	2017-02-11 19:42:05 +01:00
Eugen Rochko	31c633e528	Fix Status.permitted_for scope query	2017-02-11 19:16:10 +01:00
Eugen Rochko	50660d54e8	Fix semantics of follow requests another slaps	2017-02-11 17:13:11 +01:00
Eugen Rochko	446aad4ce2	Make PuSH only distribute to subscriptions that match follower domains Allow PuSH to distribute private toots with that condition	2017-02-11 15:41:39 +01:00
Eugen Rochko	dc851c922e	Mentions in private statuses allow mentioned people to see them	2017-02-11 15:10:22 +01:00
Eugen Rochko	00b5731ecb	After FollowService, re-fetch remote account asynchronously, do nothing if account lock info was up to date, otherwise re-do the FollowService with now updated information	2017-02-11 14:25:01 +01:00
Eugen Rochko	e610555e10	Fix processing of incoming authorizations/rejections	2017-02-11 13:55:07 +01:00
Eugen Rochko	514fdfa268	Don't PuSH-resubscribe if already subscribed	2017-02-11 13:48:28 +01:00
Eugen Rochko	149887a0ff	Make follow requests federate	2017-02-11 02:58:00 +01:00
Eugen Rochko	d551e43a9b	Improve public tag page	2017-02-10 23:21:01 +01:00
Eugen Rochko	8cca6bc58c	Fix spoiler link color in muted context	2017-02-10 23:01:02 +01:00
Eugen Rochko	5c4c046132	Finish up moving colors from JSX to Sass (#584 , #348 )	2017-02-10 22:58:29 +01:00
Eugen Rochko	d2619e0b53	Site title is now a setting	2017-02-10 22:37:11 +01:00
Eugen	874fffb7dc	Merge branch 'master' into patch-3	2017-02-10 19:15:13 +01:00
Eugen	73e388e0d8	Merge pull request #617 from halcy/style-changes Style changes	2017-02-10 19:10:15 +01:00
shel	3f1f3d0827	Add link to other instances list This should help federation	2017-02-10 13:06:38 -05:00
Lorenz Diener	cbb962fd77	Move more colours to scss	2017-02-10 16:30:06 +00:00
Lorenz Diener	c9f42a7b85	Move more inline colours to scss	2017-02-10 15:35:19 +00:00
Eugen Rochko	0afed995ce	Fix the fix	2017-02-09 21:22:49 +01:00
Eugen Rochko	6331ed16e5	Fix #614 - extra reply-boolean on statuses to account for cases when replied-to status is not in the system at time of distribution; fix #607 - reset privacy settings to defaults when cancelling replies	2017-02-09 20:25:39 +01:00
Eugen Rochko	c424df5192	Progress on moving color styles to Sass	2017-02-09 01:20:09 +01:00
Eugen	942a2e7d68	Fix reblogs not having content warnings forwarded	2017-02-08 18:05:46 +01:00
Eugen	d96e031dfc	Fix #611 - Layout setting in registrations controller	2017-02-08 03:04:29 +01:00
Isabelle Knott	1d273e4430	Change blocked users icon to fa-ban in getting started view (#608 )	2017-02-07 23:48:50 +01:00
Eugen Rochko	02e91a96dd	Make streaming API use one pattern-matching redis pubsub connection Refresh timelines when streaming API reconnects in the UI	2017-02-07 14:39:08 +01:00
Eugen	9d5fb49cd8	Merge pull request #603 from evanminto/activitypub-account Expose ActivityStreams 2.0 representation of accounts	2017-02-07 02:08:40 +01:00
Evan Minto	28cbb6dc21	Add AS2 format to RABL files	2017-02-06 17:00:55 -08:00
Eugen Rochko	8a081ce588	Fix wrong prediction of whether toot will apear on public timeline in UI	2017-02-07 00:40:35 +01:00
Eugen Rochko	714e41d472	Fix preferences save	2017-02-07 00:23:38 +01:00
Eugen Rochko	ac035108aa	Add "clear notifications" button, exclude posts from people who have blocked you from public/hashtag timelines	2017-02-07 00:06:40 +01:00
Eugen Rochko	c8252759df	Add streaming API channels for local-only statuses	2017-02-06 23:46:14 +01:00
Eugen Rochko	347a153b3d	Add API modifiers to limit returned toots from public/hashtag timelines to only those from local users; Add link to "extended information" to getting started in the UI; Add defaults for posting privacy; Change how publish button looks depending on posting privacy chosen	2017-02-06 23:16:20 +01:00
Evan Minto	53234e5947	Add trailing newline	2017-02-06 12:15:47 -08:00
Evan Minto	3fa5d05997	Simplify RABL	2017-02-06 11:39:08 -08:00
Evan Minto	94e213c6c1	Reuse existing controller and route	2017-02-06 01:19:26 -08:00
Eugen Rochko	0af3401553	Don't allow people to follow people they blocked without unblocking first	2017-02-05 21:04:22 +01:00
Eugen Rochko	eee8afb0b7	Remove bios from blocked users list, filter out broken entries from API response	2017-02-05 19:39:00 +01:00
Eugen Rochko	c5a08eb56e	Add link to blocked users to getting started page	2017-02-05 19:22:05 +01:00
Eugen Rochko	920ba5fc4e	Fix #61 - Add list of blocked users to the UI; clean up failed push notifications API Try to fix Travis CI setup	2017-02-05 19:18:11 +01:00
Eugen Rochko	77e13c2bc9	Removing failed push notification API, make context loads use cache	2017-02-05 17:51:44 +01:00
Eugen Rochko	19b9e1e2c3	Preheat status cache	2017-02-05 17:24:18 +01:00
Eugen Rochko	6fa4e01139	Fix showing ellipsis even when link hasn't been cut off	2017-02-05 15:29:16 +01:00
Eugen Rochko	87830f99e7	Fix #552 - Replace image links with image icons in status text in the UI	2017-02-05 15:25:55 +01:00
Eugen Rochko	ff2da21d3c	Fix content warning margin	2017-02-05 14:50:58 +01:00
Eugen Rochko	b5bf807a34	Remove react-dnd as it was interfering with text selection. Move content warning mentions preview into area where actual content would be	2017-02-05 04:11:14 +01:00
Eugen Rochko	fb6aa7ad5c	Add tracking of delay to streaming API	2017-02-05 03:19:04 +01:00
Eugen Rochko	6cdcac1396	Fix #598 - arrow keys to navigate media; fix #481 - non-exact matches no longer overshadow requirement for remote-lookup	2017-02-05 03:01:23 +01:00
Eugen Rochko	44fad0160f	Add next/previous navigation in modal for media attachments	2017-02-05 02:48:11 +01:00
Eugen Rochko	21972bb398	No replies filter on home timeline no longer hides self-replies	2017-02-05 02:02:46 +01:00
Eugen Rochko	dbb7e5a644	Getting started on draggable columns	2017-02-05 01:58:25 +01:00
Eugen Rochko	a012e4c7ff	Fix column settings not being scrollable on short screens	2017-02-05 01:27:31 +01:00
Eugen Rochko	af007f2def	Display mentions prepended to the content warning	2017-02-05 01:19:27 +01:00
Evan Minto	8bd8ea7c04	Remove unnecessary leftover code	2017-02-04 14:49:24 -08:00
Evan Minto	e2fbf8bc74	Add an account endpoint for ActivityPub and link to it on HTML profile pages	2017-02-04 14:46:23 -08:00
hoodie	d4d3a10c25	untested!! spoiler hotfix for replies untested, my vagrant is bugged again, submitted at gargron's request	2017-02-04 17:33:46 -05:00
Eugen Rochko	ccb8ac8573	Make the streaming API also handle websockets (because trying to get the browser EventSource interface to work flawlessly was a nightmare). WARNING: This commit makes the web UI connect to the streaming API instead of ActionCable like before. This means that if you are upgrading, you should set that up beforehand.	2017-02-04 00:34:31 +01:00
hoodie	ac3f5a8316	easier comprehension of toot settings and properties (#595 ) sounds complex, but really it just reorganizes the posting options and adds a seperator line	2017-02-03 15:54:23 +01:00
Eugen Rochko	889b814385	Fix bug	2017-02-02 16:57:09 +01:00
Eugen Rochko	1ee4a17f37	Add logging and filtering to the node.js streaming API	2017-02-02 13:56:14 +01:00
Eugen Rochko	17ae7d132c	Prevent potential issue with public/hashtag statuses arriving after they have been loaded and favourited/reblogged from another source Since the status JSON returned from public/hashtag streams does not contain favourited/reblogged attributes, merging them should not override existing ones.	2017-02-02 00:49:25 +01:00
Eugen Rochko	ede04cdb24	Move rendering of JSON payloads for public/hashtag timelines to FanOutOnWriteService. The only recipient-specific part on them is reblogged/favourited. But since only newly created statuses appear on them, it is safe to assume that both attributes would be false	2017-02-02 00:39:17 +01:00
Eugen Rochko	d9ca46b464	Cleaning up format of broadcast real-time messages, removing redis-backed "mentions" timeline as redundant (given notifications)	2017-02-02 00:03:31 +01:00
Eugen Rochko	bf60f2898d	Fix #529 - Make hashtag timelines show conversations, fix hashtag loading in the UI	2017-01-31 22:35:38 +01:00
Eugen Rochko	8ef79d8dc9	Revert to animating avatars by default	2017-01-31 19:16:35 +01:00
Eugen Rochko	8b9c537d5a	Fix elephant friend	2017-01-31 19:08:24 +01:00
Eugen Rochko	52d68be157	Fix CORS issue on avatars resampling	2017-01-31 19:06:13 +01:00
tom	b84d1533d4	Fix text overlapping image in Edge and on mobile (#582 ) Changing the way the background image is positioned and the box is sized should fix problems with the text overlapping the image on mobile browsers and Edge.	2017-01-31 19:06:03 +01:00
Eugen Rochko	c2fbd144cf	Add "open in web" link to detailed public status pages	2017-01-30 23:01:37 +01:00
Eugen Rochko	86b3cb5120	Fix not reloading account/fetching relationship on newly independent components	2017-01-30 22:35:36 +01:00
Eugen Rochko	f21e7d6ac0	Make profile header scroll along with contents. AccountTimeline, Followers and Following are no longer nested inside a common parent (<Account>), instead they all embed <HeaderContainer />	2017-01-30 21:44:11 +01:00
Eugen Rochko	404d2050d3	Add explicit "load more" link to the bottom of StatusList and notifications	2017-01-30 18:07:17 +01:00
Eugen Rochko	02cd2e42b2	Improve avatar resampling of non-animated canvas	2017-01-30 15:43:48 +01:00
Eugen Rochko	9bde804ba2	Resolve confusion between ColumnBackButton and the slim version that the public timeline has been using	2017-01-30 15:22:04 +01:00
Billie Thompson	b1571b1e1d	Add missing back button to "Follow Requests" Currently we have the problem where the follow request button is missing from the Follow request tab. This means that when you visit that tab you either have to press the back button in the browser or re-enter the home page, which breaks the app flow. This will resolve that issue by adding a new back button to that tab, in the same way that the public timeline, and favourites have.	2017-01-29 18:53:51 +00:00
Misty De Meo	a30e669df2	Fix avatar scaling on high-DPI displays (#573 )	2017-01-29 14:26:50 +01:00
Eugen Rochko	83ccdeb87a	Fix tests	2017-01-29 12:25:10 +01:00
Eugen Rochko	3f075c7794	API for apps to register for push notifications	2017-01-29 01:30:32 +01:00
Eugen Rochko	9b2c728251	Fix settings design on mobile	2017-01-28 21:57:03 +01:00
Eugen Rochko	23b997ae55	Split 2FA login into two prompts	2017-01-28 20:43:38 +01:00
Eugen Rochko	36c57ef8af	Add pixel background to modal images	2017-01-28 04:04:09 +01:00
Eugen Rochko	f4bc9620a9	Update settings to re-use admin layout, one big navigation tree, improve settings forms	2017-01-28 03:56:10 +01:00
Eugen Rochko	04bce0cdf2	Clean up	2017-01-27 20:38:35 +01:00
Eugen Rochko	ba192f12e3	Added optional two-factor authentication	2017-01-27 20:35:16 +01:00
Zachary Spector	237cb41ab4	Less ambiguous sensitive content toggle label (#556 )	2017-01-27 19:31:14 +01:00
hoodie	6c37285580	fix button outline showing on clicks for prettiness remove button outlines on-click for retweet, boost, favourite, and reply buttons	2017-01-27 12:39:36 -05:00
Eugen Rochko	450ad43180	Do not run FetchLinkCardService on local URLs, increase file size limit to 8MB, fix ProcessFeedService pushing status into distribution if called a second time while the first is still running (i.e. when a PuSH comes after a Salmon slap), fix not running escape on spoiler text before emojify	2017-01-27 16:57:23 +01:00
Eugen Rochko	f8bd44a747	Fix font weight	2017-01-26 23:34:40 +01:00
Billie Thompson	55fa8e61e2	Move the fonts from Google Fonts to local assets Currently we have two problems that are resolved by this change. The first is that we have a dependency on Google Fonts, which means that should it ever go down, or it have issues we would also have issues. This will resolve this by moving the dependencies we load from there to the local server. The second issue is that Google Fonts is currently returning the `local()` css font source. This causes a problem where the users browser fails to fallback to a missing glyph, resulting in many unusual characters displaying the failure glyph. This will resolve this by creating a font-family definition that does not use the `local()` source. I did not update the error pages with local fonts, they still use the remote google fonts api, so they're a self contained page that does not use the asset pipeline. This resolves tootsuite/mastodon#531 and tootsuite/mastodon#12	2017-01-26 20:09:03 +00:00
Eugen Rochko	7329fbd8a4	Fix up timeout, improve contrast on "show more", add responsive style for extremely wide monitors	2017-01-26 18:48:56 +01:00
Eugen Rochko	cc5c1e5feb	Removed accidental n+1 query from notifications, updated some deps, improved how "show more" link looks	2017-01-26 14:52:07 +01:00
Anthony Bellew	589837cfc7	Removed line break before spoiler link, changed color of bg for spoiler link	2017-01-26 03:07:02 -07:00
Anthony Bellew	ebe5095665	Add Padding to inline styles for spoiler	2017-01-26 03:03:26 -07:00
Anthony Bellew	8f18c8f9ad	Added inline spoiler button styles	2017-01-26 03:02:42 -07:00
Anthony Bellew	d944946c52	Moved brackets outside of localized strings at Gargron's suggestion	2017-01-26 00:24:52 -07:00
Anthony Bellew	baa52984e9	Add brackets to visually distinguish show more / show less text	2017-01-25 20:56:33 -07:00
Eugen Rochko	905c829179	Improve infinite scroll on notifications	2017-01-26 04:30:40 +01:00
Eugen Rochko	57f7cf8349	Follow request authorizations faster	2017-01-26 03:56:26 +01:00
Eugen Rochko	eb62778bec	Fix #537 - opengraph description should display spoiler text when present	2017-01-26 03:45:14 +01:00
Eugen Rochko	1c507ff172	Fix #538 - Darken buttons to increase contrast	2017-01-26 03:32:00 +01:00
Eugen Rochko	3a310e8f63	Fix CSS mistake	2017-01-26 03:17:48 +01:00
Eugen	97d9517b6b	Merge pull request #534 from yiskah/patch-2 Increase color contrast on getting started text	2017-01-26 02:51:27 +01:00
blackle	6bba337080	Only open status on left mouse press	2017-01-25 20:43:41 -05:00
shel	33e09cc76b	Increase color contrast on getting started text Currently, the getting started text fails WCAG standards for color contrast by a lot. Especially on the part overlapping with the elephant graphic which is nearly unreadable even for users with 20\|20 vision. This change doesn't fix the elephant overlap but at least makes the text meet AAA WCAG Small Text color contrast standards, making it easier to read.	2017-01-25 20:19:37 -05:00
Eugen Rochko	97da56d02b	Fix loading of avatars before drawing them to canvas	2017-01-25 17:23:17 +01:00
Eugen Rochko	00fa850bdc	Fix #187 , address #441 - <Avatar> component now plays gifs only while hovered	2017-01-25 17:07:57 +01:00
Eugen Rochko	3beb24ad55	Use <summary> to encode content warnings instead	2017-01-25 16:53:30 +01:00
Eugen Rochko	51a7047367	Fix order of migrations	2017-01-25 15:01:00 +01:00
Eugen	41f5459af5	Merge pull request #524 from blackle/master fix up spoilers	2017-01-25 02:16:36 +01:00
blackle	ca13ec04a8	fix up spoilers	2017-01-24 20:14:20 -05:00
Eugen Rochko	10ffd455a8	Fix #522 - prevent blocked users from reblogging	2017-01-25 01:48:46 +01:00
Eugen Rochko	999cde94a6	Instead of using spoiler boolean and spoiler_text, simply check for non-blank spoiler_text Federate spoiler_text using warning attribute on <content /> instead of a <category term="spoiler" /> Clean up schema file from accidental development migrations	2017-01-25 01:29:16 +01:00
Eugen	f8da0dd490	Merge branch 'master' into master	2017-01-24 21:56:06 +01:00
Eugen Rochko	8a880a3d46	Make blocks create entries and unfollows instantly, but do the clean up in the background instead. Should fix delay where blocked person can interact with blocker for a short time before background job gets processed	2017-01-24 21:40:41 +01:00
Misty De Meo	adda642c63	Fix `invisible` CSS class	2017-01-24 11:49:31 -08:00
Eugen Rochko	e47b8e778b	Fix links in toots opening the toot at first	2017-01-24 18:51:09 +01:00
Eugen Rochko	80cefd5b3c	Fix #204 , fix #515 - URL truncating is now a style so copypasting is not affected, replaced onClick handler with onMouseUp/Down to detect text selection not trigger onClick handler then	2017-01-24 17:05:44 +01:00
Eugen	4f3264d291	Merge branch 'master' into boostspin	2017-01-24 14:27:13 +01:00
blackle	4a146a0d18	Make boost animation an SVG that uses SCSS colours	2017-01-24 07:48:13 -05:00
Eugen Rochko	21c209636d	Set isLoading false on timelines when request fails	2017-01-24 13:04:12 +01:00
Eugen Rochko	1f5792c834	API now respects ?limit param as long as it's within 2x default limit	2017-01-24 04:22:10 +01:00
Eugen Rochko	d9022884c6	Smarter infinite scroll	2017-01-24 04:12:10 +01:00
blackle	bf0f6eb62d	Implement a click-to-view spoiler system	2017-01-23 21:07:40 -05:00
Eugen Rochko	1761d3f9c3	Fix mistake	2017-01-23 22:18:08 +01:00
Eugen Rochko	d00189b55a	Domains with reject_media? set to true won't download avatars either	2017-01-23 21:55:29 +01:00
Eugen Rochko	8aab692034	Less re-rendering	2017-01-23 21:40:48 +01:00
Eugen Rochko	434cf8237e	Optional domain block attribute that prevents media attachments from being downloaded	2017-01-23 21:36:08 +01:00
Eugen Rochko	cca82bf0a2	Move merging/unmerging of timelines into background. Move blocking into background as well since it's a computationally expensive	2017-01-23 21:29:34 +01:00
Eugen Rochko	f392030ab8	Add /api/v1/notifications/clear, non-existing link cards for statuses will now return empty hash instead of throwing a 404 error. When following, merge into timeline will filter statuses	2017-01-23 21:09:27 +01:00
Eugen Rochko	f2e08ff568	Remove unneeded block check	2017-01-23 17:40:23 +01:00
Eugen Rochko	6d98a73180	Domain blocks now have varying severity - auto-suspend vs auto-silence	2017-01-23 17:38:38 +01:00
Eugen Rochko	ef2b924679	Forgot to commit	2017-01-23 17:18:41 +01:00
Eugen Rochko	f855d645b2	Move all hex colors in SASS to variables and all variations to darken/lighten	2017-01-23 16:01:46 +01:00
Eugen Rochko	d4d56b8af0	Fix #365 , 1/2 of #408 - replace rails_autolink with URI.regexp, run link_hashtags on simplified_format	2017-01-23 14:45:09 +01:00
Eugen Rochko	aa9c51a34c	Fix a couple unhandled exceptions	2017-01-23 13:56:57 +01:00
Eugen Rochko	a1894786cf	Potentially fix notifications issue	2017-01-23 13:43:14 +01:00
Misty De Meo	33fd8a7d95	Textarea: fix clicking on name suggestions This was broken in `c3e9ba6a`, which added an onBlur to hide the suggestions when the textarea loses focus. Unfortunately, this fired even when the textarea lost focus to its own suggestions box, and that meant that onSuggestionClick is never called. Setting a short window in which onSuggestionClick can still happen before hiding the suggestion area ensures that clicking still works, while still hiding the suggestions if the user clicks on something else.	2017-01-22 22:57:58 -08:00
Eugen	1953e3b6ed	Fix inflection	2017-01-22 23:08:51 +01:00
Eugen	cea9fb31fe	Mitigate inconsistent notifications	2017-01-22 21:50:17 +01:00
Eugen Rochko	e22a56183a	Improve error page layouting. 500 page has to stay static because it's used from nginx when Rails fails.	2017-01-21 22:30:47 +01:00
Eugen Rochko	b4a4eb73ae	Merge branch 'fix/error-pages' of https://github.com/ineffyble/mastodon into ineffyble-fix/error-pages	2017-01-21 22:20:01 +01:00
Eugen Rochko	3a4b5961be	Method to fetch a single notification	2017-01-21 22:14:13 +01:00
Effy Elden	8f21f5522f	Call uniq on the string version of mb_chars tags	2017-01-21 21:02:42 +11:00
Eugen Rochko	1aae0cfc2c	Fix #475 - add space after autocomplete	2017-01-20 21:39:41 +01:00
Eugen Rochko	9bd3b11cfb	Instead of refusing to create accounts, domain blocks auto-suspend new accounts from that domain	2017-01-20 20:14:02 +01:00
Eugen Rochko	05abd977c1	Fix preview cards layout, do preview card crawling for remote statuses	2017-01-20 18:31:49 +01:00
blackle	7f63edd820	Show visibility toggle on videos, show regardless of sensitivity	2017-01-19 21:24:30 -05:00
Eugen Rochko	c8e4b9c663	No loading bars for cards, no failure if it 404s (that's expected)	2017-01-20 01:07:53 +01:00
Eugen Rochko	f0de621e76	Fix #463 - Fetch and display previews of URLs using OpenGraph tags	2017-01-20 01:00:14 +01:00
Eugen Rochko	8d0284f8d9	Hide more non-essential loading bars	2017-01-19 11:23:24 +01:00
Eugen Rochko	98560b232a	Don't show loading bar when re-loading already loaded status. Don't even try to fetch ancestors from DB when in_reply_to_id is nil	2017-01-19 11:06:06 +01:00
Eugen Rochko	9b0941182f	Don't show loading bar when checking account timeline for newer stuff	2017-01-19 11:01:01 +01:00
Eugen Rochko	46be4631ae	Fix #222 - Update followers count when following/unfollowing Also, since the root component connects to the stream that updates home/notification columns, there is pretty much no case for refreshing those columns beyond initial load. So, move the loading of those columns into the root component, to prevent unneccessary reloads when switching tabs on mobile or resizing desktop window between mobile/desktop layouts	2017-01-19 10:54:18 +01:00
Eugen Rochko	f051c2e813	Fix statsd null backend not being initialized properly	2017-01-19 09:37:07 +01:00
Eugen	8b9206f7d9	Try to avoid any potential loops	2017-01-19 02:14:57 +01:00
Eugen Rochko	306eb6e9c9	Add optional StatsD performance tracking	2017-01-18 23:44:29 +01:00
Eugen Rochko	7cfd5b680a	Fix forgotten change of settings	2017-01-17 20:37:54 +01:00
Eugen Rochko	c468446f4c	Fix boops?	2017-01-17 20:28:32 +01:00
Eugen Rochko	cde0476ca2	Fix #487	2017-01-17 20:11:16 +01:00
Eugen Rochko	fcb5a85cdd	Add sounds for notifications. Boop by @jk@mastodon.social	2017-01-17 20:09:03 +01:00
Eugen Rochko	6cf44ca92c	Improve how the list entry Account component looks when target is blocked/follow is requested	2017-01-16 19:36:32 +01:00
blackle	889709a2a6	Show 'do not display in public timeline' when replying to self	2017-01-16 10:26:44 -05:00
Eugen Rochko	1a33e4042e	Fix upload file input being re-rendered needlessly	2017-01-16 14:21:55 +01:00
Eugen Rochko	7d53ee73f3	Fix #238 - Add "favourites" column	2017-01-16 13:28:25 +01:00
Eugen Rochko	da5d366230	Fix #414 - Improve lightbox, add loading indicator	2017-01-16 12:04:02 +01:00
Eugen Rochko	2ae0fb4419	Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive	2017-01-16 11:36:02 +01:00
Eugen Rochko	0439c7d58b	Move follow requests link above logout link in getting started column	2017-01-16 11:35:32 +01:00
blackle	144402ec7e	Show visibility toggle on media gallery for sensitive images	2017-01-15 20:27:08 -05:00
blackle	383114add3	Change boost sprite to look like fa-retweet	2017-01-15 11:40:05 -05:00
Eugen Rochko	926459fc0a	Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse	2017-01-15 14:59:25 +01:00
Eugen Rochko	7d7a11250c	Fix #427 - don't suggest hashtag if the search value contains a space	2017-01-15 14:47:39 +01:00
Eugen Rochko	1d5cbfa356	Fix #449 - don't do relationships fetch for empty array of IDs	2017-01-15 14:47:39 +01:00
Eugen Rochko	cc1eccc8bc	Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up	2017-01-15 14:47:39 +01:00
Eugen Rochko	e9737c2235	Fix tests, add applications to eager loading/cache for statuses, fix application website validation, don't link to app website if website isn't set, also comment out animated boost icon from #464 until it's consistent with non-animated version	2017-01-15 14:01:33 +01:00
Eugen Rochko	ab165547fd	Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source	2017-01-15 13:23:47 +01:00
Eugen	1f7c0ad8d3	Merge pull request #464 from blackle/backflip Make boost button spin around	2017-01-15 13:19:15 +01:00
Effy Elden	e45fed58cb	Add a textual 'Back to Mastodon' link in footer of settings pages	2017-01-15 11:03:35 +11:00
Effy Elden	ed41f9f0b1	Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether	2017-01-15 10:30:23 +11:00
Effy Elden	3f84816b24	Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether	2017-01-15 10:27:54 +11:00
blackle	a67ffcbf56	Make boost button arrows spin around	2017-01-14 17:56:24 -05:00
Effy Elden	f81dc7a33a	Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source	2017-01-15 09:12:11 +11:00
Effy Elden	6c002cf615	Test for presence of Application in haml before trying to render details, to fix errors identified by CI	2017-01-15 09:10:44 +11:00
Effy Elden	65122798b2	Fix typo in rel	2017-01-15 09:04:14 +11:00
Effy Elden	d6bc0e8db4	Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views. Resolves #11	2017-01-15 08:58:50 +11:00
Effy Elden	32d756fb22	Hide 'Do not display on public timeline' for reply toots. Fixes #412 .	2017-01-15 06:10:23 +11:00
Eugen	f63f0c4625	Fix too late return	2017-01-14 02:22:16 +01:00
Eugen Rochko	7cde08e30b	Improve extended about page layout	2017-01-13 20:27:02 +01:00
Eugen Rochko	c01dd089ff	Adding about/more page with extended information that can be set up by an admin	2017-01-13 20:16:38 +01:00
Eugen Rochko	e25170f960	Add extended about page stub	2017-01-13 03:24:41 +01:00
Eugen Rochko	2939e9898b	Extend rails-settings-cached to merge db-saved hash values with defaults	2017-01-13 02:42:22 +01:00
Eugen Rochko	ca50ceeaf0	Add settings for contact information	2017-01-12 20:54:14 +01:00
Eugen Rochko	b11fdc3ae3	Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings with YAML-defined defaults. Add admin page for editing global settings. Add "site_description" setting that would show as a paragraph on the frontpage	2017-01-12 20:46:24 +01:00
Eugen Rochko	4a2ee43e80	Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else)	2017-01-12 03:54:50 +01:00
Eugen Rochko	7951e7ffd5	Add ruby version to Gemfile, move devDependencies in package.json to dependencies, fix bug in process feed service	2017-01-11 15:39:31 +01:00
Eugen	10739df458	Merge pull request #456 from ineffyble/fix-repo-url Fix repo URL	2017-01-11 14:19:19 +01:00
Eugen Rochko	3ad0496ccb	Better animations	2017-01-11 04:21:49 +01:00
Effy Elden	f876a8681d	Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places	2017-01-11 13:24:14 +11:00
Eugen Rochko	18b11100e7	Fix issue when settings are not defined for column type	2017-01-10 17:33:32 +01:00
Eugen Rochko	312c51b5c8	Home column filters	2017-01-10 17:25:10 +01:00
Eugen Rochko	1e9d2c4b1e	Add "not found" component to UI	2017-01-10 13:50:59 +01:00
Eugen	67a31454ad	Merge pull request #450 from blackle/master simplify emojification on public pages with .emojify class	2017-01-10 12:21:06 +01:00
blackle	917cf0bf5d	simplify emojification on public pages with .emojify class	2017-01-09 22:41:47 -05:00
Eugen Rochko	205ba00017	Fix sandboxed iOS login again	2017-01-09 19:43:53 +01:00
Eugen Rochko	def1f8c5b3	Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master	2017-01-09 14:12:40 +01:00
Eugen Rochko	3bddd647e0	Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown	2017-01-09 14:10:32 +01:00
Eugen Rochko	75f80bef10	Persist UI settings, add missing localizations for German	2017-01-09 14:00:55 +01:00
Eugen Rochko	23ebf60b95	Improve initialState loading	2017-01-09 12:37:53 +01:00
blackle	131bae89fd	Generate key for each input so we can upload the same file even after deleting	2017-01-08 21:00:13 -05:00
blackle	d64c454cfe	Switch to compose view when tapping 'mention' in dropdown on mobile	2017-01-08 17:12:00 -05:00
Eugen Rochko	2e71bb031b	Fix Paperclip timeout setting. Fix bug introduced in #437	2017-01-08 19:12:54 +01:00
Eugen	38bc85e695	Merge pull request #443 from blackle/master Add call-to developers on getting started page	2017-01-08 13:36:02 +01:00
blackle	05e964688d	Expand dropdown leftways on status view	2017-01-08 06:32:37 -05:00
blackle	b4f09bae1d	Add call-to developers on getting started page	2017-01-08 00:23:22 -05:00
Eugen	69643338f6	Merge pull request #437 from krainboltgreene/patch-1 Simplifying followers mappings	2017-01-08 04:14:54 +01:00
Kurtis Rainbolt-Greene	abe3ae1cc2	Simplifying followers mappings Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.	2017-01-07 18:09:00 -08:00
Kurtis Rainbolt-Greene	4a7e3e5082	Less complicated determination	2017-01-07 17:59:51 -08:00
Kurtis Rainbolt-Greene	e5d9009d71	Using "rails style" order arguments	2017-01-07 17:55:40 -08:00
Eugen	7a0a13ab53	Merge pull request #432 from blackle/volume-icon Show correct volume icons on video player	2017-01-08 02:36:12 +01:00
blackle	8a571158c9	Show correct volume icons on video player	2017-01-07 20:23:15 -05:00
Eugen	cec7e69827	Merge pull request #430 from blackle/logout_mobile Show logout button on getting started so it's available on mobile	2017-01-08 01:24:06 +01:00
blackle	e1ca354956	Show logout button on getting started so it's available on mobile	2017-01-07 18:41:57 -05:00
blackle	57ff221c0f	Emojify display names in notifcations	2017-01-07 18:16:14 -05:00
blackle	61211b509c	Improve contrast of bio and username text in account info	2017-01-07 16:39:30 -05:00
Eugen Rochko	be6ae3546f	Replace getting started icon on desktop nav bar with asterisk instead of hamburger	2017-01-07 15:46:39 +01:00
Eugen Rochko	5c7add2176	Fix #147 - Unreblogging will leave original status in feeds	2017-01-07 15:44:22 +01:00
Eugen Rochko	989c3f4002	Add tab bar alternative to desktop UI, upgrade react & react-redux	2017-01-06 22:09:55 +01:00
Eugen Rochko	1bfbce7b45	Clean up h-card mess of divs	2017-01-06 20:24:51 +01:00
Eugen Rochko	72c3a41bef	Fix h-card classes and remote follow button appearing when it shouldn't	2017-01-06 20:15:24 +01:00
Greg V	18deeb9db5	Add Microformats2 markup h-feed, h-card and h-entry	2017-01-06 18:10:10 +03:00
Eugen	92bd5f62f6	Merge pull request #417 from ineffyble/twitter-card-metadata Twitter Cards support	2017-01-06 01:16:45 +01:00
Eugen Rochko	7b9f8766e8	Fix #416 - Generate random unique 14-byte (19 characters) shortcodes for local attachments, use them in URLs. Check status privacy before redirecting to actual file.	2017-01-06 00:29:12 +01:00
Effy Elden	819bfb75c6	Add twitter:card metatag to enable Twitter Cards support	2017-01-06 09:47:40 +11:00
Effy Elden	10a9ebae3b	Add tag property to desktop notifications, preventing duplicates (i.e. when multiple Mastodon tabs are open)	2017-01-06 08:26:45 +11:00
Eugen Rochko	00b9ba64c9	Fixed unexpected error	2017-01-05 14:23:59 +01:00

... 14 15 16 17 18 ...

2286 commits