mastodon

mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00

Author	SHA1	Message	Date
Eugen Rochko	b6003afcdb	Add show more/less toggle for entire threads in web UI (#6733 ) Fix #1258	2018-03-11 09:52:59 +01:00
David Yip	0c2a16fcbf	Merge pull request #379 from ThibG/glitch-soc/features/improved-account-header Port #6627 and #6636 to glitch-soc flavour	2018-03-10 23:35:16 -06:00
Marcin Mikołajczak	f5ee2d469b	i18n: Update Polish translation (#6731 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-03-11 01:56:30 +09:00
abcang	37b043d447	Improve performance of account_media_status_ids (#6729 )	2018-03-10 17:44:26 +01:00
Eugen Rochko	4476a45444	Fix #6717 : Do not double html-encode page titles (#6720 )	2018-03-10 11:43:20 +01:00
Jenkins	e553905ba7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 12:17:22 +00:00
Thibaut Girka	25c5223617	Port #6627 and #6636 to glitch-soc	2018-03-09 12:10:22 +01:00
Eugen Rochko	11697d6894	Fix thumbnail not filling entire space sometimes (#6709 )	2018-03-09 11:33:05 +01:00
Renato "Lond" Cerqueira	5ba4c36f95	Weblate translations (2018-03-09) (#6708 ) * Translated using Weblate (Galician) Currently translated at 100.0% (580 of 580 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (580 of 580 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Japanese) Currently translated at 99.8% (579 of 580 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Dutch) Currently translated at 100.0% (581 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (French) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (German) Currently translated at 99.3% (577 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.3% (577 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (German) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Catalan) Currently translated at 100.0% (581 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (French) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Polish) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (581 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (581 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (276 of 276 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 90.3% (525 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (581 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations	2018-03-09 18:38:13 +09:00
Jeong Arm	ccd53e983c	Missing Korean translations (#6703 )	2018-03-09 14:21:47 +09:00
Jenkins	447d7e6127	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 00:17:17 +00:00
Eugen Rochko	ff44b2e92d	Add missing meta description to profiles, some other SEO stuff (#6706 ) - Add missing meta description to profiles - Add canonical rel link to landing page - Remove linebreaks from title tags - Add username to profile title - Add toots/following/followers to profile description tags - Add next/prev rel links to profiles - Do not index follower/following variants of profiles	2018-03-09 00:35:07 +01:00
Yamagishi Kazutoshi	188aa3ea50	Add polyfill for Object.values (#6697 )	2018-03-08 13:07:25 +01:00
Eugen Rochko	a29d409e20	If login redirects to omniauth, redirect logout to root_path (#6694 ) Fix #6670	2018-03-08 11:18:26 +01:00
Eugen Rochko	5acd5315f2	Improve styling of closed registrations message, rename button (#6695 ) * Improve styling of closed registrations message, rename button "Sign up on another server" Fix #6683 * Adjust styling of closed registrations message	2018-03-08 11:10:37 +01:00
Eugen Rochko	b79ab15859	When enabled, always display media in gallery. Also: click to reveal (#6692 ) Fix #6677	2018-03-08 08:57:21 +01:00
Eugen Rochko	77406d3a09	Display AttachmentList in notifications (#6693 )	2018-03-08 08:22:04 +01:00
Eugen Rochko	510c9049c7	For now, put a "." into no-text statuses with media for backcompat (#6691 )	2018-03-08 08:20:49 +01:00
Eugen Rochko	64db9ed5f6	After blocking domain with reject_media, invalidate cache (#6679 ) Media attachments are part of the association cache of statuses, since they are presumed to be immutable. Unless this cache is cleared manually, the statuses will continue to look like they have media embedded.	2018-03-08 06:59:42 +01:00
Yamagishi Kazutoshi	1085ef3836	Weblate translations (2018-03-08) (#6690 ) * Translated using Weblate (French) Currently translated at 99.8% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (275 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Slovak) Currently translated at 85.3% (494 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (275 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (275 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (275 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 100.0% (275 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Arabic) Currently translated at 99.2% (273 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Japanese) Currently translated at 100.0% (275 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Arabic) Currently translated at 66.8% (387 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 93.1% (54 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (French) Currently translated at 99.8% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Slovak) Currently translated at 87.7% (508 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (275 of 275 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * bundle exec i18n-tasks normalize && yarn manage:translations * Remove ar.simple_form.hints.defaults.{display_name,note}	2018-03-08 06:59:34 +01:00
Eugen Rochko	86a9de6753	Display AttachmentList in timelines in compact style when media missing (#6680 )	2018-03-08 04:54:26 +01:00
Renato "Lond" Cerqueira	9aba44ea79	Rescue when there's no extension in the remotable (#6358 ) * Rescue when there's no extension in the remotable Sometimes the remotable is pointing to a directory with no file extension. Maybe it should not be expecting to identify based on extensions to begin with, but since it's the case, it should be ready for it. * Fix codeclimate issue * Check if filename is nil instead of rescueing exception Suggestion made in the PR * Avoid concatenation issue if filename is nil If filename is nil, extname was undefined * Invert condition Address PR comments	2018-03-08 02:25:10 +01:00
MitarashiDango	6dcf96271e	fix validation error (media only status) (#6684 ) * fix validation error (media only status) * Incorporating review suggestions * Reflect similar fix to OStatus side * Fix not to include media in transaction * Restore the limit of the number of media * Fix not to return nil	2018-03-08 01:22:47 +01:00
Eugen Rochko	b170627ceb	Fix cover behaviour of thumbnails that are wider than taller (#6678 )	2018-03-07 12:02:05 +01:00
Eugen Rochko	a1b065700a	Fix focal point modals broken by #5956 (#6676 )	2018-03-07 12:01:53 +01:00
Eugen Rochko	8de048fcdb	In wide layout, columnize Mastodon features on landing page (#6674 )	2018-03-07 08:59:27 +01:00
Eugen Rochko	cfa9b6e13a	Remove text requirement when media attached from statuses (#6672 )	2018-03-07 08:28:52 +01:00
vpzomtrrfrt	e26d5ca923	Don't escape statuses while truncating (#6671 )	2018-03-07 07:12:01 +01:00
Effy Elden	dd9d00d293	Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available (#6669 )	2018-03-07 06:19:10 +01:00
Eugen Rochko	89a52d6280	Fix wrong target URIs in ActivityPub Add/Remove (#6668 )	2018-03-07 05:58:24 +01:00
Eugen Rochko	e6520c0270	Fix #6657 - Use target instead of origin in Remove activity (#6664 )	2018-03-07 03:54:46 +01:00
Akihiko Odaki	913a38111f	Remove pointer events on the entire UI when a dropdown menu is open (#6648 ) * Remove pointer events on the entire UI when a dropdown menu is open This prevents operations to change the location of the menu such as scrolling. * Fix mistake from merge	2018-03-07 02:26:43 +01:00
Sylvhem	cb74c0cfe4	Add headings to the security settings page (#6661 ) * Changes the headings' rank of the security settings section This commit changes the existing headings' rank of the security settings section from level 6 to level 4. * Renames the auth.change_password string into auth.security The "Security" preferences' section used to be called "Change password". When it was renamed, the string name wasn't changed. This commits changes auth.change_password to auth.security. * Adds a heading to the password change form There was previously no heading for the part of the "Security" page that contain the password change form. This commit adds a rank 4 heading to this section and reintroduces an "auth.change_password" string to be used inside it. * Removes useless HR elements The various sections of the "Security" settings page were previously separated by HR elements. Now that there is proper headings, they're not required anymore. * Updates CSS This commit updates CSS in such a way that the same style is applied to all the H4 elements of the settings. * Correct a mistake A character went missing on one of the previous commits, broking the CSS. This new commit fixes it.	2018-03-07 01:39:40 +01:00
Akihiko Odaki	a07cfee644	Extract columns area from UI component (#6650 ) UI component used to toggle isComposing state by directly manipulating the DOM element to avoid the expensive rendering. However, it is hacky, and is not effective for other states. Instead, this change makes the rendering cheaper by extracting the huge columns area.	2018-03-06 07:45:31 +01:00
Akihiko Odaki	13cf92df27	Use React.PureComponent instead of React.Component (#6653 )	2018-03-06 07:28:26 +01:00
Akihiko Odaki	61e6275781	Use withRouter for TabsBar (#6652 ) TabsBar refers to router, which is a private context property of react-router. withRouter is a recommended alternative. It also allows to track location changes even if React.PureComponent is used.	2018-03-06 07:28:05 +01:00
Eugen Rochko	78d772af86	Fix #3807 : Increase avatars to 400x400 max (#6651 ) But do not upscale when they are smaller	2018-03-06 06:29:01 +01:00
Eugen Rochko	20d1be18af	Fix accounts' display name/bio not being set from initial state (#6644 )	2018-03-06 00:08:35 +01:00
Akihiko Odaki	b0664a5e6c	Replace onScrollToBottom with onLoadMore (#6615 ) onScrollToBottom was a function to run instead of onScrollToTop and onScroll when scrolling to the bottom. The behavior to prevent onScrollToTop was inconvenient because the viewport can be at the bottom and at the top at the same time if the viewport is larger than the container. onScrollToBottom was also called when the button to load more is clicked on contray to the name suggests, which led notifications and status_list_container components to mark the scrolled location is not at the top mistakenly. onLoadMore is a replacement for onScrollToBottom. It will be called independently from onScrollToTop and onScroll.	2018-03-05 19:31:40 +01:00
Akihiko Odaki	a38dbd9c8a	Redirect from Web tag timeline to public tag timeline if not signed in (#6633 ) This is also implemented in Pawoo: `ceafdbd1bb`	2018-03-05 19:29:36 +01:00
Akihiko Odaki	f6a8d835d3	Place dropdown menu top if it is closer to the bottom of the viewport (#6641 )	2018-03-05 19:28:56 +01:00
ThibG	4746feaa1c	Add “Domain hidden” badge (#6636 )	2018-03-05 16:45:36 +01:00
Renato "Lond" Cerqueira	bd40574476	Weblate translations (05-03-2018) (#6640 ) * Translated using Weblate (French) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Japanese) Currently translated at 98.9% (572 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Catalan) Currently translated at 98.4% (569 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (578 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (579 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (577 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (French) Currently translated at 99.8% (577 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Esperanto) Currently translated at 99.6% (576 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Arabic) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Slovak) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 74.5% (431 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Dutch) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Japanese) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Dutch) Currently translated at 100.0% (578 of 578 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (579 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Arabic) Currently translated at 99.6% (271 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Japanese) Currently translated at 98.9% (573 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Arabic) Currently translated at 66.6% (386 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Galician) Currently translated at 100.0% (579 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Slovak) Currently translated at 75.4% (437 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Polish) Currently translated at 99.8% (578 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Slovak) Currently translated at 83.5% (484 of 579 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (272 of 272 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations	2018-03-06 00:27:50 +09:00
Renato "Lond" Cerqueira	1674e2f34c	Normalize translations (#6638 ) Ran i18n-tasks normalize && yarn manage:translations, so that the translation changes appear on weblate	2018-03-05 23:12:17 +09:00
Marcin Mikołajczak	3b2e783c1f	i18n: Update Polish translation (#6632 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-03-05 16:05:52 +09:00
ThibG	46a9a23749	Make more apparent that an account is blocked or muted (fixes #6544 ) (#6627 ) * Add button to unblock blocked accounts from their profile * Add “Blocked” badge in place of “Follows you” when the user is blocked * Add “Muted” badge (below “follows you” badge)	2018-03-05 05:09:35 +01:00
Yuto Tokunaga	4e929b2d17	[RFC] Improved media modal (#5956 ) * Improved media modal ImageLoader: Impliment pinch zoom by CSS `transform: scale(X)` ImageLoader: Impliment panning by CSS `overflow: scroll` ImageLoader: Larger image MediaModal: Larger close button MediaModal: Close the modal by swiping vertically MediaModal: Show/hide close button and right/left navigation on tapping image MediaModal: Change the `pointer-event` CSS prpp to get more blank space to close the modal ImageLoader: Zoom/reset zoom on double tap MediaModal: disable vertical swiping while horizontally swiped ImageLoader: prevent propagating touchmove event to MediaModal MediaModal: Adjust size and potision of buttons ImageLoader: Adjust scroll potision on pinch zoom * Remove "swipe to close" and "double tap to zoom" features * remove unused prop and functions removed `onScroll` prop and `handleScroll` func in ImageLoader * separate zoom functionary to ZoomableImage component adjust styling of ImageLoader add styling for ZoomableImage * adjust size and potision of close button of media modal * Fix for gif video add `onClick` prop to ExtendedVideoPlayer specify `onClick` prop to video tag for switching nav of `MediaModal` add `.video-modal` class to scss to separate styling for `VideoModal` * fix styling for centering specify height of `ZoomableImage` by pixel clean styling for `ImageLoader` * fix lint errors * small fix * fixed designated parts	2018-03-04 20:32:24 +01:00
Akihiko Odaki	ef44c62d17	Do not default site_title with site_hostname in InstanceHelper (#6624 ) site_title is "Mastodon" by default configuration, and there is no need to default site_title with site_hostname in InstanceHelper.	2018-03-04 20:29:49 +01:00
abcang	219aac7800	Show media on report UI (#6619 )	2018-03-04 20:29:12 +01:00
Akihiko Odaki	c110fa62ac	Provide default OTP_SECRET value for development environment (#6617 )	2018-03-04 20:28:24 +01:00
Akihiko Odaki	7a6eaad445	Do not require images in about.js and share.js (#6622 ) They are already required by common.js.	2018-03-04 20:27:40 +01:00
Akihiko Odaki	460e380d38	Implement tag auto-completion by history (#6621 ) This is a functionality similar to one implemented in Pawoo: `21a3c70f80`	2018-03-04 20:27:25 +01:00
Akihiko Odaki	778b37790b	Do not fetch environment variables to determine default locale (#6618 ) The default locale is now set by config.	2018-03-04 10:00:46 +01:00
Eugen Rochko	b66ec3bf95	Fix #6611 : Typo in change password template (#6616 )	2018-03-04 10:00:24 +01:00
Akihiko Odaki	51d760960c	Set the default locale in config (#6580 ) Previously the default locale was set by Localized concern for controllers, but it was not enforced for mailers. config is enforced throughout the application and an appropriate place to set the default locale.	2018-03-04 09:21:35 +01:00
Eugen Rochko	9110db41c5	Federate pinned statuses over ActivityPub (#6610 ) * Federate pinned statuses over ActivityPub * Display pinned toots in web UI Fix #6117 * Fix migration * Fix tests * Update outbox_serializer.rb * Update remove_serializer.rb * Update add_serializer.rb * Update fetch_featured_collection_service.rb	2018-03-04 09:19:11 +01:00
Akihiko Odaki	45feb439bd	Finalize location on scrollable notifications when unmounting (#6614 ) The top of the scrollable notifications will be invisible after unmounting. The Redux state should be updated accordingly in such a case so that the unread notification counter will be updated later.	2018-03-04 08:55:15 +01:00
Eugen Rochko	44829d8216	Fix missing focalPoint in ActivityPub JSON (#6609 )	2018-03-04 07:21:41 +01:00
Aboobacker MK	49092945ab	Fix 500 while searching after deleting a post (#6604 ) Fixes #6602	2018-03-03 19:45:06 +01:00
David Yip	65e2a4645e	Use glitchsoc TimelineComponent's margin/padding on about page.	2018-03-03 11:16:10 -06:00
David Yip	6176e278f4	Copy in new CSS for about page.	2018-03-03 11:01:24 -06:00
Jeong Arm	c82a2358bd	Translate Korean (#6608 )	2018-03-04 01:53:55 +09:00
David Yip	1b8fcd4df5	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: README.md app/controllers/follower_accounts_controller.rb app/controllers/following_accounts_controller.rb app/serializers/rest/instance_serializer.rb app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.ja.yml	2018-03-02 21:46:44 -06:00
Eugen Rochko	e72db6d9dd	Move "compose" on mobile to floating action button (#6594 ) * Move "compose" on mobile to floating action button * Fix contrast on floating action button	2018-03-02 07:12:40 +01:00
Eugen Rochko	036dd98abb	Responsively enforce 16:9 ratio on all media thumbnails in web UI (#6590 ) * Responsively enforce 16:9 ratio on all media thumbnails in web UI Also change video player behaviour to "contain" rather than "cover" videos that don't fit the ratio, unlike images and GIFs, it's expected that a video is shown fully. * Fix spacing issues and remove floor * Remove floor	2018-03-02 07:00:04 +01:00
Eugen Rochko	7901f9f63e	When search enabled, display hint in search popout (#6593 ) * When advanced search is enabled, show different hint in search popout * Change "getting started" icon in tabs bar from asterisk to hamburger	2018-03-02 06:02:42 +01:00
Yamagishi Kazutoshi	0963b6fd22	Weblate translations (2018-03-02) (#6588 ) * Translated using Weblate (Galician) Currently translated at 100.0% (57 of 57 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (57 of 57 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Swedish) Currently translated at 100.0% (57 of 57 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Catalan) Currently translated at 100.0% (57 of 57 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Slovak) Currently translated at 100.0% (57 of 57 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Dutch) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Arabic) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Arabic) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Slovak) Currently translated at 61.1% (342 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Swedish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sv/ * Translated using Weblate (Portuguese) Currently translated at 96.4% (54 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/ * Translated using Weblate (Japanese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Arabic) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 79.0% (49 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Arabic) Currently translated at 52.9% (296 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Slovak) Currently translated at 61.1% (342 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Dutch) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (57 of 57 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Galician) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Japanese) Currently translated at 99.2% (561 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 60.5% (342 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Polish) Currently translated at 99.1% (560 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 62.4% (353 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Swedish) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Japanese) Currently translated at 99.2% (561 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Catalan) Currently translated at 99.1% (560 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Finnish) Currently translated at 99.6% (263 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Slovak) Currently translated at 62.6% (354 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (French) Currently translated at 99.1% (560 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Japanese) Currently translated at 93.1% (54 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Polish) Currently translated at 99.2% (561 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Polish) Currently translated at 99.8% (564 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 72.5% (45 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Finnish) Currently translated at 99.6% (263 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Finnish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Finnish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Catalan) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 99.8% (564 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Dutch) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Arabic) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Slovak) Currently translated at 62.8% (355 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 99.6% (263 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Finnish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Polish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ * Translated using Weblate (Arabic) Currently translated at 96.0% (72 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Slovak) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Arabic) Currently translated at 98.2% (57 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (German) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (Catalan) Currently translated at 99.8% (564 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Finnish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/ * Translated using Weblate (French) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Slovak) Currently translated at 63.7% (360 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Slovak) Currently translated at 64.9% (367 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/ar/ * Translated using Weblate (Arabic) Currently translated at 98.6% (74 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Catalan) Currently translated at 99.8% (564 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Slovak) Currently translated at 69.5% (393 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 99.2% (561 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Arabic) Currently translated at 88.7% (55 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Arabic) Currently translated at 92.0% (69 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Slovak) Currently translated at 70.6% (399 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Slovak) Currently translated at 74.1% (419 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 67.6% (382 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (French) Currently translated at 99.4% (562 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese) Currently translated at 95.3% (539 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Slovak) Currently translated at 75.3% (426 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Croatian) Currently translated at 58.0% (36 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/hr/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/hu/ * Translated using Weblate (Esperanto) Currently translated at 58.6% (34 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Occitan) Currently translated at 96.8% (547 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Slovak) Currently translated at 76.2% (431 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (French) Currently translated at 99.6% (263 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Arabic) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 77.8% (440 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (565 of 565 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/	2018-03-02 04:36:16 +01:00
Eugen Rochko	379cdfaac5	Fix #6586 : Add close modal icon to report dialog (#6591 )	2018-03-02 04:36:00 +01:00
Eugen Rochko	38b9af76a2	Improve style of web UI account tabs (#6589 )	2018-03-02 04:35:49 +01:00
mayaeh	e7d741ece3	i18n: Update Japanese translations (#6581 ) * yarn manage:translations * Update Japanese translations.	2018-03-02 07:48:17 +09:00
Eugen Rochko	a3c4138197	Add contact_account and languages to instance API (#6574 )	2018-03-01 20:48:11 +01:00
Marcin Mikołajczak	51b7a22ea7	i18n: Update Polish translation (#6578 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-03-01 18:26:51 +09:00
Eugen Rochko	68218d97c8	Add only_media param to public and hashtag timelines API (#6576 )	2018-03-01 03:21:21 +01:00
Eugen Rochko	5131012505	Add "Toots/Toots with replies/Media" tab below profile header (#6572 ) * Add "Toots/Toots with replies/Media" tab below profile header * Add focal point display to account gallery timeline * Fix visual glitch of standalone GIFV	2018-03-01 02:48:44 +01:00
Eugen Rochko	473a69ab18	Fix margin on top action button, fix width of counters on frontpage (#6573 )	2018-03-01 02:48:08 +01:00
Eugen Rochko	fce8464077	Ensure that boolean params in the API are parsed for truthiness (#6575 ) Use Rails smart boolean cast to account for values such as "f", "0", "false", etc. Previously, if a param was present in the request, it would count as true.	2018-03-01 02:47:59 +01:00
Eugen Rochko	47bdb9b33b	Fix #942 : Seamless LDAP login (#6556 )	2018-02-28 19:04:53 +01:00
Eugen Rochko	e852872846	Fix #5708 : Reject->Follow will remove the follow if it exists (#6571 )	2018-02-28 06:55:06 +01:00
Eugen Rochko	41a01bec23	Federated reports (#6570 ) * Fix #2176: Federated reports * UI for federated reports * Add spec for ActivityPub Flag handler * Add spec for ReportService	2018-02-28 06:54:55 +01:00
David Yip	d8e964456c	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2018-02-26 11:35:34 -06:00
Lynx Kotoura	7150f2e9d3	Grid layout for tag pages (#6545 ) * Use grid layout for the landing page * Use grid layout for tag pages * Set 2 columns width as explicit percentage for tag pages	2018-02-26 17:43:45 +01:00
Lynx Kotoura	a40167cf4d	Better grid layout for the landing page (#6543 ) * Use grid layout for the landing page * Fix column settings Set the ratio explicitly * Improve information board	2018-02-26 16:19:07 +01:00
Eugen Rochko	18513a978a	Improve public account cards (#6559 ) - Add follow/unfollow/remote follow buttons - Format the bio properly - Always show username@domain, even for local accounts	2018-02-26 16:18:41 +01:00
Ian McCowan	c33931b613	Fix prev/next links on public profile page (#6497 ) * Fix prev/next links on public profile page * Don't make pagination urls if no available statuses * Fix empty check method * Put left chevron before prev page link * Add scope for pagination "starting at" a given id * Status pagination try 2: s/prev/older and s/next/newer "older" on left, "newer" on right Use new scope for "newer" link Extract magic 20 page size to constant Remove max_id from feed pagination as it's not respected * Reinstate max_id for accounts atom stream * normalize	2018-02-26 03:31:28 +01:00
Eugen Rochko	5cc716688a	Ensure the app does not even start if OTP_SECRET is not set (#6557 ) * Ensure the app does not even start if OTP_SECRET is not set * Remove PAPERCLIP_SECRET (it's not used by anything, actually) Imports are for internal consumption and the url option isn't even used correctly, so we can remove the hash stuff from them	2018-02-26 01:31:44 +01:00
yuzulabo	43cc79aaa0	Fix border-radius of owner avatar in /about/more	2018-02-25 23:27:32 +09:00
Akihiko Odaki	2e8a492e88	Raise Mastodon::HostValidationError when host for HTTP request is private (#6410 )	2018-02-24 19:16:11 +01:00
Akihiko Odaki	7cb49eaa3a	Do not use function name to track components (#6542 ) UglifyJS2 is allowed to mangle function names, and function names can also be duplicate if they are from different scopes. Therefore function names are not reliable as identifiers. Functions as keys for Map object is a cheaper and more reliable alternative.	2018-02-24 19:10:57 +01:00
Jenkins	2edf7128f2	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-24 05:17:10 +00:00
Akihiko Odaki	f8f0572ee0	Do not push status to feed if its reblog is already inserted (#6488 ) A complemental change for precompute_feed_service_spec.rb also fixes its random failure which is caused by the Snowlake randomization of the order of an original status and its reblog.	2018-02-24 05:40:18 +01:00
imncls	f2f19e1f8a	Update SCSS	2018-02-24 03:22:58 +09:00
imncls	7bff3243ae	Update columns.scss	2018-02-24 01:45:15 +09:00
imncls	ef1d46948a	Update containers.scss	2018-02-24 01:26:48 +09:00
imncls	82408904a1	Update index.scss	2018-02-24 01:25:49 +09:00
imncls	3afc6174f5	Fix data export page error	2018-02-24 00:29:26 +09:00
imncls	fa3641df7f	Update about.scss	2018-02-24 00:22:05 +09:00
imncls	697f289597	Use absolute URL for focus reticle	2018-02-23 23:50:25 +09:00
imncls	bb6988a7ac	Merge branch 'master' of https://github.com/tootsuite/mastodon # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb	2018-02-23 23:28:31 +09:00
Ghislain Loaec	e668180044	New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540 )	2018-02-23 01:16:17 +01:00
Ghislain Loaec	3084fe4959	New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538 )	2018-02-22 23:31:25 +01:00
Eugen Rochko	b8535ad4df	Fix nil error in focal_point? (#6537 )	2018-02-22 17:42:33 +01:00
Eugen Rochko	5f3bee345d	Fix container regression (#6531 ) * Update public.html.haml * Update auth.html.haml * Update modal.html.haml	2018-02-22 03:04:27 +01:00
beatrix	755aad534a	fix typo in image serializer (#6530 ) respond to!	2018-02-22 02:47:17 +01:00
Eugen Rochko	c71aa468b5	Redesign landing page (again) (#6486 ) * Redesign landing page (again) * Move login form in small version to the right column * Display closed registrations message * Add site setting for the hero image * Fix test * Increase spacing, maximum width, change call to action section	2018-02-22 01:03:48 +01:00
Eugen Rochko	d8bc64bb09	Fix #6526 : Only store redirect location if not in JSON format (#6528 )	2018-02-22 00:51:30 +01:00
Eugen Rochko	90f12f2e5a	Focal points (#6520 ) * Add focus param to media API, center thumbnails on focus point * Add UI for setting a focal point * Improve focal point icon on upload item * Use focal point in upload preview * Add focalPoint property to ActivityPub * Don't show focal point button for non-image attachments	2018-02-22 00:35:46 +01:00
Eugen Rochko	d3a62d2637	Fix #6525 : Make sure file is opened in LazyThumbnail processor (#6529 )	2018-02-22 00:28:19 +01:00
Eugen Rochko	4bc625166e	Fix bug in relationships API introduced by #6482 (#6527 ) It was merge when it needed to be deep_merge. And added some tests	2018-02-21 23:22:12 +01:00
Eugen Rochko	61ed133fea	Account archive download (#6460 ) * Fix #201: Account archive download * Export actor and private key in the archive * Optimize BackupService - Add conversation to cached associations of status, because somehow it was forgotten and is source of N+1 queries - Explicitly call GC between batches of records being fetched (Model class allocations are the worst offender) - Stream media files into the tar in 1MB chunks (Do not allocate media file (up to 8MB) as string into memory) - Use #bytesize instead of #size to calculate file size for JSON (Fix FileOverflow error) - Segment media into subfolders by status ID because apparently GIF-to-MP4 media are all named "media.mp4" for some reason * Keep uniquely generated filename in Paperclip::GifTranscoder * Ensure dumped files do not overwrite each other by maintaing directory partitions * Give tar archives a good name * Add scheduler to remove week-old backups * Fix code style issue	2018-02-21 23:21:32 +01:00
りんすき	c1e77b56a9	fix #6523 (#6524 )	2018-02-21 19:33:23 +01:00
Eugen Rochko	a7171af0a3	Fix avatar and header issues by using custom geometry detector (#6515 ) * Fix avatar and header issues by using custom geometry detector Revert a part of #6508. The file passed to dynamic styles method was not actually a file, but an instance of Paperclip::Attachment, which broke all styles by always returning {} from the method. One problem with GIF avatars was that Paperclip::GeometryDetector reported wrong dimensions for them, e.g. 120x120 GIF avatar would for some reason be detected as 120x53. By writing our own geometry parser, we can use FastImage, which also happens to be faster than ImageMagick, to detect image dimensions, which are also correct. Unfortunately, this PR does not implement skipping a `convert` entirely if the dimensions are already correct, as I found no easy way to write that behaviour into Paperclip without rewriting the Paperclip::Thumbnail class. * Only invoke convert if dimension or format needs to be changed	2018-02-21 03:40:12 +01:00
Jenkins	1445ba1703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-19 15:17:14 +00:00
Eugen Rochko	66105929e0	Don't resize avatars/headers if their dimensions are already right (#6508 ) Also don't apply "-quality 80" option which is probably the reason for slight color differences between original and remote image (because it would apply it twice, once on original instance, and again on the receiving instance)	2018-02-19 16:06:12 +01:00
Eugen Rochko	cbb69d41f6	Fix media spoiler design (#6507 ) - 4px rounded corners on media attachments - Better colors/contrast for CW/media spoiler on public pages - Fix vertical alignment of "Show more" button - Fix layout jump when unhiding standalone media	2018-02-19 02:39:18 +01:00
Konrad Pozniak	bb26cdda24	add parameter locked to /api/v1/update_credentials (#6506 )	2018-02-18 22:57:53 +01:00
HellPie	bc6751ecce	Remove outline from body window (Fixes #6501 ) (#6502 )	2018-02-18 16:32:58 +01:00
Eugen Rochko	cba2897108	Cache relationships in API (#6482 ) * Cache relationships in API * Fetch relationships for search results in UI * Only save one account's maps in each cache item	2018-02-18 03:14:46 +01:00
Eugen Rochko	a71af98401	Push discovered status through streaming API within a time window (#6484 ) Time window of 6 hours	2018-02-17 14:28:48 +01:00
David Yip	3d033a4687	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: Gemfile config/locales/simple_form.pl.yml	2018-02-17 00:02:37 -06:00
Eugen Rochko	9dbae6e8a1	Save video metadata and improve video OpenGraph tags (#6481 ) * Save metadata from video attachments, put correct dimensions into OG tags * Add twitter:player for videos * Fix code style and test	2018-02-16 07:22:20 +01:00
Eugen Rochko	1122579216	Do not hide NSFW media/CW'd text in OpenGraph tags (#6479 ) Reasoning: HTML title tag affects everyone. But OpenGraph only affects when somebody is deliberately sharing the content, usually in an environment where such content is expected. Hiding the content in OpenGraph tags results in deceitful previews which inhibit the shareability of the post. Example: Somebody writes a clever post about politics but kindly puts a "uspol" content warning on it. Mastodon users are thankful, but sharing this post on another platform results in non-Mastodon users believing the entire contents of the post is "uspol" and not clicking through/reading and re-sharing.	2018-02-16 04:40:53 +01:00
Eugen Rochko	478ca39e5e	After click to embed video, autoplay it (#6480 )	2018-02-15 23:05:12 +01:00
Eugen Rochko	f7765acf9d	Fix #5173 : Click card to embed external content (#6471 )	2018-02-15 07:04:28 +01:00
abcang	ecdac9017e	Fix media button type (#6478 )	2018-02-15 04:40:42 +01:00
Marcin Mikołajczak	ba8ec4eed6	i18n: Update Polish translation (#6470 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-02-14 07:55:45 +09:00
Jenkins	efc9ffcb80	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-11 04:10:16 +00:00
David Yip	b6159bcb0a	Merge remote-tracking branch 'origin/merge-upstream'	2018-02-10 22:08:45 -06:00
beatrix	136458eaf4	Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearing Revert `245816ab27` (fixes #348)	2018-02-10 21:47:27 -05:00
Thibaut Girka	fb6f131fa1	Revert `245816ab27` (fixes #348 ) Since `245816ab27`, IntersectionObserverArticle assumes that its children do not change unless the number of children changes. This is not the case with the notification overlay, which resulted in the checkmark of notification cleaning mode not updating unless scrolling to make notifications appear/disappear. This change may negatively impact performances.	2018-02-10 20:59:50 +01:00
David Yip	f1f67c46c5	Use Html2Text to generate plaintext for keyword mutes. #236 . This allows us to match URLs inside link hrefs.	2018-02-10 10:36:16 -06:00
David Yip	53c86b29f0	Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234 . The class helps out with keyword mutes, not just some general concept of "filtering".	2018-02-10 10:36:15 -06:00
ThibG	411c9ecb4b	Fix password recovery (#6459 ) * Fix password recovery * Use “resource” instead of “current_user”	2018-02-10 17:09:44 +01:00
David Yip	d263e3bc2d	Fill out some examples for Glitch::FilterHelper. #234 . Also add HTML entity decoding to Glitch::FilterHelper, which is needed to e.g. match "<" to the tag-stripped version of "<p><3</p>" or "<p><3</p>".	2018-02-10 02:40:27 -06:00
David Yip	29b5b46c87	Strip HTML from keyword mute input. #234 .	2018-02-10 02:40:27 -06:00
Eugen Rochko	3ebc0ad4d3	Full-text search for authorized statuses (#6423 ) * Add full-text search for authorized statuses - Search API will return statuses that match the query - Only for logged in users - Only if you are author of the status, - Or you were mentioned in it - Or you favourited or reblogged it - Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX` - Run `rails chewy:deploy` to create & populate index Fix #5880 Fix #4293 Fix #1152 * Add commented out docker-compose configuration for ES container * Optimize index import, filter search results * Add basic normalization to the index * Add better stemming and normalization to the index * Skip webfinger request if search query includes both @ and a space * Fix code style * Visually separate search result sections * Fix code style issues	2018-02-09 23:04:47 +01:00
David Yip	020b40efdb	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml	2018-02-09 09:25:53 -06:00
Eugen Rochko	2ef9d0e101	Change web UI "posts" to "toots" on profile for consistency (#6447 )	2018-02-09 00:27:18 +01:00
Eugen Rochko	76f3d5d16b	Add preference to always display sensitive media (#6448 )	2018-02-09 00:26:57 +01:00
Jenkins	5ba2c300d8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-08 23:17:14 +00:00
abcang	298c81c00f	Clear account cache of notification target_status (#6442 )	2018-02-08 15:33:23 +01:00
abcang	cf32f7da5c	Fix response of signature_verification_failure_reason (#6441 )	2018-02-08 05:00:45 +01:00
Akihiko Odaki	67f7ffa792	Change user_id column non-nullable (#6435 )	2018-02-07 16:35:44 +01:00
Jenkins	3405ea6dd9	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-05 02:17:12 +00:00
Daniel King	95c8232109	match hashtag regex in js client with server (#6431 ) the slight mismatch in hashtag regex between js and ruby was causing hashtag warning to be displayed for unlisted tweets when an invalid hashtag was entered exact version of ruby regex not possible in js as POSIX bracket expressions are not supported, this version approximates and doesn't give same unicode support	2018-02-05 02:44:13 +01:00
David Yip	a6fb1c58ee	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb	2018-02-04 16:36:19 -06:00
Eugen Rochko	38e0133e1b	Make PAM gem optional, allow configuration over environment (#6415 )	2018-02-04 15:05:53 +01:00
abcang	9b6223f5e2	Validation of count works even when text of status is nil (#6429 )	2018-02-04 12:32:41 +01:00
abcang	3f35d43222	Exclude nil from relationships array (#6427 )	2018-02-04 12:32:10 +01:00
abcang	c156a83e7d	Make sure status is not nil (#6428 )	2018-02-04 12:31:46 +01:00
Renato "Lond" Cerqueira	4e4f1b0dcb	Add option to show only local toots in timeline preview (#6292 ) * Add option to show only local toots in timeline preview Right know, toots from all the known fediverse are shown in the main page of an instance. That however doesn't reflect the instance itself. With this option the admin may choose to display only local toots so that users checking the instance get a better idea of internal conversations. * Fix issues pointed by codeclimate and eslint * Add default message for community timeline * Update pl.yml	2018-02-04 06:00:10 +01:00
Eugen Rochko	26f21fd5a0	CAS + SAML authentication feature (#6425 ) * Cas authentication feature * Config * Remove class_eval + Omniauth initializer * Codeclimate review * Codeclimate review 2 * Codeclimate review 3 * Remove uid/email reconciliation * SAML authentication * Clean up code * Improve login form * Fix code style issues * Add locales	2018-02-04 05:42:13 +01:00
Jenkins	530fcc1c14	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-04 03:17:11 +00:00
ncls7615	15a5b3372a	Fix detailed-status	2018-02-04 10:35:09 +09:00
takayamaki	d75d2a9f99	fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417 )	2018-02-03 18:41:51 +01:00
David Yip	4c1fd9a19c	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	2018-02-02 08:39:52 -06:00
abcang	33f56811e3	Fix column header button (#6411 )	2018-02-02 13:31:28 +01:00
abcang	7e5c433dfc	Fix saving of oEmbed image (#6409 )	2018-02-02 11:57:59 +01:00
Akihiko Odaki	c1efe0aa1d	Set minimum height for mastodon on drawer (#6142 )	2018-02-02 11:56:50 +01:00
ThibG	ac1093256c	Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207 )	2018-02-02 10:54:04 +01:00
Charlotte Fields	af40824998	moved save button (#3792 ) * moved save button * added save back to the bottom * Update show.html.haml	2018-02-02 10:45:43 +01:00
Akihiko Odaki	77dd9e7d27	Remove wave from list drawer (#6381 )	2018-02-02 10:32:41 +01:00
Akihiko Odaki	5da5c65db8	Unify links container implementation in about pages (#6382 ) They were redundant, and also had a inconsistency; the button for "other instances" had an icon for the external link in "more" page, but it didn't in the other pages. This unifies the implementation, and the external link icon is now shown in all the about pages.	2018-02-02 10:32:21 +01:00
Akihiko Odaki	0be9a1e321	Accept ActivityPub announce from the author of the original note (#6236 )	2018-02-02 10:22:15 +01:00
puckipedia	8e4cf6282b	Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225 )	2018-02-02 10:19:59 +01:00
Alexander	04fef7b888	pam authentication (#5303 ) * add pam support, without extra column * bugfixes for pam login * document options * fix code style * fix codestyle * fix tests * don't call remember_me without password * fix codestyle * improve checks for pam usage (should fix tests) * fix remember_me part 1 * add remember_token column because :rememberable requires either a password or this column. * migrate db for remember_token * move pam_authentication to the right place, fix logic bug in edit.html.haml * fix tests * fix pam authentication, improve username lookup, add comment * valid? is sometimes not honored, return nil instead trying to authenticate with pam * update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests * update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user * codeconvention fixes * code convention fixes * fix idention * update dependency, explicit conflict check * fix disabled password updates if in pam mode * fix check password if password is present, fix templates * block registration if account is maintained by pam * Revert "block registration if account is maintained by pam" This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20. * fix identation error introduced by rebase * block usernames maintained by pam * document pam settings better * fix code style	2018-02-02 10:18:55 +01:00
abcang	ffb2b8ef8c	Fix button hiding when header title is too long (#6406 )	2018-02-01 17:17:17 +01:00
Jenkins	ad3a2dfb66	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-31 23:17:13 +00:00
Evgeny Petrov	3ed194b67d	Russian language updated (#6397 )	2018-02-01 07:33:54 +09:00
David Yip	f4b2478af1	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml	2018-01-28 22:45:17 -06:00
Eugen Rochko	47eda1e5fb	Fix padding bug in landing page column header (#6374 )	2018-01-29 01:10:59 +01:00
Eugen Rochko	79bc3d5845	Add direction tags to HTML e-mails for RTL languages (#6373 )	2018-01-29 00:22:20 +01:00
Renato "Lond" Cerqueira	106efba800	Weblate translations (#6370 ) * Translated using Weblate (German) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * Translated using Weblate (Slovak) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 69.6% (39 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Japanese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Galician) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Arabic) Currently translated at 67.7% (42 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Arabic) Currently translated at 71.4% (40 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Japanese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Spanish) Currently translated at 70.9% (44 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/ * Translated using Weblate (Spanish) Currently translated at 92.1% (515 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Spanish) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/ * Translated using Weblate (French) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/ * Translated using Weblate (French) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (German) Currently translated at 89.0% (498 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/no/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/no/ * Translated using Weblate (Swedish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/no/ * Translated using Weblate (Hungarian) Currently translated at 37.5% (21 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hu/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/ * Translated using Weblate (French) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Esperanto) Currently translated at 93.3% (70 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/ * Translated using Weblate (German) Currently translated at 90.3% (505 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Portuguese) Currently translated at 91.4% (511 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Spanish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/ * Added translation using Weblate (Spanish) * Translated using Weblate (Spanish) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/es/ * Translated using Weblate (French) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Korean) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 99.6% (557 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (German) Currently translated at 90.8% (508 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.0% (509 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.9% (514 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.9% (514 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 92.6% (518 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 92.8% (519 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Spanish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/es/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * Translated using Weblate (Swedish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Arabic) Currently translated at 85.7% (48 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Esperanto) Currently translated at 90.3% (56 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/ * Translated using Weblate (Esperanto) Currently translated at 97.3% (73 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/ * Translated using Weblate (Finnish) Currently translated at 25.9% (145 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Portuguese) Currently translated at 96.2% (538 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Portuguese) Currently translated at 92.8% (52 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Spanish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Spanish) Currently translated at 99.4% (556 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Esperanto) Currently translated at 87.5% (49 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Slovak) Currently translated at 59.7% (334 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (French) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Korean) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.2% (555 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Hungarian) Currently translated at 67.9% (380 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Hungarian) Currently translated at 72.2% (404 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ Sajnos nem találtam magyar megfelelőt * Translated using Weblate (Hungarian) Currently translated at 96.0% (537 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Hungarian) Currently translated at 66.0% (37 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hu/ * Translated using Weblate (Catalan) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Finnish) Currently translated at 83.9% (47 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Catalan) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Swedish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 96.9% (542 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Japanese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Esperanto) Currently translated at 60.2% (337 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ [eo] Tiu parto de la frazo jam estas tradukita aliloke ☺ * Translated using Weblate (Slovak) Currently translated at 60.8% (340 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 70.9% (44 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations * Add back translations weblate removed	2018-01-28 22:48:09 +09:00
Quenty31	bd8d8ad894	l10n Occitan update (#6367 ) * Final point missing + s'acabar => expirar * Update oc.yml * Update oc.json	2018-01-27 08:51:03 +09:00
Jenkins	0e10667fbe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
abcang	a3c0a20373	Fix initial_state me in push_notification_register (#6349 )	2018-01-24 14:37:46 +01:00
codl	9abb5becf4	remove escapes from server-side γaml handler this matches a change that was made in the client-side equivalent	2018-01-24 14:23:25 +01:00
abcang	8cd2828e91	Fix hide and show media button on admin page (#6347 )	2018-01-24 13:29:46 +01:00
Quenty31	7650506b39	l10n Occitan language update (#6346 ) * Small changes * update for email templates * Digest changed * Update oc.yml waiting to finish * Update oc.yml * Update oc.yml * Update oc.yml * Update oc.json	2018-01-24 13:29:03 +01:00
Eugen Rochko	daefbd66a6	Fix style of legacy column headers (#6342 ) * Fix regression from #6199: Style of legacy column headers * Fix tests * Clean up variables	2018-01-24 04:03:51 +01:00
Eugen Rochko	1cc44cba81	Fix #6331 (#6341 ) UserTrackingConcern is circumvented by SessionsController#create because it calls warden, which calls the User#update_tracked_fields! method directly. Move returning user logic to that method.	2018-01-23 20:52:30 +01:00
ThibG	4ec9d8b4d9	Display deleted users' role as “Suspended” (#6339 ) Follow-up to `6eb60260b1` which missed a spot where the same error occurs.	2018-01-23 14:31:31 +01:00
Eugen Rochko	2fc2725076	Fix e-mail icon for reblog being stretched (#6336 )	2018-01-23 14:30:28 +01:00
Thibaut Girka	2107891edb	Remove some leftover code, I guess	2018-01-23 09:20:18 +01:00
cwm	0ddeed9377	add 'this.props' to fetchLists	2018-01-23 01:23:56 -06:00
Eugen Rochko	69f13e7bca	Fix regression from #6199 : Make entire column header clickable (#6334 )	2018-01-23 05:06:29 +01:00
cwm	939075899e	remove unused openOnboardingModal from getting_started	2018-01-22 19:38:34 -06:00
cwm	00be9eb3fe	merge tootsuite pr #6313 into glitch	2018-01-22 19:05:13 -06:00
Akihiko Odaki	613e7c7521	Rename ResolveRemoteAccountService to ResolveAccountService (#6327 ) The service used to be named ResolveRemoteAccountService resolves local accounts as well.	2018-01-22 14:25:09 +01:00
Akihiko Odaki	17cecd75ca	Rename FetchRemoteResourceService to ResolveURLService (#6328 ) The service used to be named FetchRemoteResourceService resolves local URL as well.	2018-01-22 14:24:22 +01:00
Akihiko Odaki	8cc65cde27	Resolve URL for local account in follow authorization success view (#6324 )	2018-01-22 14:22:14 +01:00
Renato "Lond" Cerqueira	b7f6ddeaf1	Weblate translations (#6323 ) * Translated using Weblate (Galician) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (543 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (543 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 95.2% (517 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 99.6% (259 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Dutch) Currently translated at 97.1% (543 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Japanese) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (French) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Polish) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Catalan) Currently translated at 94.6% (529 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 95.3% (533 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Dutch) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 98.3% (550 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 95.3% (533 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Japanese) Currently translated at 0.0% (0 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 1.7% (1 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 1.7% (52 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Polish) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ * Translated using Weblate (Catalan) Currently translated at 99.6% (260 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Japanese) Currently translated at 99.6% (260 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.6% (260 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (French) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (French) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (French) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.2% (555 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (French) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations * Add back values removed by weblate	2018-01-22 14:20:58 +01:00
David Yip	48d79007f6	Merge remote-tracking branch 'origin/master' into merge-upstream-20180121	2018-01-21 16:26:50 -06:00
Norayr Chilingarian	48cd6dc6ca	armenian translations initial commit (#6320 ) * adding armenian translations * updating config files for armenian translations * armenian translation fix * fixing spaces	2018-01-22 05:02:23 +09:00
David Yip	1253279feb	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	2018-01-21 13:36:10 -06:00
codl	cfd2b06821	fix filter search index being too strict when looking for line breaks (#6318 )	2018-01-21 13:23:17 +01:00
Aboobacker MK	112b1fa265	Redirect to 2FA creation page when otp_secret is not available (#6314 )	2018-01-21 13:21:28 +01:00
Eugen Rochko	31d1485887	Display number of follow requests in getting started menu, and (#6313 ) if notifications column is not mounted, also display number of unread notifications there.	2018-01-21 13:20:20 +01:00
Eugen Rochko	1287de1b83	Fix invalid value passed to full_asset_url in mailers (#6312 )	2018-01-21 13:20:00 +01:00
David Yip	2c578a01d8	Merge remote-tracking branch 'origin/master' into gs-master	2018-01-20 16:42:57 -06:00
David Yip	e7a0840f8c	Merge pull request #336 from ThibG/glitch-soc/features/tag-warning Display a warning when composing unlisted toots with something looking like a hashtag	2018-01-20 16:37:52 -06:00
David Yip	24b6e4121f	Merge pull request #342 from glitch-soc/merge-upstream Merge upstream	2018-01-20 16:37:35 -06:00
Iijima Yasushi	72f9eab3d6	Change mailer avatar url (#6309 ) * Change mailer avatar url * Use full_asset_url method	2018-01-20 19:27:13 +01:00
David Yip	3cae362214	Merge new onboarding styles; delete refs to PNGs.	2018-01-20 11:23:06 -06:00
David Yip	38f6d8130d	Eliminate stray conflict markers.	2018-01-20 10:46:43 -06:00
David Yip	071c2c9c85	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	2018-01-20 10:45:43 -06:00
SerCom_KC	80b3ca0f6f	Update Simplified Chinese translations (#6306 ) * i18n: (zh-CN) Add translations of #6251 * i18n: (zh-CN) Improve translations for #6291 * Fix en.json * i18n: (zh-CN) Update translations for #6303 * i18n: (zh-CN) Add translations of #6273 with minor adjustment * Minor fix * Minor fix	2018-01-21 00:11:21 +09:00
Eugen Rochko	45afdf1781	Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305 )	2018-01-20 03:49:06 +01:00
Eugen Rochko	79b34a0fa2	Restore onboarding modal (#6303 ) * Restore onboarding modal Revert 5ba8b3a396895ecec083c5258aaf9084d584a7c4 * Change greeting elephant graphic, fix up some design issues * Fix wrong link color in onboarding modal	2018-01-20 01:32:37 +01:00
Eugen Rochko	872a0d5bd8	Improve HTML e-mails based on Litmus tests (#6301 ) * Use PNG images in HTML e-mails * Make webpack use URLs with host so fonts load inside HTML e-mails Convert this back to a relative URL in the premailer CSS loader since local requests are quicker * Improve responsive design * Add missing PNG icon	2018-01-20 01:32:21 +01:00
Eugen Rochko	01421999ae	Make text e-mails consistent with HTML ones in UserMailer (#6291 ) * Make text e-mails consistent with HTML ones in UserMailer * Fix UserMailer specs	2018-01-20 01:32:05 +01:00
David Yip	2ca965c704	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	2018-01-19 15:22:10 -06:00
Thibaut Girka	1619efd735	Do not discard statuses obtained via websocket when API request finishes This backports `0b888acfd4`	2018-01-19 21:59:12 +01:00
ThibG	0b888acfd4	Do not throw away statuses obtained via websocket when API request finishes (#6302 )	2018-01-19 21:48:00 +01:00
Yamagishi Kazutoshi	238de58e65	Change belongs_to_required_by_default to true (#5888 )	2018-01-19 20:56:47 +01:00
ThibG	b1e03197fa	Process mentions and reblogs even from resolved threads (#6299 ) This may lead to out-of-order notifications, but this is better than not having notifications at all.	2018-01-19 19:11:35 +01:00
ThibG	a0de3222dd	Retry delivering toots over ActivityPub for about 2 days (#6298 ) Currently, Mastodon will retry delivering toots for a bit over 1 hour. This is a very short timespan when considering private and direct toots, which cannot be seen by the recipient at all after the delivery attempts have failed. Ideally, private and direct toots should have a different number of retries, but I do not know how to do that.	2018-01-19 15:49:48 +01:00
Eugen Rochko	540b3f37ae	Replace drawer elephant graphic with a vector image (#6286 ) * Replace drawer elephant graphic with a vector image * Replace wave graphic with SVG * Remove unused elephant graphic	2018-01-19 15:25:27 +01:00
Thibaut Girka	1287b2782b	Display a warning when composing unlisted toots with something looking like a hashtag This is a backport of `b6af88192f` to the glitch flavour.	2018-01-19 12:59:33 +01:00
David Yip	26ecee79bf	Merge pull request #332 from glitch-soc/merge-upstream Merge in home feed regeneration changes from upstream	2018-01-18 22:00:11 -06:00
Eugen Rochko	9b3b40df66	Fix regeneration marker not expiring (#6290 ) * Fix regeneration key not getting expired * Add rake task to remove old regeneration markers	2018-01-18 20:29:56 +01:00
Eugen Rochko	d799921c75	Replace tutorial modal with welcome e-mail (#6273 ) * Remove onboarding modal * Welcome e-mail * Send welcome e-mail after confirmation * Remove obsolete translations	2018-01-18 19:17:25 +01:00
David Yip	766d6aac44	Strip trailing whitespace on win95.scss	2018-01-18 10:54:50 -06:00
David Yip	d3f64812a6	Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update Conflicts: app/javascript/styles/win95.scss config/themes.yml	2018-01-18 10:54:12 -06:00
David Yip	3896cd5d79	Use absolute paths for new working/not-found SVGs This allows these component styles to be used in i.e. the win95 skin.	2018-01-18 10:25:54 -06:00
David Yip	bcd86404da	Port `7badad7797` to glitch frontend	2018-01-18 10:25:37 -06:00
David Yip	1964a0f941	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-18 09:17:58 -06:00
David Yip	e27eedbd08	Merge branch 'gs-master' into merge-upstream	2018-01-18 09:14:28 -06:00
David Yip	708ec07e27	Style fixes to make eslint happier, hopefully	2018-01-18 09:13:07 -06:00
Renato "Lond" Cerqueira	e56404be41	When must_be_following_dm is on, only notify if recipient dm'ed user (#6283 ) * When must_be_following_dm is on, only notify if recipient dm'ed user Currently, when must_be_following_dm is on, if a user sends a direct message replying to any status from the recipient, the recipient gets a notification. This should not be the case, as if the recipient posted something publicly this can be used to spam their notifications. * Refactor replied_to_status_is_direct_message? Following suggestion in PR	2018-01-18 16:12:10 +01:00
David Yip	201e82686f	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	2018-01-17 18:37:09 -06:00
Eugen Rochko	7badad7797	Fix home regeneration (#6251 ) * Fix regeneration marker not being removed after completion * Return HTTP 206 from /api/v1/timelines/home if regeneration in progress Prioritize RegenerationWorker by putting it into default queue * Display loading indicator and poll home timeline while it regenerates * Add graphic to regeneration message * Make "not found" indicator consistent with home regeneration	2018-01-17 23:56:03 +01:00
Renato "Lond" Cerqueira	59797ee233	Weblate translations (#6284 ) * Translated using Weblate (French) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Catalan) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 100.0% (529 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (529 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (527 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (528 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Slovak) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 37.2% (197 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Russian) Currently translated at 99.0% (526 of 531 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Catalan) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/ * Translated using Weblate (Catalan) Currently translated at 99.8% (530 of 531 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Japanese) Currently translated at 92.8% (52 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 75.8% (47 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ * Translated using Weblate (Polish) Currently translated at 77.4% (48 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Slovak) Currently translated at 38.3% (204 of 532 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ * Translated using Weblate (Catalan) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/ * Translated using Weblate (Polish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Translated using Weblate (Russian) Currently translated at 96.8% (525 of 542 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Japanese) Currently translated at 99.0% (537 of 542 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Polish) Currently translated at 99.8% (541 of 542 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Japanese) Currently translated at 99.0% (538 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Dutch) Currently translated at 97.4% (529 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations	2018-01-18 07:00:23 +09:00
Jenkins	aa2bf07281	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-17 16:17:10 +00:00
りんすき	fbe7756da6	implement web share target (#6278 ) * web share target * fix * fix	2018-01-17 17:08:10 +01:00
Yamagishi Kazutoshi	0a103c7749	Upgrade ESLint to version 4.x (#6276 )	2018-01-17 16:57:15 +01:00
SerCom_KC	fb16c37d2a	Update Simplified Chinese translations (#6280 ) * i18n: (zh-CN) Update translation for #6252 * e-mail -> email * i18n: (zh-CN) Update translations for #6256 * i18n: (zh-CN) Minor Improvements * i18n: (zh-CN) Update translations for #6263 * i18n: (zh-CN) Update translations for #6279	2018-01-17 16:47:25 +01:00
Eugen Rochko	6f244ba82c	Use better reblog icon and improve contrast in HTML e-mails (#6272 )	2018-01-17 14:12:59 +01:00
mayaeh	eed7484cd6	Change mailer image url (#6279 ) * Change image URL in mailer to full path * Add application_mailer.view_profile localization.	2018-01-17 12:41:24 +01:00
Eugen Rochko	02194838dd	HTML e-mails for NotificationMailer (#6263 ) * HTML e-mails for NotificationMailer (except digest) * Add HTML template for digest * Fix build	2018-01-16 20:20:15 +01:00
Yamagishi Kazutoshi	9a28052e92	Change image URL in mailer to full path (#6264 )	2018-01-16 06:26:46 +01:00
kibi!	60ff086960	Fixed improper mailer import	2018-01-15 21:23:26 -08:00
kibi!	cda845ae0e	Fix mailer to use webpack core	2018-01-15 21:17:03 -08:00
David Yip	89a9d629f7	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock	2018-01-15 22:17:48 -06:00
Eugen Rochko	5276c0a090	HTML e-mails for UserMailer (#6256 ) - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	2018-01-16 03:29:11 +01:00
Eugen Rochko	7861c5f108	Surround mid-text display names with bdi tags (#6257 ) * Fix #1095 - Surround mid-text display names with bdi tags * Update jest snapshot	2018-01-15 18:55:10 +01:00
Eugen Rochko	3987bd18a4	Fix #6128 - Display unfollow button even if account moved (#6258 )	2018-01-15 18:42:15 +01:00
Jenkins	0c7dc6c781	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-15 06:17:15 +00:00
puckipedia	74c1c9ec01	Allow attributedTo in a status to be an embedded object (#6238 )	2018-01-15 06:51:46 +01:00
Patrick Figel	537d2939b1	Suppress CSRF token warnings (#6240 ) CSRF token checking was enabled for API controllers in #6223, producing "Can't verify CSRF token authenticity" log spam. This disables logging of failed CSRF checks. This also changes the protection strategy for PushSubscriptionsController to use exceptions, making it consistent with other controllers that use sessions.	2018-01-15 06:51:23 +01:00
neetshin	2091ae92be	Make columns-area unscrollable when modal opened (#6241 ) * Add aria-autocomplete='list' in Textaria ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete * Make detect empty string brefore assign upload description * Change code elements in keyboard-shortcuts component to kbd * Add validation for onMuteNotifications * Make columns-area unscrollable when modal opend * Make columns-area unscrollable when modal opened	2018-01-15 06:51:00 +01:00
Eugen Rochko	ed867eca9d	Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252 )	2018-01-15 04:34:28 +01:00
Gô Shoemake	08e4c78e78	Fix column headers accessibility (#6199 ) * Fix accessibility of column headers As a screen reader user new to Mastodon, I encountered the following issues with the column headers as designed: * Jumping between them was difficult. FOr instance, passing my home timeline to reach notification settings was difficult to impossible, especially considering infinite scrolling. * There doesn't appear to be any means for triggering the control via the keyboard. the `titleClick` handler only responds to mouse clicks. * I didn't even realize there was a Settings toggle until I made this change. Thanks for using ARIA in your designs. It's a huge help. But adding a `button` role doesn't add keyboard handling and other button behavior. Also, because the role was on the heading container, it obscured the controls within the container itself. This fix resolve that. It also exposes the headings as headings rather than buttons, enabling skipping columns by using screen readers' heading navigation commands. Since I myself am blind, if this fix requires additional visual styling, I'd like help applying that so it can be merged. I'd consider it an essential accessibility fix for my and other blind users' existence on the platform. Thanks! * Styling fixes * Fixed overflow issue	2018-01-15 04:33:06 +01:00
kibi!	8ee6ed358f	Increase priority of favstar gold	2018-01-14 16:05:44 -08:00
kibi!	1ee0e91fb6	Fixes to notification styling	2018-01-14 15:48:54 -08:00
kibi!	b9f4896830	Fixes to drawer and CWs	2018-01-14 15:31:00 -08:00
beatrix	cd6674606f	Merge pull request #329 from KnzkDev/scss-refactor SCSS Refactor	2018-01-14 17:48:02 -05:00
beatrix	39f231f3da	Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend Add glitchy elephant friend	2018-01-14 17:40:27 -05:00
kibi!	0fb3bd09e9	Oops this should have been a part of last commit	2018-01-14 14:21:41 -08:00
kibi!	1fa03e026a	Fixes onboarding modal (#318 )	2018-01-14 14:13:24 -08:00
kibi!	a5931e1f48	Fixed autocollapse detection	2018-01-14 13:29:51 -08:00
David Yip	c2669f93d0	Fix eslint errors. #294 .	2018-01-14 05:56:43 -06:00
David Yip	756a9cd139	Run slightly less afoul of accessibility checks. #294 . This makes the clickable element an interactive element, but doesn't add alt text and makes it not-obvious that you can click the elefriend. On one hand, this goes against good practice; on the other hand, it's not supposed to be obvious that you can click the elefriend.	2018-01-14 05:07:08 -06:00
David Yip	e64cc311dd	Introduce a bit of luck into the elefriend selection. #294 .	2018-01-14 04:46:21 -06:00
David Yip	53cbc9933e	Add wave background; blend elefriend in a bit more. #294 .	2018-01-14 04:00:21 -06:00
David Yip	cd1377de7f	Bind click event to elefriend cycling. #294 .	2018-01-14 03:35:25 -06:00
David Yip	1dbb6b5e08	Set glitchy elephant friend variant in initial state. #294 . Also lay some groundwork needed to interactively change the glitchfriend. The codebase uses "elefriend" because it's shorter and didn't require me to realign the actions in actions/compose.js. Same idea, though.	2018-01-14 03:06:11 -06:00
David Yip	1e0b707018	Add the shrinking glitchy elefriend. #294 .	2018-01-13 21:27:39 -06:00
David Yip	835eec8a4c	Prototype out glitchy elephant friend. #294 . Glitched elephant friends kindly provided by @ncls7615.	2018-01-13 21:27:14 -06:00
ncls7615	f9b08e2142	Fix collapsed toot style	2018-01-14 11:13:55 +09:00
ncls7615	1ebe66b78c	Fix un-fullwidth media style	2018-01-14 11:07:32 +09:00
ncls7615	be2bac05aa	Fix media detailed style	2018-01-14 10:38:51 +09:00
ncls7615	b5476f6c75	Fix confirmation modal bug	2018-01-14 09:51:01 +09:00
ncls7615	bc0524834e	Fix letterbox bug	2018-01-14 09:25:35 +09:00
ncls7615	6ecf81cacf	Improve scss refactor 5	2018-01-14 09:17:38 +09:00
ncls7615	64425dbb77	Improve scss refactor 4	2018-01-14 09:12:10 +09:00
ncls7615	a16d885ac9	Improve scss refactor 3	2018-01-14 08:47:59 +09:00
ncls7615	5f35b39f6f	Improve scss refactor 2	2018-01-14 07:48:18 +09:00
ncls7615	bb2ca23839	Improve scss refactor 1	2018-01-14 07:18:50 +09:00
ncls7615	a9be680807	Fix padded-blocks error	2018-01-14 04:12:41 +09:00
ncls7615	6a73c8c8a2	Initial scss refactor	2018-01-14 03:41:20 +09:00
Gô Shoemake	3a0b47982d	load public.js on vanilla#admin	2018-01-12 18:52:53 -08:00
Gô Shoemake	9b9b7fa005	Load packs/public.js for glitch#admin	2018-01-12 18:51:52 -08:00
David Yip	0210e59759	Merge remote-tracking branch 'remotes/origin/fix-column-headers-accessibility'	2018-01-12 20:10:58 -06:00
Marcin Mikołajczak	ee7217bc94	i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-01-12 23:08:51 +01:00
ncls7615	cf5789146b	Fix dropdown text	2018-01-12 23:18:25 +09:00
Jenkins	9fa79bc317	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-12 02:17:15 +00:00
Jeong Arm	704053d221	Handle sessions that can't be translated (#6245 ) * Handle sessions that can't be translated This commit fixes #6165. * Fix typo	2018-01-12 02:44:28 +01:00
David Yip	395e64e858	Thank you, Officer Murphy	2018-01-10 12:10:43 -06:00
David Yip	514db316f7	The flavour parameter is unused, so omit it (#317 )	2018-01-10 12:09:42 -06:00
David Yip	6fcb870d96	Allow for user object to be empty. Fixes #317 . If a flavour has only one skin, the skin selector will be omitted. This omits the user[setting_skin] field, and because that's the only user[...] field on the page, the entire user object will not be present in the request handler's params object. This commit accounts for that scenario by avoiding params.require(:user) and instead picking out what we need from the params hash.	2018-01-10 12:09:42 -06:00
David Yip	095a00ef3d	Merge pull request #316 from glitch-soc/fix-async Fix glitch async chunks	2018-01-09 18:30:45 -06:00
kibigo!	35be02f21d	Renamed glitch async chunks	2018-01-09 16:26:14 -08:00
David Yip	622c8fdb75	Merge pull request #314 from chriswmartin/merge-vanilla-updates-2 Merge vanilla updates into glitch - round 2	2018-01-09 17:01:23 -06:00
David Yip	991371af5f	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: db/schema.rb	2018-01-09 14:16:45 -06:00
Eugen Rochko	35b84985a8	Skip ActivityPub Announces of non-public objects (#6230 ) * Skip ActivityPub Announces of non-public objects * Skip OStatus reblogs of non-public statuses	2018-01-09 19:35:10 +01:00
Eugen Rochko	d41f0b66cc	Fix #6204 : Use content warning for page title when present (#6231 )	2018-01-09 19:34:58 +01:00
cwm	aef4b1af66	Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223 )	2018-01-09 10:51:14 -06:00
cwm	f43c2f12f3	Fix overflowing audit logs (tootsuite pr #6184 )	2018-01-09 10:40:14 -06:00
cwm	9bdbe66316	Set background to the navigation of Getting Started column (tootsuite pr #6163 )	2018-01-09 10:37:27 -06:00
cwm	b535f24fe5	Use const instead of let for constant (tootsuite pr #6106 )	2018-01-09 10:35:36 -06:00

... 4 5 6 7 8 ...

4355 Commits