4732 commits

Author	SHA1	Message	Date
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
cwm	0d4dcb5fb2	change key to path in timeline settings containers	2018-01-09 09:58:40 -06:00
cwm	6d1c325167	Rename key to path in actions and reducers for settings (tootsuite pr #6105)	2018-01-09 09:48:14 -06:00
cwm	7f4374d97d	Fix newlines-to-spaces functionality (tootsuite pr #6158)	2018-01-09 08:52:14 -06:00
cwm	8a0e4bb9a4	Hide moved account's follow button in search result (tootsuite pr #5913)	2018-01-09 08:50:55 -06:00
cwm	5963630c63	Prevent duplicate load of favourites (tootsuite pr #5931)	2018-01-09 08:46:35 -06:00
Jenkins	e780d5951b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-09 12:17:16 +00:00
Renato "Lond" Cerqueira	9f04b0d4b1	Weblate translations (#6228) ... * Translated using Weblate (Catalan) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (523 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 100.0% (525 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Arabic) Currently translated at 80.3% (45 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 83.9% (47 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Persian) Currently translated at 87.6% (460 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Japanese) Currently translated at 100.0% (56 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% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 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% (56 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% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Catalan) Currently translated at 99.2% (521 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Portuguese) Currently translated at 47.2% (248 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 48.0% (252 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Persian) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Dutch) Currently translated at 100.0% (525 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Japanese) Currently translated at 99.0% (520 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Persian) Currently translated at 90.4% (475 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Polish) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Polish) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ * Translated using Weblate (Persian) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Polish) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Persian) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Portuguese) Currently translated at 48.3% (254 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Portuguese) Currently translated at 56.5% (297 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 59.4% (312 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Arabic) Currently translated at 91.0% (51 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Portuguese) Currently translated at 59.6% (313 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.6% (523 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Portuguese) Currently translated at 67.6% (355 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * 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 (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Arabic) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Galician) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Arabic) Currently translated at 51.1% (22 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Galician) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/ * Added translation using Weblate (Galician) * Added translation using Weblate (Galician) * Translated using Weblate (Galician) Currently translated at 50.0% (1 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/ * Added translation using Weblate (Galician) * Translated using Weblate (Galician) Currently translated at 24.0% (126 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Added translation using Weblate (Portuguese) * Translated using Weblate (Arabic) Currently translated at 55.2% (290 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Galician) Currently translated at 42.6% (224 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Portuguese) Currently translated at 80.9% (425 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Arabic) Currently translated at 62.7% (27 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Arabic) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/pt/ * Translated using Weblate (Portuguese) Currently translated at 81.3% (427 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Galician) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ * Translated using Weblate (Galician) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Portuguese) Currently translated at 93.7% (492 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 95.4% (501 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (525 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Galician) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (525 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Portuguese) Currently translated at 96.0% (504 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Arabic) Currently translated at 69.7% (30 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Portuguese) Currently translated at 97.9% (514 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (523 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations * Add back simple_forms removed by weblate Weblate for some reason removed this files, add back to their previous versions * Remove linebreak on doorkeeper.pt.yml PR review	2018-01-09 20:30:28 +09:00
David Yip	ce7f4aef16	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2018-01-08 23:20:39 -06:00
David Yip	ec0bdd6c1a	Merge pull request #312 from glitch-soc/tag-sensitive-imgs ... Show SENSITIVE tag on sensitive images (#267)	2018-01-08 23:19:14 -06:00
David Yip	df04da098a	Merge pull request #311 from glitch-soc/dont-show-solo-skins ... Don't show skins selector when there's only one (#256)	2018-01-08 23:18:30 -06:00
Jenkins	7c719c567c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-09 05:17:13 +00:00
kibigo!	60433d03f5	Add missing comma	2018-01-08 18:38:28 -08:00
kibigo!	5d2ef7a616	Show SENSITIVE tag on sensitive images (#267)	2018-01-08 18:25:29 -08:00
kibigo!	44792de49a	Don't show skins selector when there's only one (#256)	2018-01-08 16:45:32 -08:00
kibigo!	824a790e63	Threads now inherit privacy directly (#309)	2018-01-08 16:35:01 -08:00
puckipedia	628358aeea	Add the author of a status to cc if reblogged (#6226) ... This makes slightly more sense, and ensures that the author of a post is always referenced in the audience (which some servers might rely on). And the announce is POSTed to the author's inbox anyways.	2018-01-09 00:47:43 +01:00
Andrew	fe6663ef50	Minor style fixes	2018-01-08 11:49:08 -08:00
nightpool	c235711ffe	Refactor /api/web APIs to use the centralized axios instance (#6223) ... Also adds the ability to decouple the centralized axios logic from the state dispatcher	2018-01-08 20:01:33 +01:00
ncls7615	ef0b7d1e76	fix list editor scss	2018-01-09 02:50:24 +09:00
David Yip	65986b6f0b	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2018-01-08 09:48:42 -06:00
David Yip	2dc4fbbd1a	When pulling out max_toot_chars, handle nulls ... flavours/glitch/util/initial_state is used in places where we want to exhibit different behavior based on user preferences. This means that it's used in places where no preference is defined, i.e. on an unauthenticated access. All values exported from that module must therefore expect that case; previously, the max chars value didn't. Addresses #306.	2018-01-08 09:45:59 -06:00
Jenkins	f839ac694c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
Eugen Rochko	dbda87c31f	Revert #5772 (#6221)	2018-01-08 10:57:52 +01:00
Jenkins	722b3f567f	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 04:17:11 +00:00
Eugen Rochko	e4a241abef	Fix bad URL schemes being accepted (#6219) ... * Fix actors accepting invalid URI schemes or different host between URI and URL * Fix statuses accepting invalid URI scheme or different host to actor * Adjust tests to new requirements * Improve readability of mismatching_origin?/invalid_origin? methods	2018-01-08 05:00:23 +01:00
Eugen Rochko	93555182c3	Do not display elephant friend in single-column layout (#6222)	2018-01-08 03:50:53 +01:00
puckipedia	0eff42d688	Move Article from supported to converted types (#6218)	2018-01-08 00:21:14 +01:00
David Yip	f7c4d4464b	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2018-01-07 13:30:52 -06:00
David Yip	70c99a9f34	Use error pack when rendering error pages. Fixes #305.	2018-01-07 13:30:17 -06:00
Jenkins	c2e1bfd9ae	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-07 15:17:13 +00:00
Yamagishi Kazutoshi	1d92b90be9	Fix force_ssl conditional (#6201)	2018-01-07 15:19:23 +01:00
Yamagishi Kazutoshi	da809f9eec	Fix unintended cache (#6214)	2018-01-07 15:12:59 +01:00
SerCom_KC	c4d36d024c	Update Simplified Chinese translations (#6215) ... * i18n: (zh-CN) Add translations of #6125 * i18n: (zh-CN) Add translations of #6132 * i18n: (zh-CN) Add translations of #6099 * i18n: (zh-CN) Add translations of #6071 * i18n: (zh-CN) Improve translations	2018-01-07 17:32:50 +09:00
David Yip	5083311d64	Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master	2018-01-07 00:32:24 -06:00
Yamagishi Kazutoshi	2af307bce4	Fix unintended cache	2018-01-07 14:59:12 +09:00
Andrew	56312df73b	Z indexes and colors	2018-01-06 18:38:19 -08:00
Andrew	7a93acd803	To 2.1.2	2018-01-06 18:25:19 -08:00
Jenkins	bcbdd4f88d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-07 02:17:10 +00:00
Jeong Arm	9e97fbf0af	Translate Korean (#6212)	2018-01-07 11:13:42 +09:00
kibigo!	b5874c1428	Fixes to search dropdown	2018-01-06 15:34:01 -08:00
beatrix	61ef8d643e	fix typo in vanilla names.yml	2018-01-06 16:49:53 -05:00
Ondřej Hruška	9f29fd31ba	fixed ctrl enter	2018-01-06 19:58:04 +01:00
Ondřej Hruška	53caab0c0b	Fix the always-threaded bug	2018-01-06 19:55:53 +01:00
ncls7615	f5a4201ad8	Update ja.js	2018-01-07 01:51:49 +09:00
beatrix	a251c42192	Merge pull request #296 from glitch-soc/thread-mode ... Threaded mode~	2018-01-06 11:28:36 -05:00
beatrix	2ec9a75a1d	Merge pull request #302 from KnzkDev/fix/search-popout ... Fix search popout	2018-01-06 11:25:59 -05:00
beatrix	fa92e88fb2	appease eslint	2018-01-06 10:30:49 -05:00
ncls7615	da98c33161	Fix search popout	2018-01-06 21:50:11 +09:00
David Yip	2eed4ace11	Read max_toot_chars from root object. Fixes #297. ... max_toot_chars is present in the root of the initial state object. (Previously, we were trying to read it from the meta child object.)	2018-01-06 03:01:11 -06:00
kibigo!	c71d848855	my global .gitignore excluded this file ;_;	2018-01-05 21:40:02 -08:00
kibigo!	e4bc013d6f	Threaded mode~	2018-01-05 21:16:43 -08:00
kibigo!	6932b464e6	Fixed improper dropdown func binding for #293 + toot button spacing	2018-01-05 21:02:53 -08:00
kibigo!	ad10a80a99	Styling and autosuggest fixes for #293	2018-01-05 20:43:16 -08:00
kibigo!	8bf9d9362a	Fixes composer mounting issue with #293	2018-01-05 18:30:06 -08:00
Andrew	077f2e600c	Win95 to 2.1	2018-01-05 16:22:58 -08:00
Andrew	39c0b6ceb3	Updates and fixes to win95 theme	2018-01-05 16:22:58 -08:00
Andrew	ed574fbc09	Theme: Windows 95	2018-01-05 16:22:58 -08:00
David Yip	03aeab857f	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2018-01-05 17:31:56 -06:00
beatrix	f441770e50	Merge pull request #290 from chriswmartin/web-push-updates ... Web push updates	2018-01-05 18:29:57 -05:00
beatrix	b4e667f86b	Merge pull request #295 from chriswmartin/getting-started-key-fix ... unique ColumnLink keys in getting_started	2018-01-05 18:29:40 -05:00
beatrix	faf20eeaa4	Merge pull request #293 from glitch-soc/compose-refactor ... Compose refactor	2018-01-05 18:29:08 -05:00
Jenkins	f6adb409fd	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-05 22:17:12 +00:00
ThibG	10f6793fd0	Fix PuSH workers (#6200)	2018-01-05 23:04:35 +01:00
ThibG	a594139115	When fetching an ActivityPub-enabled status, do not re-request it as text/html (#6196)	2018-01-05 22:42:50 +01:00
TheKinrar	95bd85d9e8	Represent numbers by strings in instance activity API (#6198) ... Fixes #6197.	2018-01-05 22:38:33 +01:00
kibigo!	ac686d5a5d	Fixed overflow issue	2018-01-05 13:34:21 -08:00
kibigo!	ec620ae486	Styling fixes	2018-01-05 12:41:15 -08:00
beatrix	f41b33eb01	Merge pull request #243 from m4sk1n/glitch-pl ... i18n: 🇵🇱	2018-01-05 12:36:53 -05:00
cwm	9fc08e4861	add key to lists div	2018-01-05 09:00:48 -06:00
cwm	6236577734	change how list ColumnLink keys are determined	2018-01-05 08:12:34 -06:00
Quenty31	06636c6eca	l10n Occitan language: mailer update (#6193) ... * Create email_changed.oc.html.erb * Create email_changed.oc.text.erb * Update email_changed.oc.html.erb * Update email_changed.oc.html.erb * Create reconfirmation_instructions.oc.html.erb * Create reconfirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.html.erb * Update reconfirmation_instructions.oc.text.erb * Update reconfirmation_instructions.oc.html.erb	2018-01-05 18:59:43 +09:00
kibigo!	d7ce339c2e	WIP <Compose> Refactor; Fin~	2018-01-04 21:17:30 -08:00
Yamagishi Kazutoshi	9a61b0ef22	Fix RFC 5646 Regular Expression (#6190)	2018-01-05 04:43:50 +01:00
kibigo!	42f50049ff	WIP <Compose> Refactor; 1000 tiny edits	2018-01-04 18:33:13 -08:00
kibigo!	b4a3792201	WIP <Compose> Refactor; <ActionsModal>; dropdowns	2018-01-04 18:31:00 -08:00
kibigo!	083170bec7	WIP <Compose> Refactor; SCSS ed.	2018-01-04 18:23:46 -08:00
kibigo!	8713659dff	WIP <Compose> Refactor; <OnboardingModal> ed.	2018-01-04 18:21:59 -08:00
kibigo!	3c29f57404	WIP <Compose> Refactor; <Drawer> ed.	2018-01-04 18:21:59 -08:00
kibigo!	924ffe81d4	WIPgit status <Compose> Refactor; <Composer> ed.	2018-01-04 18:21:59 -08:00
Jenkins	c69a23ae46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-04 23:17:11 +00:00
Branko Kokanovic	d872902997	Small translation fixes for Serbian (and sr@Latn too) (#6188)	2018-01-05 00:16:06 +01:00
Patrick Figel	5ec25ff3e1	Fix email confirmation link not updating email (#6187) ... A change introduced in #6125 prevents `Devise::Models::Confirmable#confirm` from being called for existing users, which in turn leads to `email` not being set to `unconfirmed_email`, breaking email updates. This also adds a test that would've caught this issue.	2018-01-05 00:15:35 +01:00
Lynx Kotoura	49e296e1b0	Fix overflowing audit logs (#6184)	2018-01-04 19:38:46 +01:00
Nolan Darilek	3b016342c6	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!	2018-01-04 10:25:26 -06:00
Yamagishi Kazutoshi	3c18964256	Fallback default thumbnail in instance status API (#6177)	2018-01-04 15:36:55 +01:00
Marcin Mikołajczak	0f69a90588	i18n: Update Polish translation ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-01-04 14:42:58 +01:00
Eugen Rochko	02ba03d6db	Send one Delete of Actor in ActivityPub when account is suspended (#6172)	2018-01-04 14:40:49 +01:00
ThibG	3bee0996c5	Make sure private toots remain private and do not end up in HTTP caches (#6175)	2018-01-04 14:39:38 +01:00
muan	89daeb43a8	Improve Traditional Chinese translation (#6166) ... * Improve Traditional Chinese translations * Sort alphabetically	2018-01-04 05:00:50 +01:00
Eugen Rochko	7d4f4f9aab	Fix FetchAtomService not finding alternatives if there's a Link header (#6170) ... without them, such as is the case with GNU social Fixes the ability to find GNU social accounts via URL in search and when using remote follow function	2018-01-04 04:56:04 +01:00
Akihiko Odaki	256c2b1de0	Rearrange items in Getting Started navigation (#6126) ... Though the subsections are representing features such as navigation and settings, they are categorized by the ways how they are implemented (internal navigation or external links.) They are irrelevant and some arrangements were confusing because of that. (It is nonsense that instance information is in settings subsection, for example.) This fixes the issue by rearranging.	2018-01-04 10:56:54 +09:00
Eugen Rochko	02e3e1ec09	Fix nil error in log_target_from_history helper (#6173)	2018-01-04 10:56:23 +09:00
Eugen Rochko	c10f4bdb03	Cache JSON of immutable ActivityPub representations (#6171)	2018-01-04 01:21:38 +01:00
Jenkins	fc884d015a	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-03 20:17:13 +00:00
Quenty31	d907d4352e	l10n OC language (#6169) ... * new strings: hashtag+unlisted, mute, block * Add confirmation step for email changes * Add more instance stats APIs	2018-01-03 21:05:54 +01:00
ThibG	a8b51124ba	Don't normalize URLs in toots (#6134) ... * Don't normalize URLs in toots URL normalization is ill-defined and may cause certain links to break. * Change specs since we are not normalizing user-provided URLs	2018-01-03 20:51:33 +01:00
Akihiko Odaki	161c72d66d	Allow to dereference Follow object for ActivityPub (#5772) ... * Allow to dereference Follow object for ActivityPub * Accept IRI as object representation for Accept activity	2018-01-03 18:08:57 +01:00
Marcin Mikołajczak	53d99ebf4f	i18n: Update Polish translation (#6168) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-01-03 22:45:24 +09:00
Yamagishi Kazutoshi	1001922156	Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167) ... * yarn manage:translations * Add Japanese translation for #5997 * Add Japanese translation for #6003 * Add Japanese translation for #6004 * Add Japanese translation for #6071 * Add Japanese translation for #6099 * Add Japanese translation for #6125 * Add Japanese translation for #6132	2018-01-03 21:00:39 +09:00
Jenkins	933840bebf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-03 04:17:11 +00:00
ThibG	99f962ba73	Allow HTTP caching of json view of public statuses (#6115) ... * Allow HTTP caching of json view of public statuses HTML views are not cached as they can contain private statuses as well * Disable session cookies for ActivityPub json rendering of public toots	2018-01-03 04:57:57 +01:00
Akihiko Odaki	2471796d75	Set background to the navigation of Getting Started column (#6163) ... The background of the navigation matters because its scrollbar is transparent.	2018-01-03 04:39:14 +01:00
puckipedia	545095b3ce	[!] Sanitize incoming classlist properly (#6162) ... * Sanitize classlist properly * Actually properly sanitize every class after the first * Improve Formatter spec to check for multiple classes and non-space whitespace	2018-01-03 03:54:08 +01:00
Eugen Rochko	d319b3dbe4	Update moved-to property when it's removed too (#6160) ... * Fix #6140 - Update moved-to property when it's removed too * Remove trailing whitespace	2018-01-03 00:38:20 +01:00
Eugen Rochko	d60fd87e01	Don't leave behind husk of remotely-deleted profile (#6159) ... There's no reason for an Account record to persist after Delete->Actor is received. SuspendAccountService is necessary to make sure deleted toots get sent over streaming API properly and home feeds get cleaned up. By removing Account record, we can ensure that if in the future the account is restored remotely (or username reused), it can start with a clean slate.	2018-01-03 00:38:02 +01:00
Noiob	94230fe565	Fix newlines-to-spaces functionality (#6158) ... yay for regexes, amirite	2018-01-02 19:35:24 +01:00
Patrick Figel	04ecf44c2f	Add confirmation step for email changes (#6071) ... * Add confirmation step for email changes This adds a confirmation step for email changes of existing users. Like the initial account confirmation, a confirmation link is sent to the new address. Additionally, a notification is sent to the existing address when the change is initiated. This message includes instruction to reset the password immediately or to contact the instance admin if the change was not initiated by the account owner. Fixes #3871 * Add review fixes	2018-01-02 16:55:00 +01:00
ThibG	b6af88192f	Display a warning when composing unlisted toots with something looking like a hashtag (#6132)	2018-01-02 14:24:52 +01:00
Eugen Rochko	1419f656e2	Fix stats expiring too quickly because of variable mistake (#6155)	2018-01-02 14:02:53 +01:00
Akihiko Odaki	3ba7cde38d	Rename key to path in actions and reducers for settings (#6105)	2018-01-02 13:50:54 +01:00
Otakan	ce854ed506	delete X-UA-Compatible (#6068) ... * delete X-UA-Compatible * undo * restore	2018-01-02 13:38:12 +01:00
Branko Kokanovic	21b9da6418	Adding Serbian latin translations (#6146) ... Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.	2018-01-02 20:39:12 +09:00
David Yip	fa768abf5c	More ../ -> ~.	2018-01-02 00:26:44 -06:00
David Yip	54148b9a4a	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	2018-01-02 00:11:41 -06:00
Akihiko Odaki	764f876953	Use const instead of let for constant (#6106)	2018-01-02 13:28:49 +09:00
Akihiko Odaki	2c1ed5f872	Show mastodon on modal (#6129)	2018-01-02 05:07:56 +01:00
cwm	72b99f6ee4	bug fix (tootsuite pr #6120)	2017-12-31 08:26:50 -06:00
Jenkins	fa9b7ece2e	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-31 09:17:15 +00:00
Branko Kokanovic	7d376e41be	Adding Serbian translation (#6133) ... * Adding Serbian translation * i18n-tasks normalize	2017-12-31 17:28:20 +09:00
David Yip	d817c0a958	Merge pull request #291 from glitch-soc/merge-upstream ... Merge with upstream @ f4b80e6511	2017-12-30 18:24:38 -06:00
David Yip	4cca1d1e7e	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/controllers/auth/confirmations_controller.rb	2017-12-30 17:20:07 -06:00
David Yip	e4944d065b	Switch to tootsuite's elephant friend for the drawer ... This version has a transparent background, which works better with the wave.	2017-12-30 17:17:37 -06:00
David Yip	513d982f29	Use ~ notation in components for image references ... This uses (more or less) absolute references to external assets, which allows imported stylesheets (like components.scss) to work from other locations that may not have the expected path structure (e.g. the win95 theme).	2017-12-30 17:15:20 -06:00
cwm	4ce44ba470	remove unused 'saveSettings' from column_settings_container	2017-12-30 16:42:26 -06:00
cwm	0dce26b82b	web push updates (tootsuite PRs #5879, #5941, #6047)	2017-12-30 11:45:01 -06:00
Jeong Arm	f4b80e6511	Translate Korean (#6131) ... Relates to #6125, #6099	2017-12-30 02:44:19 +01:00
beatrix	a56c4742d3	keep the same filters and page when doing custom emojo stuff (fixes #6112) (#6114)	2017-12-30 02:43:43 +01:00
Eugen Rochko	38fc1b498d	Add more instance stats APIs (#6125) ... * Add GET /api/v1/instance/peers API to reveal known domains * Add GET /api/v1/instance/activity API * Make new APIs disableable, exclude private statuses from activity stats * Fix code style issue * Fix week timestamps	2017-12-29 19:52:04 +01:00
MitarashiDango	511c6f9625	bug fix (WebPush does not work) (#6120)	2017-12-28 16:20:34 +01:00
cwm	832a93e67c	Fix GIF avatars not autoplaying (fixes #287, tootsuite pr #6000)	2017-12-28 08:30:51 -06:00
ThibG	868568d1c1	Make host_meta/webfinger replies cacheable (fixes #6100) (#6101) ... * Make host_meta/webfinger replies cacheable (fixes #6100) Drop common code for handling users and sessions as webfinger queries are very basic, public APIs. Also explicitly mark results as cacheable with “expires_in”. * Add “Vary: Accept” header for caching since content-negociation is used	2017-12-27 18:21:12 +01:00
David Yip	7174d1c955	Merge remote-tracking branch 'origin/master' into merge-upstream ... Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss	2017-12-26 22:24:19 -06:00
Akihiko Odaki	65f30f65a2	Move the mastodon on Getting Started column to drawer column (#6109) ... Getting Started column obtained many links, and it became much taller. Because of its height, Getting Started column required long scrolling on devices with small screen, such as 4 inch phones and 10 inch laptops. This change moves the mastodon which took large space on the column to drawer column. The drawer column has only the compose form and has more space.	2017-12-27 03:31:30 +01:00
Akihiko Odaki	e0ef7f9d79	Fix XML oEmbed support discovery (#6104)	2017-12-27 03:29:49 +01:00
beatrix	7347bc7334	Merge pull request #286 from chriswmartin/merge-vanilla-updates-into-glitch ... Merge various small vanilla updates into glitch	2017-12-26 17:03:29 -05:00
cwm	20ad071931	Set direction style to reply indicator (tootsuite pr #6006)	2017-12-26 14:20:41 -06:00
cwm	14243bf80a	Reduce motion for boost animation (tootsuite pr #5871)	2017-12-26 14:04:52 -06:00
cwm	337c2e77ee	Fix layout for RTL (tootsuite pr #6014, #6018)	2017-12-26 13:49:53 -06:00
cwm	46565ed746	Fix focused background color of favourited direct toot (tootsuite pr #6021)	2017-12-26 13:30:23 -06:00
cwm	815524412b	Move dropdown transform origin (tootsuite pr #6091)	2017-12-26 13:28:19 -06:00
cwm	083571915f	onMuteNotifications validation (tootsuite pr #6092)	2017-12-26 13:25:43 -06:00
cwm	2bbd22e91c	Rename settingKey to settingPath (tootsuite pr #6046 & #6098)	2017-12-26 13:21:20 -06:00
cwm	cc6a2ffd0a	use 'flavours/glitch/' prefix in new imports	2017-12-26 10:41:44 -06:00
cwm	22818d2a16	Add mute, block, conversation mute actions to detailed status dropdown menu	2017-12-26 10:13:38 -06:00
Jenkins	bed13f22e2	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-25 20:17:10 +00:00
Chris	1e5d1fa5c8	Add mute, block, conversation mute actions to detailed status dropdown menu (#6099) ... * removed references to hideOnMobile in column_link and getting_started * add mute, block, conversationMute actions to detailed status dropdown (fixes #1226) * remove unused withDismiss in detailed status	2017-12-25 20:56:05 +01:00
MitarashiDango	a3b369337f	Additional prop name change. (#6098)	2017-12-26 00:14:06 +09:00
Jenkins	f77c47d01b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-24 15:17:12 +00:00
Neetshin	7e6214b869	Add validation for onMuteNotifications (#6092) ... * 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	2017-12-24 17:18:45 +09:00
Nolan Lawson	a8eb0bf44f	Reduce motion for boost animation (#5871) ... * Reduce motion for boost animation Fixes #5833 * Fix ternary expression	2017-12-24 04:48:31 +01:00
Akihiko Odaki	35fdf561be	Refactor web_push_subscription (#6047) ... * Remove onSave method in mapped properties for column_settings * Make web_push_subscription.register an action	2017-12-24 04:47:35 +01:00
Chris	081956742c	removed references to hideOnMobile in column_link and getting_started (#6082) ... * removed references to hideOnMobile in column_link and getting_started * move keyboard shortcuts back below blocked users	2017-12-24 04:47:02 +01:00
cpsdqs	8528fd89d2	Move dropdown transform origin to top edge (#6091)	2017-12-24 00:53:03 +01:00
Jenkins	6d00ca1c71	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-22 04:17:14 +00:00
ncls7615	fb57ec41df	Update and add some translate	2017-12-22 12:22:41 +09:00
ncls7615	4694dcfe16	Add more en and ja	2017-12-22 12:11:28 +09:00
ncls7615	02db8aa3a0	Add en and ja	2017-12-22 12:01:38 +09:00
ThibG	cea98e0c12	Reduce the number of synchronous resolves when posting toots (#6075)	2017-12-22 02:15:08 +01:00
ThibG	6eb60260b1	Display deleted users' role as “Suspended” (#6080) ... Deleted users are technically suspended, but the code displaying their status in the admin interface was broken and displayed a javascript object holding translations of the possible user roles instead.	2017-12-22 02:14:17 +01:00
beatrix	60d415bc5e	Merge pull request #266 from chriswmartin/getting-started-improvements ... Getting started column improvements	2017-12-21 18:47:07 -05:00
ncls7615	191b625a27	Fix account header avatar	2017-12-22 07:12:49 +09:00
David Yip	7bb99ca3cf	Add data-status-by back to DetailedStatus component. Fixes #273.	2017-12-21 13:22:33 -06:00
cwm	d736739e8f	<kbd> instead of <code> in KeyboardShortcuts component (tootsuite pr #6049)	2017-12-21 13:04:40 -06:00
beatrix	bc0152974f	Merge pull request #276 from glitch-soc/245-click-avatar-to-open-profile-in-new-tab ... Wrap <Avatar> in account header in a link to that account's page (fixes #245)	2017-12-21 08:30:22 -05:00
David Yip	dbd5f8b9a5	Wrap <Avatar> in account header in a link to that account's page. Fixes #245.	2017-12-21 05:25:16 -06:00
cwm	9042f9a813	add keyboard shortcuts to getting started (fixes #275)	2017-12-20 09:50:29 -06:00
David Yip	bf1eb0912c	Set packs on 2FA-related pages. Fixes #271. ... Specifically, this commit: - changes S::TFA::{Confirmations,RecoveryCodes}Controller to derive from S::BaseController, because this gives us the necessary actions and packs - prepends set_pack to Auth::SessionsController's action chain so that it takes effect in time for render :two_factor	2017-12-20 03:15:54 -06:00
Jenkins	6f11aa8383	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-20 08:17:15 +00:00
Akihiko Odaki	81d29e4126	Rename settingKey in setting_toggle to settingPath (#6046)	2017-12-20 16:19:59 +09:00
Neetshin	c11a52d888	Replace <code> to <kbd> in KeyboardShortcuts component (#6049) ... * 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	2017-12-20 11:46:25 +09:00
Jeong Arm	e52293482e	Update Korean translation (#6050) ... * Update Korean translation * Translate Korean for javascript * Add missing translations on simple_form	2017-12-20 11:45:50 +09:00
ncls7615	d3b2677775	Add en and ja	2017-12-19 20:16:48 +09:00
cwm	14aae9c05c	missed a semicolon	2017-12-17 22:21:15 -06:00
cwm	be50e45a74	use makeMapStateToProps	2017-12-17 22:00:25 -06:00
cwm	e4ebbf4f07	use list-ul icon in list header and web/lists	2017-12-17 21:25:18 -06:00
Jenkins	e7fa7fce25	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-17 03:17:14 +00:00
Peter	f38e6a14f2	Add Slovak translation (#6052) ... * Add Slovak translation * Slovak translation: i18n-normalize	2017-12-17 11:26:42 +09:00
beatrix	e202efdf8a	Merge pull request #253 from glitch-soc/prevent-local-only-federation ... prevent federation of local-only statuses	2017-12-16 09:26:48 -05:00
ncls7615	9e8fa3caee	fix admin/action_logs page	2017-12-16 20:27:26 +09:00
kibigo!	e677dda07c	Fixes #244 to make search results scrollable	2017-12-15 12:49:23 -08:00
David Yip	82b2e224a2	Merge branch 'gs-master' into prevent-local-only-federation ... Conflicts: db/schema.rb	2017-12-15 12:20:56 -06:00
NCLS	e9a5bde9a0	Update ja.js	2017-12-15 19:43:10 +09:00
NCLS	61ed5b972c	Update ja.js	2017-12-15 19:38:13 +09:00
Jenkins	37254c4f5d	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-15 01:17:12 +00:00
Eugen Rochko	3d3b403359	Do not hide statuses from silenced accounts from other silenced accounts (#6030)	2017-12-15 01:54:05 +01:00
Naoki Kosaka	25b0d7538e	Fix oEmbed image_modal src. (#6027)	2017-12-14 23:31:14 +01:00
Eugen Rochko	a3b2ea599d	Fix #6022 - Prevent nested migrated accounts, or migrations to self (#6026)	2017-12-14 21:35:30 +01:00
SerCom_KC	573414f728	Improve Chinese (Simplified) Translations (#6024) ... * i18n: (zh-CN) Change `工作人员` (staff) to `管理人员` Suggested by @Gargron at https://github.com/tootsuite/mastodon/pull/6005#discussion_r156678109 * i18n: (zh-CN) Change `协管` to `监察员` * i18n: (zh-CN) Fix all "Are you" questions * i18n: (zh-CN) Various improvements * i18n: (zh-CN) Final clean-up * i18n: (zh-CN) Change translation for 500 * i18n: (zh-CN) Remove spaces between time distances * i18n: (zh-CN) Improve translations	2017-12-14 19:33:29 +01:00
Jeroen	aa273a2718	Last minute Dutch string updates (#6025) ... * Last minute Dutch strinfupdate * Last minute Dutch strings update * Fixing Weblate output errors * Fixing Weblate output errors * Fixing more Weblate rubish Weblate is also changing some " to ' - I think that is not a problem * Fixing more weblate stuff * Fixing * Update nl.yml	2017-12-14 18:45:32 +01:00
David Yip	e35a350119	Examples for Status#set_locality and .as_tag_timeline. ... This commit also: - exposes the local-only emoji so that it can be used in examples - allows local_only to be set explicitly, i.e. for timeline filtering specs	2017-12-14 02:27:42 -06:00
Jenkins	e5a9831a56	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-13 23:17:15 +00:00
Lynx Kotoura	0d3ffa691e	Fix focused background color of notifications of direct toots (#6021)	2017-12-14 07:36:29 +09:00
Lynx Kotoura	5ad45552b3	Fix overflowing emojis on some devices (#6016) ... * Fix overflowing emojis on some devices * Quit visible and add padding	2017-12-13 22:58:31 +01:00
Olivier Humbert	dc313f27bb	1 fix + 1 translation (#6019)	2017-12-13 22:58:20 +01:00
Jenkins	10f800ab46	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-13 20:17:13 +00:00
Eugen Rochko	3487460f00	Fix regression from #6014 (#6018)	2017-12-13 20:33:04 +01:00
Jenkins	82236a3703	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-13 18:17:16 +00:00
Quenty31	72314d26ae	l10n OC and FR updates (#6017) ... * Adjust empty list timeline message (#5997) * Adjust empty list timeline message (#5997) * Add filters to admin UI for custom emojis (#6003) + #6004 * Update fr.yml	2017-12-14 03:17:04 +09:00
Eugen Rochko	cc75d47926	Fix layout for RTL (#6014)	2017-12-13 18:28:13 +01:00
Lynx Kotoura	8bf4cc72b6	Excahnge the order of spoiler-input and unlocked warning (#6015) ... * Excahnge the order of spoiler-input and unlocked warning * Fix trailing whitespace	2017-12-13 18:01:56 +01:00
Lynx Kotoura	0aeec0390b	Redesign tootbox (#5919) ... * Redesign tootbox * Move counter into compose-form__buttons-wrapper Change font and remove shadow Refactor sass codes of compose-form	2017-12-13 17:37:23 +01:00
Eugen Rochko	fef6625496	Weblate translations (#6011) ... * Translated using Weblate (Dutch) Currently translated at 100.0% (522 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (French) Currently translated at 99.8% (521 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Catalan) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 99.4% (519 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Japanese) Currently translated at 99.4% (519 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Japanese) Currently translated at 99.6% (520 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Arabic) Currently translated at 40.0% (209 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Polish) Currently translated at 99.8% (521 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Added translation using Weblate (Galician) * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.0% (517 of 522 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% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * 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/ * Added translation using Weblate (Galician) * 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 (Galician) Currently translated at 22.6% (17 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Portuguese) Currently translated at 66.0% (37 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Japanese) Currently translated at 99.6% (520 of 522 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (520 of 522 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% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 48.8% (21 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/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 (Portuguese) Currently translated at 73.2% (41 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% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/ * i18n-tasks normalize && yarn manage:translations * Restore wrongfully deleted files	2017-12-13 16:37:15 +01:00
SerCom_KC	775c3056b6	Update Chinese (Simplified) translations (#6005) ... * i18n: (zh-CN) Remove spaces in time distances * i18n: (zh-CN) Update translations for #5997 * i18n: (zh-CN) Add translation for #6004 also change translation of `staff` from `管理员` to `工作人员` * i18n: (zh-CN) Add translations for #6003 * i18n: (zh-CN) Normalization	2017-12-13 15:52:40 +01:00
Eugen Rochko	ad75ec8b5b	Add filters to admin UI for custom emojis (#6003)	2017-12-13 13:28:31 +01:00
Yamagishi Kazutoshi	07b4427865	Set direction style to reply indicator (#6006)	2017-12-13 12:17:37 +01:00
Eugen Rochko	a8deb6648b	Fix redundant HTTP request in FetchLinkCardService (#6002)	2017-12-13 12:15:28 +01:00
Eugen Rochko	20a6584d2d	Clean up admin UI for accounts (#6004) ... * Add staff filter to admin UI for accounts, remove obsolete columns * Only display OStatus section in admin UI for accounts when OStatus data	2017-12-13 12:15:10 +01:00
Eugen Rochko	155e211dd0	Fix GIF avatars not autoplaying when GIF autoplay is enabled (#6000)	2017-12-13 12:14:03 +01:00
cwm	17e53b931c	code style fixes	2017-12-12 23:07:12 -06:00
cwm	9719983f2d	move list items into an array, don't unnecessarily concat misc nav item	2017-12-12 22:50:20 -06:00
Eugen Rochko	5706fe18c2	Fix #5952 - NameError (regression from #5762) (#5999) ... * Fix #5952 - NameError (regression from #5762) * Fix	2017-12-13 04:12:38 +01:00
Eugen Rochko	71965cbef2	Adjust empty list timeline message (#5997)	2017-12-13 02:40:32 +01:00
Eugen Rochko	0128b86d30	Use streaming API for standalone timelines on /about and /tag pages (#5998)	2017-12-13 02:12:41 +01:00
Neetshin	0c8b1eb577	Make detect empty string before assign image description (#5994) ... * 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	2017-12-12 19:57:22 +01:00
Akihiko Odaki	f9f6918148	Store preview image for embedded photo in preview cards (#5986) ... The preview image would be useful to embed in timeline.	2017-12-12 15:54:38 +01:00
cwm	b6ded7119e	travis fixes	2017-12-12 08:50:31 -06:00
Renato "Lond" Cerqueira	19257d91bf	Return false if object does not respond to url (#5988) ... Avoid error when the service returns a mostly valid oembed, but has no url in it, causing a MethodError: undefined method `url' for #<OEmbed::Response::Photo:0x000056505def9620>	2017-12-12 15:12:09 +01:00
Renato "Lond" Cerqueira	fe180f18ff	Change conditional to avoid nil into string error in sidekiq (#5987) ... * Change conditional to avoid nil into string error in sidekiq When obtaining information about users with mastodon in a different subdomain, sidekiq was giving out a 'no implicit conversion of nil into String' * Use presence instead of blank? with ternary. Following suggestion on PR	2017-12-12 15:11:13 +01:00
beatrix	504c3d650f	Merge pull request #264 from KnzkDev/add-ja ... i18n: Add ja translate	2017-12-12 08:49:19 -05:00
David Yip	a057ed5cfe	Merge remote-tracking branch 'tootsuite/master' into merge-upstream	2017-12-12 02:54:13 -06:00
cwm	9b7208f4b4	readded connect for onboarding modal	2017-12-12 00:17:07 -06:00
cwm	b358483ef2	remove unneeded imports from getting_started_misc	2017-12-12 00:09:18 -06:00
cwm	37ced4c903	add components to getting started column	2017-12-12 00:01:17 -06:00
ncls7615	b93ad3d0e8	add ja	2017-12-12 13:13:54 +09:00
Akihiko Odaki	14c4a33cd9	Change account_id non-nullable in lists (#5979)	2017-12-12 04:11:17 +01:00
Eugen Rochko	30d2ea03b0	Improve public status page title (#5985)	2017-12-12 03:56:30 +01:00
Eugen Rochko	1356ed72cd	Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)	2017-12-12 03:55:39 +01:00
Eugen Rochko	481fac7c84	Exclude moved accounts from search results (#5984)	2017-12-12 02:14:33 +01:00
cwm	0a52e37648	change pack to 'auth'	2017-12-11 18:14:41 -06:00
cwm	44992df257	load pack	2017-12-11 17:54:40 -06:00
Erin	2efffe77dc	reblog_service.rb: Status#local_only -> local_only?	2017-12-11 17:39:11 -06:00
Erin	c5a4eda694	move outbox filtering to Status#permitted_for (as per @ekiru)	2017-12-11 15:28:04 -06:00
Erin	3ec47e732b	post_status_service: stylistic change (local_only -> local_only?)	2017-12-11 15:27:31 -06:00
beatrix	771b950feb	Merge pull request #254 from glitch-soc/new-theme-ux ... New flavour/skin UX	2017-12-11 09:36:14 -05:00
Eugen Rochko	feed07227b	Apply a 25x rate limit by IP even to authenticated requests (#5948)	2017-12-11 15:32:29 +01:00
beatrix	0cd5f2a61f	Merge pull request #255 from KnzkDev/remove-picture ... Remove getting-started picture	2017-12-11 09:08:13 -05:00
David Yip	204688e803	Add missing set_pack def/filter in OAuth::AuthorizedApplicationsController.	2017-12-11 00:17:30 -06:00
ncls7615	9d5ecdbf41	remove picture	2017-12-11 13:52:17 +09:00
kibigo!	ed7231947c	Added styling	2017-12-10 20:32:28 -08:00
kibigo!	bdca1614d5	Screenshot support for themes	2017-12-10 20:32:28 -08:00
kibigo!	dabf66e676	Moved flavour UI into own prefs tab	2017-12-10 20:32:27 -08:00
beatrix	08b0861b96	Merge pull request #250 from chriswmartin/fav-confirm-modal ... add favourite confirmation modal	2017-12-10 23:10:19 -05:00
Erin	288f1293ef	set local_only in a before_create callback instead of status service	2017-12-10 21:39:27 -06:00
Erin	0c46058a43	remove vestigial Status#local_only? definition	2017-12-10 21:25:36 -06:00
Erin	c1410af368	post_status_service.rb: save the status after setting local_only	2017-12-10 20:35:57 -06:00
Erin	24f36ca912	Status#not_local_only scope should match nils too	2017-12-10 20:35:42 -06:00
Erin	f080a9fac7	filter local-only toots from AP outboxes	2017-12-10 19:07:43 -06:00
ncls7615	d420e2f047	add comma	2017-12-11 09:50:52 +09:00
ncls7615	279231c5dd	" => '	2017-12-11 09:46:17 +09:00
ncls7615	a98b0a47ef	Merge branch 'master' of https://github.com/glitch-soc/mastodon into glitch-langfiles ... # Conflicts: # app/javascript/glitch/locales/ja.json	2017-12-11 09:43:21 +09:00
Erin	6bd18e43ba	filter local-only statuses from public pages	2017-12-10 17:23:01 -06:00
Erin	5ef65aab8f	replace reblog service check for an 👁️ with #local_only	2017-12-10 17:12:21 -06:00
Erin	cfbb95605b	set local_only flag on statuses in post_status_service	2017-12-10 17:04:32 -06:00
Erin	08519cd4f4	status: stub local_only?, add scope, add marked_local_only?	2017-12-10 17:04:28 -06:00
Erin	434c70fd98	add a local_only column to the statuses table	2017-12-10 16:41:25 -06:00
cwm	0466aa8d08	use single quotes in locale entry	2017-12-10 15:39:23 -06:00
cwm	072ab191cc	pulled master, moved locale entry to new location	2017-12-10 15:22:15 -06:00
cwm	eec5d350fd	removed unneeded actions_modal div	2017-12-10 15:14:56 -06:00
kibigo!	cd107e92cb	Move ja localization to new locaiton	2017-12-10 11:09:59 -08:00
kibigo!	6b7085a33e	Linting fixes	2017-12-10 11:08:04 -08:00
kibigo!	1c728df92e	Only localize js when there's a theme	2017-12-10 11:08:04 -08:00
kibigo!	b28cd6769c	Javascript intl8n flavour support	2017-12-10 11:08:04 -08:00
kibigo!	d08d0f9f33	Ruby intl8n for themes	2017-12-10 11:08:04 -08:00
Andrea Scarpino	6a82939adb	Fix account and tag searches with leading/trailing spaces (#5965) ... * Strip leading & trailing spaces from account query * Strip leading & trailing spaces from tag search	2017-12-10 19:35:46 +01:00
Lynx Kotoura	98aa96b8d6	Refix extraspace for emojis (#5964) ... Fix misalignment between emoji sizes	2017-12-10 17:56:05 +01:00
abcang	3caec1ecc2	Save media outside transaction (#5959)	2017-12-10 16:33:52 +01:00
cwm	066458a659	removed one last app settings addition	2017-12-10 09:25:44 -06:00
cwm	7a8711ccac	removed app settings additions	2017-12-10 09:10:47 -06:00
Quenty31	7d4ebeecbd	l10n i18n OC: corrections (#5962) ... * filling missing strings * Small changes Better way of saying + removed 2 finals dots * Corrections * Corrections Now with final point or without, just like the EN file * Update oc.json	2017-12-11 00:07:24 +09:00
ncls7615	0e56797792	add and fix	2017-12-10 17:33:22 +09:00
beatrix	282f48ddd1	Merge pull request #248 from chriswmartin/glitch-theme-lists ... add lists to glitch flavour!	2017-12-10 00:53:37 -05:00
beatrix	ef53c972b1	Merge pull request #237 from dexamphetamine/jpn-localization ... i18n: add ja glitch strings	2017-12-09 23:34:13 -05:00
amphetamine	eb2b971a52	i18n: add ja glitch strings	2017-12-09 19:39:41 -08:00
Yamagishi Kazutoshi	6e3f176b8e	Add Galician language support (#5955)	2017-12-10 04:19:07 +01:00
Olivier Humbert	a4710f9af8	French translation update (#5954) ... * Update French translation * fix	2017-12-10 09:47:59 +09:00
abcang	fcc0795a40	Remove unused function (#5950)	2017-12-09 23:37:31 +01:00
cwm	8606e53384	moved locales to glitch, created add settings entry	2017-12-09 15:15:11 -06:00
cwm	c5a688d70e	remove trailing spaces	2017-12-09 12:41:24 -06:00
cwm	7284e36fbd	fixed fav setting change	2017-12-09 12:17:20 -06:00
cwm	22cdbca82c	fixes, functioning now	2017-12-09 12:06:00 -06:00
cwm	a489e5d5cd	added a few more things	2017-12-09 11:21:41 -06:00
cwm	baf9ea8018	remove keyboard shortcuts from getting started because thats a different thing	2017-12-09 10:32:46 -06:00
cwm	abe95b614b	add initial components based off of tootsuite pr #1507	2017-12-09 10:26:22 -06:00
Yamagishi Kazutoshi	e7d55df38d	Ignore HEAD method if does not support (#5949)	2017-12-09 16:53:40 +01:00
Eugen Rochko	a72d03f43c	Weblate translations (#5946) ... * Translated using Weblate (German) Currently translated at 84.2% (439 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (English) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (German) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (English) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (French) Currently translated at 84.6% (441 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (German) Currently translated at 86.9% (453 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Korean) Currently translated at 86.3% (450 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese) Currently translated at 36.2% (189 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/ * Translated using Weblate (Hebrew) Currently translated at 53.1% (277 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/he/ * Translated using Weblate (Spanish) Currently translated at 75.6% (394 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (French) Currently translated at 86.3% (450 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese) Currently translated at 98.2% (55 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% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * 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 84.6% (441 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * 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 (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 (Catalan) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/ * Translated using Weblate (German) Currently translated at 88.2% (460 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 90.2% (470 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (French) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 90.2% (470 of 521 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% (245 of 245 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% (245 of 245 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% (245 of 245 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% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Hebrew) Currently translated at 61.8% (322 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * 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 (Portuguese (Brazil)) Currently translated at 92.3% (481 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * 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 (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 87.5% (456 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 87.7% (457 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Catalan) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Catalan) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Portuguese) Currently translated at 42.4% (221 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 97.3% (73 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Catalan) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (German) Currently translated at 90.5% (472 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 90.7% (473 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 90.9% (474 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.1% (475 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Dutch) Currently translated at 90.4% (471 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.3% (481 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 90.5% (472 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 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% (245 of 245 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% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 44.1% (19 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * 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 (Arabic) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/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 (Portuguese) Currently translated at 47.7% (249 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Arabic) Currently translated at 29.9% (156 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Spanish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/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 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * 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 (Polish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (519 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Spanish) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/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 (Spanish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/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 (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.2% (517 of 521 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% (245 of 245 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% (245 of 245 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% (245 of 245 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% (245 of 245 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% (245 of 245 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% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Added translation using Weblate (Galician) * Translated using Weblate (Japanese) Currently translated at 99.6% (519 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * 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 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.4% (518 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Galician) Currently translated at 43.6% (107 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Japanese) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ * 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 (Portuguese (Brazil)) Currently translated at 99.4% (518 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 96.4% (54 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 31.2% (163 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Dutch) Currently translated at 91.5% (477 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (French) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 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 (Dutch) Currently translated at 100.0% (521 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (521 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (French) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Norwegian (old code)) Currently translated at 50.6% (264 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Galician) Currently translated at 64.0% (157 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/no/ * Translated using Weblate (Norwegian (old code)) Currently translated at 97.3% (73 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/no/ * 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 (Norwegian (old code)) Currently translated at 96.4% (54 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/no/ * Translated using Weblate (Galician) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (German) Currently translated at 95.2% (496 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 95.2% (496 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * i18n-tasks normalize && yarn manage:translations * Fix things	2017-12-09 15:35:22 +01:00
Eugen Rochko	a865b62efc	Rate limit by user instead of IP when API user is authenticated (#5923) ... * Fix #668 - Rate limit by user instead of IP when API user is authenticated * Fix code style issue * Use request decorator provided by Doorkeeper	2017-12-09 14:20:02 +01:00
Yamagishi Kazutoshi	931e66e572	Back to Web UI from tag page when signed in (#5943)	2017-12-09 14:19:07 +01:00
Yamagishi Kazutoshi	cdae7e4c8b	Move push notifications settings (regression from #5879) (#5941) ... * Move push notifications settings * fix typo `setf` -> `set`	2017-12-09 14:18:45 +01:00
Quenty31	3a52c90de1	l10n i18n OC update (#5939) ... * update and corrections * update (invites) * Update oc.yml * Update oc.yml	2017-12-09 14:17:34 +01:00
cwm	02d71c6a11	fix a missing semicolon and mixed tabs/spaces that travis was complaining about	2017-12-08 21:09:53 -06:00
cwm	4a5401a58e	merge tootsuite prs #5895 and #5889 into glitch flavour	2017-12-08 20:50:39 -06:00
cwm	28423dd046	merge tootsuite pr #5904 into glitch flavour	2017-12-08 20:45:18 -06:00
cwm	b165950ca7	add keyboard shortcut to getting started, add missing list style	2017-12-08 20:30:45 -06:00
cwm	47157e07b2	merged tootsuite pr #5811 into glitch flavour	2017-12-08 20:13:08 -06:00
cwm	f44c8fd130	merged tootsuite pr #5750 into glitch flavour	2017-12-08 19:40:49 -06:00
abcang	99242b92bc	Keep WebPush settings (#5879)	2017-12-09 02:31:37 +01:00
Eugen Rochko	ec3b449baa	Fix #5630 - Prevent duplicate load of favourites (#5931)	2017-12-09 02:22:13 +01:00
Eugen Rochko	2f4c5f504f	Limit users to 50 lists, remove pagination from lists API (#5933)	2017-12-09 01:32:29 +01:00
Yamagishi Kazutoshi	f08e6e9ab5	Audio.prototype.seek is undefined (#5935)	2017-12-09 01:25:00 +01:00
Eugen Rochko	86b4d5439c	Fix #5926 - Do not downgrade to OStatus once ActivityPub is known (#5929)	2017-12-09 01:24:47 +01:00
Eugen Rochko	c36b9cc5a6	Ensure link thumbnails are not stretched to super low quality (#5932)	2017-12-09 00:56:16 +01:00
Eugen Rochko	70ce2a2095	Polish video player CSS, add timer on fullscreen/modal/public pages (#5928)	2017-12-09 00:55:58 +01:00
Jenkins	776867ea73	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-08 13:17:14 +00:00
Yamagishi Kazutoshi	dad0a09675	Remove unused messages (#5924)	2017-12-08 13:55:33 +01:00
Eugen Rochko	bca9e2e57a	Weblate translations (#5922) ... * Translated using Weblate (German) Currently translated at 84.2% (439 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (English) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (German) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (French) Currently translated at 84.6% (441 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (English) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (German) Currently translated at 86.9% (453 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Korean) Currently translated at 86.3% (450 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 84.8% (442 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese) Currently translated at 36.2% (189 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/ * Translated using Weblate (Hebrew) Currently translated at 53.1% (277 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/he/ * Translated using Weblate (Hebrew) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/he/ * Translated using Weblate (Spanish) Currently translated at 75.6% (394 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (French) Currently translated at 86.3% (450 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * 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 84.6% (441 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * 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 (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 (Catalan) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/ * Translated using Weblate (German) Currently translated at 88.2% (460 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 90.2% (470 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (French) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 90.2% (470 of 521 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% (245 of 245 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% (245 of 245 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% (245 of 245 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% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Hebrew) Currently translated at 61.8% (322 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * 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 (Portuguese (Brazil)) Currently translated at 92.3% (481 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * 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 (French) Currently translated at 87.3% (455 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 87.5% (456 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 87.7% (457 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Catalan) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ca/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Catalan) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Portuguese) Currently translated at 42.4% (221 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 97.3% (73 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Catalan) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (German) Currently translated at 90.5% (472 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 90.7% (473 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 90.9% (474 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.1% (475 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Dutch) Currently translated at 90.4% (471 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.3% (481 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (German) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 90.5% (472 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (245 of 245 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% (245 of 245 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% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 44.1% (19 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * 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 (Arabic) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/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 (Portuguese) Currently translated at 47.7% (249 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Arabic) Currently translated at 29.9% (156 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Spanish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/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 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * 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 (Polish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (519 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Spanish) Currently translated at 100.0% (245 of 245 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/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 (Spanish) Currently translated at 99.8% (520 of 521 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/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/ * i18n-tasks normalize * yarn run manage:translations * Restore wrongly removed translations	2017-12-08 01:59:44 +01:00
Yamagishi Kazutoshi	65e0bbd958	Disable status content outline (#5921)	2017-12-08 00:03:25 +01:00
kibigo!	717b7d555c	Skins shouldn't apply to fallback flavours	2017-12-07 14:49:54 -08:00
kibigo!	9cdd81e9dd	Glitch doesn't have a home stylesheet anymore	2017-12-07 14:32:52 -08:00
kibigo!	96126a5b01	Packaged local_settings styles in common	2017-12-07 13:36:18 -08:00
Lynx Kotoura	832a7f9a05	ReFix font-weight of <strong> element for CJK fonts (#5920) ... Also apply to Japanese and Korean. Fix font-weight in landing pages.	2017-12-07 21:35:19 +01:00
SerCom_KC	a1fc626e57	Fix font-weight of <strong> element for CJK fonts (#5914) ... * Fix font-weight for CJK fonts * Use `font-weight: 700;` for mobile support * Fix indentation * Remove trailing whitespace * Remove trailing whitespace	2017-12-07 16:01:52 +01:00
Yamagishi Kazutoshi	9a6fc03332	Hide moved account's follow button in search result (#5913)	2017-12-07 15:59:31 +01:00
Quenty31	7445f17571	OC language update (#5905) ... * Update * update * Update oc.yml * bundle exec i18n-tasks normalize * Update oc.yml	2017-12-07 15:28:13 +09:00
David Yip	67d625c42d	Fix hide reblogs in glitch frontend (#5909) ... This applies 432761f375 to the glitch copy of the Mastodon frontend.	2017-12-06 22:35:45 -06:00
David Yip	ddb61decce	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2017-12-06 22:34:42 -06:00
David Yip	935c1944e2	Merge pull request #241 from glitch-soc/no-dm-option ... Add option to remove DMs from home (#126)	2017-12-06 22:20:55 -06:00
Jenkins	744447b3c0	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-07 04:17:14 +00:00
Yamagishi Kazutoshi	0c4ca3e549	Remove duplicate annotate (#5910) ... * Remove duplicate annotate * Remove blank line	2017-12-07 04:53:42 +01:00
Akihiko Odaki	c083816c24	Add embed_url to preview cards (#5775)	2017-12-07 03:37:43 +01:00
Yamagishi Kazutoshi	432761f375	Fix hide reblogs (regression from #5887) (#5909)	2017-12-07 03:37:31 +01:00
kibigo!	2f2467ce8e	Add option to remove DMs from home (#126)	2017-12-06 17:50:27 -08:00
David Yip	133f5b3b53	Apply Javascript changes in tootsuite/mastodon#5887 to glitch flavour (#239)	2017-12-06 18:23:28 -06:00
kibigo!	061211a1e3	Fix common packs when other pack also there	2017-12-06 15:34:19 -08:00
David Yip	161d286df2	Use settings pack for InvitesController (#229)	2017-12-06 17:20:04 -06:00
beatrix	81b0145759	Merge pull request #229 from glitch-soc/glitch-theme ... Advanced Next-Level Flavours And Skins For Mastodon™	2017-12-06 17:44:07 -05:00
David Yip	017fc81caf	Prepend check_enabled_deletion to Settings::DeletesController (#229) ... The specs for Settings::DeletesController include an example that sets Settings.open_deletion to false and expects the "if deletion is not available, redirect to root" logic to run. However, this spec does not set up a user, which means that the spec (intentionally or otherwise) expects this redirection to work with unauthenticated access. We should preserve that behavior. To do so, we prepend the deletion check to the action chain set up by Settings::BaseController, so that said check occurs before the authenticate_user! check.	2017-12-06 16:19:43 -06:00
Jenkins	8ca91cef45	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-06 20:17:13 +00:00
Marcin Mikołajczak	a0047fdca0	i18n: 🇵🇱 (#5903) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-12-07 05:04:35 +09:00
Lynx Kotoura	a20509b41e	Fix list editor modal on narrow devices (#5904)	2017-12-06 19:48:48 +01:00
Lynx Kotoura	281c577cf8	Fix extra space between status text and username (#5902)	2017-12-06 17:53:25 +01:00
aschmitz	4de211b80a	Break out nested relationship API keys (#5887) ... * Break out nested relationship API keys This closes #5856 by restoring the existing behavior of the `muting` and `following` keys (returning booleans rather than truthy or false). It adds `showing_reblogs` and `muting_notifications` keys: * `showing_reblogs` returns true if: 1. You've requested to follow the user, with reblogs shown, or 2. You are following the user, with reblogs shown. * `muting_notifications` returns true if you have muted the user and their notifications as well. * Rubocop fix * Fix pulling reblog/mute status from relationships I could swear this had passed tests before, but apparently not. Works now. * More test fixes Really, you'd expect this to be more straightforward.	2017-12-06 16:10:54 +01:00
Yamagishi Kazutoshi	063a1c2a8b	Fix emoji picker scrollbar (regression from #5046) (#5901)	2017-12-06 12:18:27 +01:00
Yamagishi Kazutoshi	a9ca5ce920	Handle submit event of new list form (#5895)	2017-12-06 12:18:10 +01:00
Yamagishi Kazutoshi	d7a17b5e8b	Search only from followees (#5897)	2017-12-06 11:44:23 +01:00
Yamagishi Kazutoshi	b21db9bbde	Using double splat operator (#5859)	2017-12-06 11:41:57 +01:00
Eugen Rochko	42bcbd36b7	Remove rabl dependency (#5894) ... * Remove rabl dependency * Replicate old Oj configuration	2017-12-06 15:04:49 +09:00
mayaeh	0393a64a90	Update Japanese translations. (#5893)	2017-12-06 03:22:11 +01:00
Eugen Rochko	d68868ca14	Lists redis clean-up (#5886) ... * When list is deleted, remove feed from redis * Clean up list feeds of inactive users	2017-12-05 23:20:27 +01:00
Eugen Rochko	e20895f251	Add list of lists component to web UI (#5811) ... * Add list of lists component to web UI * Add list adding * Add list removing * List editor modal * Add API account search limited by following=true relation * Rework list editor modal * Remove mandatory pagination of GET /api/v1/lists/:id/accounts * Adjust search input placeholder * Fix rspec (#5890) * i18n: (zh-CN) Add missing translations for #5811 (#5891) * i18n: (zh-CN) yarn manage:translations -- zh-CN * i18n: (zh-CN) Add missing translations for #5811 * Fix some issues - Display loading/missing state for list timelines - Order lists alphabetically in overview - Fix async list editor reset - Redirect to /lists after deleting unpinned list - Redirect to / after pinning a list * Remove dead list columns when a list is deleted or fetch returns 404	2017-12-05 23:02:27 +01:00
SerCom_KC	12cea76634	Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849) ... * i18n: (zh-CN) Add missing translations for multiple PRs. Related PRs: #5838 #5762 #5835 #5837 #5832 #5823 #5814 #5757 * i18n: (zh-CN) Fix translation for #5823 / #5835 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `发送者` to `作者` * i18n: (zh-CN) Add missing translations for #5862 * i18n: (zh-CN) Add missing translation for #5874 * i18n: (zh-CN) Improve translations for keyboard shortcuts	2017-12-06 00:46:04 +09:00
Neetshin	b4bc594c5a	Add aria-autocomplete='list' in Textaria (#5889) ... ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete	2017-12-05 11:32:00 +01:00
kibigo!	5bed0f10ed	Various fixes	2017-12-04 21:58:10 -08:00
David Yip	a807e3b71b	current_theme -> current_flavour (#229)	2017-12-04 11:35:35 -06:00
David Yip	d9800a5647	Merge branch 'gs-master' into glitch-theme	2017-12-04 11:07:01 -06:00
Jenkins	f2f2f10320	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-04 12:17:13 +00:00
Neetshin	82884ac5c4	Update mutes.js (#5882)	2017-12-04 20:52:14 +09:00
kibigo!	1c74ede69e	Fixed a name + localizations	2017-12-04 00:19:39 -08:00
kibigo!	7c75702d05	Fixed image require	2017-12-03 23:52:13 -08:00
kibigo!	bc4fa6b198	Rename themes -> flavours ? ?	2017-12-03 23:26:40 -08:00
kibigo!	d216547382	Fixed typos	2017-12-03 22:30:45 -08:00
Jenkins	757f52ff2e	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-03 21:17:13 +00:00
Lynx Kotoura	886829e96c	Add keyboard shortcuts link to getting-started navigation (#5874) ... * Add keyboard shortcuts link to getting-started navigation * i18n: 🇵🇱 * yarn manage:translations	2017-12-03 21:29:51 +01:00
Lynx Kotoura	62a94ebed4	Add back button to keyboard shortcuts legend column (#5872)	2017-12-03 21:29:41 +01:00
Jenkins	933eafdcd3	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-12-02 14:17:11 +00:00
cormo	bdf6d0a684	Remove redundant import statement in SCSS (#5864) ... * Remove redudant import statement in SCSS * Fix wrong chmod	2017-12-02 08:42:20 +09:00
Yamagishi Kazutoshi	74320971e2	Add invite filter (#5862)	2017-12-01 16:40:02 +01:00
Yamagishi Kazutoshi	eee3b32b77	Fix invites form path (#5861)	2017-12-01 12:26:57 +01:00
Yamagishi Kazutoshi	df03042a6e	Allow admin to deactivate invite created by users (#5860)	2017-12-01 12:26:19 +01:00
kibigo!	541fe9b110	Skins support	2017-11-30 19:29:47 -08:00
mayaeh	9927df83ad	Update Japanese translations for KeyboardShortcuts. (#5858)	2017-12-01 01:35:47 +01:00
Jenkins	ad46bc9772	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-30 03:17:12 +00:00
Eugen Rochko	4c6b5dbe96	Add semi-support for Video/Image objects in ActivityPub (#5848) ... * Add semi-support for Video/Image objects in ActivityPub Video and Image objects will create corresponding status records with manually crafted text contents (title + URL) * Extract html-url-finding logic into JsonLdHelper * Fallback to id when url missing, extract supported object types	2017-11-30 04:06:20 +01:00
Eugen Rochko	85e97ecab6	Fix too many forwards (#5854) ... * Avoid sending explicit Undo->Announce when original deleted * Do not forward a reply back to the server that sent it * Deduplicate inboxes of rebloggers' followers for delete forwarding * Adjust test * Fix wrong class, bad SQL, wrong variable, outdated comment	2017-11-30 03:50:05 +01:00
Jenkins	d020ed1e05	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-29 22:17:13 +00:00
Mayu Laierlence	f0d4c7d7ab	Fix Korean translation (#5853) ... "어플리케이션" -> "애플리케이션"	2017-11-30 07:16:29 +09:00
Marcin Mikołajczak	82ab9736d5	i18n: 🇵🇱 (#5851) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-29 20:51:24 +09:00
David Yip	84840e8d8c	Merge pull request #232 from glitch-soc/hotkeys-glitch ... Implement status hotkeys + spoiler expanding	2017-11-28 17:34:03 -06:00
David Yip	95c270f5b1	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-28 11:45:13 -06:00
Yamagishi Kazutoshi	15fab79cfa	Show "expired" in invite index (#5838) ... * Show "expired" in invite index * "Force expire" -> "Deactivate"	2017-11-28 15:41:02 +01:00
aschmitz	eeaec39888	Allow hiding of reblogs from followed users (#5762) ... * Allow hiding of reblogs from followed users This adds a new entry to the account menu to allow users to hide future reblogs from a user (and then if they've done that, to show future reblogs instead). This does not remove or add historical reblogs from/to the user's timeline; it only affects new statuses. The API for this operates by sending a "reblogs" key to the follow endpoint. If this is sent when starting a new follow, it will be respected from the beginning of the follow relationship (even if the follow request must be approved by the followee). If this is sent when a follow relationship already exists, it will simply update the existing follow relationship. As with the notification muting, this will now return an object ({reblogs: [true|false]}) or false for each follow relationship when requesting relationship information for an account. This should cause few issues due to an object being truthy in many languages, but some modifications may need to be made in pickier languages. Database changes: adds a show_reblogs column (default true, non-nullable) to the follows and follow_requests tables. Because these are non-nullable, we use the existing MigrationHelpers to perform this change without locking those tables, although the tables are likely to be small anyway. Tests included. See also <https://github.com/glitch-soc/mastodon/pull/212>. * Rubocop fixes * Code review changes * Test fixes This patchset closes #648 and resolves #3271. * Rubocop fix * Revert reblogs defaulting in argument, fix tests It turns out we needed this for the same reason we needed it in muting: if nil gets passed in somehow (most usually by an API client not passing any value), we need to detect and handle it. We could specify a default in the parameter and then also catch nil, but there's no great reason to duplicate the default value.	2017-11-28 15:00:35 +01:00
ThibG	b8efb5daed	Fix handling of temporary failures in ProcessMentionsService (#5842) ... * Add test for temporary account resolving failures in ProcessMentionsService * Fix processing of mentions to already-known remote accounts on temporary failures	2017-11-28 15:00:22 +01:00
Yamagishi Kazutoshi	2b3b44ebbc	Refactor KeyboardShortcuts component (#5835)	2017-11-28 14:32:27 +01:00
nullkal	1b57d4dd3a	Fix account migration feature (#5837) ... * Make removable account migration * Fix error during update of account migration setting * Add notice when update account migration setting	2017-11-28 14:31:23 +01:00
Marcin Mikołajczak	d937a59997	i18n: 🇵🇱 (#5841) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-28 19:30:18 +09:00
David Yip	7463d80ff4	Merge remote-tracking branch 'tootsuite/master'	2017-11-27 22:33:26 -06:00
kibigo!	6a48efe16c	Adds spoiler hotkey support to detailed statuses	2017-11-27 14:05:03 -08:00
Eugen Rochko	706e534455	Add UI for setting up account migration (#5832)	2017-11-27 22:47:06 +01:00
kibigo!	f3c3df62ab	Implement status hotkeys + spoiler expanding	2017-11-27 13:30:01 -08:00
Joshua Wood	ff78c1177a	Add Keyboard Shortcuts Legend (#5823) ... * Add Keyboard Shortcuts Legend Adds a "Keyboard Shortcuts" legend (displayed in the rightmost column) which is toggled via a new "?" hotkey. When subsequently pressed from the Keyboard Shortcuts legend, "?" will navigate back to the previous location. * Add hidden table headings. Makes the headings available for accessibility but hides them visually.	2017-11-27 21:31:58 +01:00
David Yip	e77c3996a5	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-27 11:29:04 -06:00
Yamagishi Kazutoshi	1c5b0e3334	Use account.username when display_name is empty (#5828)	2017-11-27 16:09:52 +01:00
Eugen Rochko	740f8a95a9	Add consumable invites (#5814) ... * Add consumable invites * Add UI for generating invite codes * Add tests * Display max uses and expiration in invites table, delete invite * Remove unused column and redundant validator - Default follows not used, probably bad idea - InviteCodeValidator is redundant because RegistrationsController checks invite code validity * Add admin setting to disable invites * Add admin UI for invites, configurable role for invite creation - Admin UI that lists everyone's invites, always available - Admin setting min_invite_role to control who can invite people - Non-admin invite UI only visible if users are allowed to * Do not remove invites from database, expire them instantly	2017-11-27 16:07:59 +01:00
Jenkins	5de42665d7	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-27 05:17:11 +00:00
Alda Marteau-Hardi	0ea4478b68	Use account.display_name for og:title single toot pages (#5821)	2017-11-27 05:31:26 +01:00
Akihiko Odaki	fd87e5a53b	Do not filter the status collection after muting and blocking (#5815) ... Filtering the status collection wipes out even the profiles of muted and blocked accounts. However, the behavior is inconsistent with the server- side behavior.	2017-11-26 01:45:17 +01:00
SerCom_KC	57fe4102ea	i18n: (zh-CN) Add translations for #5746 & #5750 (#5816)	2017-11-26 02:38:40 +09:00
Akihiko Odaki	bf7757cbbc	Allow to open a modal for embedded photo (#5777)	2017-11-25 15:41:45 +01:00
Akihiko Odaki	1266c66f79	Rename ariaLabel property of Dropdown to title (#5813) ... DropdownMenu has ariaLabel property, but it is actually applied to title property of IconButton. Keep it consistent.	2017-11-25 15:41:08 +01:00
spla	d07983b56d	Updated Catalan strings (#5801) ... * Updated Catalan strings * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * Update simple_form.ca.yml * bundle exec i18n-tasks * Update ca.json * Update simple_form.ca.yml	2017-11-25 23:22:59 +09:00
Jenkins	86f4f8e158	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-25 05:17:15 +00:00
Yamagishi Kazutoshi	520d147803	Add Japanese translations (#5810) ... * yarn manage:translations * Add Japanese translation for #5087 * Add Japanese translation for #5616 * Add Japanese translation for #5746 * Add Japanese translation for #5750	2017-11-25 03:39:57 +01:00
William Pitcock	32987004c9	status: preserve visibility attribute when reblogging (infoleak fix) (#5789) ... this should fix *all* remaining visibility-related mastodon ostatus infoleaks. thanks to @csaurus@gnusocial.de for pointing out the infoleak.	2017-11-25 01:36:08 +01:00
Eugen Rochko	31ac5f0e00	Display list column (#5750)	2017-11-25 00:35:37 +01:00
abcang	269a445c0b	Fix unnecessary order (#5807)	2017-11-24 18:41:07 +01:00
sdukhovni	2b51b4094c	Don't remove originals of boosted toots from timeline (#5479) ... * Don't remove originals of boosted toots from timeline * Remove unused argument to updateTimeline	2017-11-24 14:43:53 +01:00
Akihiko Odaki	5a551b530a	Do not require onClose property in NavigationBar (#5802) ... NavigationBar can be used as mock as it is in OnboardingModal. In such a case, onClose property is not required.	2017-11-24 13:13:17 +01:00
Jenkins	167fe2ab08	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-24 01:17:20 +00:00
Eugen Rochko	e84fecb7e9	Add logging of admin actions (#5757) ... * Add logging of admin actions * Update brakeman whitelist * Log creates, updates and destroys with history of changes * i18n: Update Polish translation (#5782) Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * Split admin navigation into moderation and administration * Redesign audit log page * 🇵🇱 (#5795) * Add color coding to audit log * Change dismiss->resolve, log all outcomes of report as resolve * Update terminology (e-mail blacklist) (#5796) * Update terminology (e-mail blacklist) imho looks better * Update en.yml * Fix code style issues * i18n-tasks normalize	2017-11-24 02:05:53 +01:00
kibigo!	2585649b20	Styling fixes	2017-11-21 19:00:07 -08:00
kibigo!	12c0011fee	Update statuses on hidden toggle (Fixes #227)	2017-11-21 18:27:34 -08:00
kibigo!	8812bab687	Minor fixes	2017-11-21 18:17:38 -08:00
Jenkins	2a5af9c10c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-21 17:17:11 +00:00
Marcin Mikołajczak	3c83b7e06e	i18n: Update Polish translation - front-end added (#231) ... * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-21 17:53:13 +01:00
Joan Montané	53b7b81b43	Update and fix Catalan translation (#5773) ... * Update activerecord.ca.yml * Update ca.yml * Update devise.ca.yml * Update doorkeeper.ca.yml * Update simple_form.ca.yml * fix syntax error for ca translation * fix syntax errors in ca translations Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-21 23:17:28 +09:00
kibigo!	bdbbd06dad	Finalized theme loading and stuff	2017-11-20 22:13:37 -08:00
Jenkins	8f3e5f6128	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-21 05:17:12 +00:00
abcang	3dce6cbbd7	Fixed duplicating URL of photo type of oEmbed (#5763)	2017-11-20 20:45:54 +01:00
Jenkins	a36a2c1796	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-19 15:17:12 +00:00
abcang	2bcc81700c	Fix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753)	2017-11-19 15:33:15 +01:00
abcang	53e95c4efc	Fix N+1 at notification (#5752)	2017-11-19 15:32:48 +01:00
David Yip	d083f7741a	Merge remote-tracking branch 'tootsuite/master'	2017-11-19 01:30:29 -06:00
Yamagishi Kazutoshi	bfdcf76a64	Add “staff” badge to admin user pages (#5735) ... * Allow staff badge to change from setting to hidden * i18n: Update Polish translation	2017-11-19 04:13:57 +01:00
beatrix	bcda3f85ce	Merge pull request #226 from glitch-soc/glitch-theme ... Glitch/Vanilla themes	2017-11-18 20:32:17 -05:00
kibigo!	321fa41930	Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme	2017-11-18 15:18:00 -08:00
kibigo!	a9ed857171	WIP static themeing	2017-11-18 15:12:52 -08:00
kibigo!	92cc79be72	Enabled vanilla thmee	2017-11-18 11:06:04 -08:00
kibigo!	08a01dd037	Public pack fix	2017-11-18 11:05:39 -08:00
kibigo!	672ace5a20	Media styling	2017-11-18 11:05:23 -08:00
kibigo!	f51f7b0e06	Font styles are now packagified	2017-11-18 11:05:00 -08:00
Eugen Rochko	58cede4808	Profile redirect notes (#5746) ... * Serialize moved accounts into REST and ActivityPub APIs * Parse federated moved accounts from ActivityPub * Add note about moved accounts to public profiles * Add moved account message to web UI * Fix code style issues	2017-11-18 19:39:02 +01:00
beatrix	dec960c828	Merge pull request #208 from yipdw/keyword-mute ... Run keyword mutes on hashtags	2017-11-18 12:06:40 -05:00
Jenkins	eed50514be	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-18 06:17:14 +00:00
SerCom_KC	6be72a3ec6	Updating Chinese (Simplified) translations (#5725) ... * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `静音` to `隐藏` * i18n: (zh-CN) Add translations for #5087 & #5669 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translation for #5728	2017-11-18 14:35:11 +09:00
kibigo!	fc2c8b50dd	Removed glitch tests	2017-11-17 19:29:17 -08:00
kibigo!	e19fc6a9f8	Restore vanilla components	2017-11-17 19:29:16 -08:00
kibigo!	45c44989c8	Forking glitch theme	2017-11-17 19:29:16 -08:00
beatrix	5a9982b425	Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size ... Make character limit configurable (from tootsuite/mastodon#5697)	2017-11-17 19:02:40 -05:00
David Yip	130aa90d55	Update annotations on Follow, FollowRequest, and Mute. ... Follow and FollowRequest had conflicts in their schema annotations, so I ran latest migrations and let annotate_models fix them up.	2017-11-17 17:41:15 -06:00
David Yip	1ab12ba38e	Merge remote-tracking branch 'origin/master' into merge-upstream	2017-11-17 17:40:00 -06:00
Eugen Rochko	24cafd73a2	Lists (#5703) ... * Add structure for lists * Add list timeline streaming API * Add list APIs, bind list-account relation to follow relation * Add API for adding/removing accounts from lists * Add pagination to lists API * Add pagination to list accounts API * Adjust scopes for new APIs - Creating and modifying lists merely requires "write" scope - Fetching information about lists merely requires "read" scope * Add test for wrong user context on list timeline * Clean up tests	2017-11-18 00:16:48 +01:00
David Yip	6f8ccbfcdf	Merge pull request #222 from yipdw/merge/tootsuite/master ... Merge upstream (e28b33c.. 94c5a11)	2017-11-17 14:35:16 -06:00
David Yip	dc16d73bf5	Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size	2017-11-17 14:28:16 -06:00
beatrix	b006bb82af	Merge pull request #221 from glitch-soc/local-only-policy ... Update StatusPolicy to check current_account for local_only? toots.	2017-11-17 15:17:49 -05:00
Jenkins	94c5a11cda	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-11-17 20:17:12 +00:00
David Yip	45f18b8f49	Merge pull request #218 from glitch-soc/themed-prefetching ... Themed preloading	2017-11-17 14:01:23 -06:00
Lynx Kotoura	4a2fc2d444	Increase contrast of Admin badges (#5740) ... To comply WCAG 2.0 guidelines on contrast ratio.	2017-11-17 19:59:53 +01:00
Clworld	e1ebf36352	Fix regression #5467: fixes emoji copy (#5739)	2017-11-17 18:22:31 +01:00
David Yip	f6355f6ffb	Update StatusPolicy to check current_account for local_only? toots. ... StatusPolicy#account was renamed to StatusPolicy#current_account in upstream. This commit renames the local-only changes to match and augments the #show? policy spec with what we expect for local-only toots.	2017-11-17 09:07:21 -06:00
unarist	e28b33c89c	Move "Permissions" row into main table in /admin/accounts/:id (#5734)	2017-11-17 15:18:20 +01:00
David Yip	2a386ad88d	Add trailing comma in mapStateToProps ... Consistency, eslint, etc.	2017-11-17 00:24:22 -06:00
David Yip	fbf76feb37	Merge pull request #219 from glitch-soc/no-spin ... Remove 'spin' theme	2017-11-17 00:14:24 -06:00
David Yip	392945f9a3	Throw layout, isWide, navbarUnder back into mapStateToProps. ... This gets wide view, auto layout, and navbar-under-mobile working again.	2017-11-17 00:11:01 -06:00
kibigo!	4dd19054d6	Removes spin theme	2017-11-16 21:54:12 -08:00
kibigo!	585758a373	Themed prefetching	2017-11-16 21:37:08 -08:00
David Yip	b28b405b97	Merge remote-tracking branch 'origin/master' into gs-master	2017-11-16 22:52:37 -06:00
ysksn	9dd5e329ab	Remove empty strings (#5732)	2017-11-17 10:52:30 +09:00
Eugen Rochko	3e90987c8b	Fix some rubocop style issues (#5730)	2017-11-17 10:06:26 +09:00
Eugen Rochko	2151fd3150	Display moderator badge (green), admin badge changed to red (#5728)	2017-11-17 01:22:38 +01:00
Renato "Lond" Cerqueira	ad207456d6	Improve language filter (#5724) ... * Scrub text of html before detecting language. * Detect language on statuses coming from activitypub. * Fix rubocop comments. * Remove custom emoji from text before language detection	2017-11-16 13:51:38 +01:00
ysksn	9e3d24a150	Fix AccountFinderConcern::AccountFinder#with_usernames (#5722)	2017-11-16 12:13:03 +01:00
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at 3023725936	2017-11-16 01:21:16 -06:00
David Yip	08652baab0	Replace =~ with #matches?. #208. ... =~ made sense when we were passing it through to a regex, but we're no longer doing that: TagMatcher looks at individual tags and returns a value that *looks* like what you get out of #=~ but really isn't that meaningful. Probably a good idea to not subvert convention like this and instead use a name with guessable intent.	2017-11-15 18:27:25 -06:00
David Yip	8fc54890e5	Prefix cache keys with the matcher type. #208. ... We already know about one regex limitation, which is that they cannot segment words in e.g. Japanese, Chinese, or Thai. It may also end up that regex matching is too slow compared to other methods. However, the regex is an implementation detail. We still want the ability to switch between "occurs anywhere" and "match whole word", and caching the matcher result is likely to still be important (since the matcher itself won't change nearly as often as status ingress rate). Therefore, we ought to be able to change the cache keys to reflect a change of data structure. (Old cache keys expire within minutes, so they shouldn't be too big of an issue. Old cache keys could also be explicitly removed by an instance administrator.)	2017-11-15 18:12:31 -06:00
David Yip	cb4ef24ac9	Match keyword mute filter on hashtags. #208. ... It is reasonable to expect someone to enter #foo to mute hashtag #foo. However, tags are recorded on statuses without the preceding #. To adjust for this, we build a separate tag matcher and use Tag::HASHTAG_RE to extract a hashtag from the hashtag syntax.	2017-11-15 18:12:29 -06:00
David Yip	431503bae2	Also run the keyword matcher on a status' tags. #208.	2017-11-15 18:12:26 -06:00
beatrix	04508868b0	Merge pull request #212 from aschmitz/feat/mute-reblogs ... Allow hiding reblogs on a per-follow basis	2017-11-15 12:01:17 -05:00
ysksn	19e8b861a2	Delegate some methods of User to @settings (#5706) ... * Move some tests of User into Settings::ScopedSettings * Add a test for User@settings	2017-11-15 16:05:20 +01:00
masarakki	c73a1fb537	reusable-streaming (#5709)	2017-11-15 16:04:15 +01:00
Surinna Curtis	031a5a8f92	Optional notification muting (#5087) ... * Add a hide_notifications column to mutes * Add muting_notifications? and a notifications argument to mute! * block notifications in notify_service from hard muted accounts * Add specs for how mute! interacts with muting_notifications? * specs testing that hide_notifications in mutes actually hides notifications * Add support for muting notifications in MuteService * API support for muting notifications (and specs) * Less gross passing of notifications flag * Break out a separate mute modal with a hide-notifications checkbox. * Convert profile header mute to use mute modal * Satisfy eslint. * specs for MuteService notifications params * add trailing newlines to files for Pork :) * Put the label for the hide notifications checkbox in a label element. * Add a /api/v1/mutes/details route that just returns the array of mutes. * Define a serializer for /api/v1/mutes/details * Add more specs for the /api/v1/mutes/details endpoint * Expose whether a mute hides notifications in the api/v1/relationships endpoint * Show whether muted users' notifications are muted in account lists * Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint * make the hide/unhide notifications buttons work * satisfy eslint * In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal. * fix a missing import * add an explanatory comment to AccountInteractions * Refactor handling of default params for muting to make code cleaner * minor code style fixes oops * Fixed a typo that was breaking the account mute API endpoint * Apply white-space: nowrap to account relationships icons * Fix code style issues * Remove superfluous blank line * Rename /api/v1/mutes/details -> /api/v2/mutes * Don't serialize "account" in MuteSerializer Doing so is somewhat unnecessary since it's always the current user's account. * Fix wrong variable name in api/v2/mutes * Use Toggle in place of checkbox in the mute modal. * Make the Toggle in the mute modal look better * Code style changes in specs and removed an extra space * Code review suggestions from akihikodaki Also fixed a syntax error in tests for AccountInteractions. * Make AddHideNotificationsToMute Concurrent It's not clear how much this will benefit instances in practice, as the number of mutes tends to be pretty small, but this should prevent any blocking migrations nonetheless. * Fix up migration things * Remove /api/v2/mutes	2017-11-15 03:56:41 +01:00
ThibG	58bca7b1e4	Filter searched toots to be consistent with blocking behaviors (#5383)	2017-11-15 01:53:33 +01:00
ThibG	1c25853842	Use already-known remote user data if resolving temporarily fails in mentions (#5702)	2017-11-15 01:06:49 +01:00
Eugen Rochko	fbef909c2a	Add option to block direct messages from people you don't follow (#5669) ... * Add option to block direct messages from people you don't follow Fix #5326 * If the DM responds to a toot by recipient, allow it through * i18n: Update Polish translation (for #5669) (#5673)	2017-11-14 21:12:57 +01:00
SerCom_KC	c3ec1e87b8	Updating Chinese (Simplified) translations (#5643) ... * i18n: (zh-CN) Bug fix for note-counter. * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add support.array key for better wording * Revert "i18n: (zh-CN) Add support.array key for better wording" This reverts commit 27bf9a946e886213e827cd985d4f62419db57534. Looks like this commit can't get pass the checks, revert it for now. * i18n: (zh-CN) Change `客户端` to `应用` * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations (#5635) * i18n: (zh-CN) Change `两步验证` to `双重认证` * i18n: (zh-CN) Improve translations	2017-11-14 20:44:42 +01:00
Yamagishi Kazutoshi	20150659e6	Add uniqueness to block email domains (#5692)	2017-11-14 20:37:17 +01:00
Marcin Mikołajczak	8087aa83d4	i18n: Update Polish translation (#5699) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-11-14 20:36:11 +01:00
Lain Iwakura	ca5440b93d	Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.	2017-11-14 17:56:38 +01:00
Lain Iwakura	dae8916544	Code style fixes.	2017-11-14 16:54:04 +01:00
Lain Iwakura	d11b1a1aa7	Handle character limit in initial state in frontend.	2017-11-14 16:24:10 +01:00
Lain Iwakura	a4dcabc11b	Return character limit in API and initial state.	2017-11-14 16:23:12 +01:00
Lain Iwakura	6cd192b9fb	Make character limit configurable.	2017-11-14 16:22:34 +01:00
Andrew	c238444188	Updates and fixes to win95 theme	2017-11-14 01:22:48 -08:00
Anna e só	0e6c4cb796	l10n: PT-BR translation updated (#5681) ... * Improved e-mail messages; delted repeated words * pt-BR.json translations updated * Revert "pt-BR.json translations updated" This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd. * Updated pt-BR.json * pt-BR.yml updated	2017-11-14 11:07:38 +09:00
David Yip	656d54e945	Maintain case-insensitivity when merging multiple matchers (#213) ... When given two regexps, Regexp.union preserves the options set (or not set) on each regex; this meant that none of the multiline (m), case-insensitivity (i), or extended syntax (x) options were set. Our regexps are written expecting the m, i, and x options were set on all of them, so we need to make sure that we preserve that behavior.	2017-11-13 11:06:02 -06:00
Daniel Hunsaker	cf7e840990	Update model annotations to use BIGINT for IDs (#5461) ... All the migrations have been updated to use BIGINTs for ID fields in the DB, but ActiveRecord needs to be told to treat those values as BIGINT as well. This PR does that.	2017-11-12 16:18:50 +01:00
aschmitz	9a42f7cbed	Actually filter blocked reblogs from feed ... And even a relevant test. Whoops.	2017-11-11 22:10:49 -06:00
Eugen Rochko	07f7192bc3	Fix #5632 - Reset column loading status after fetch fail (#5659)	2017-11-12 12:51:07 +09:00
aschmitz	48c705bbad	Don't update follower counts on reblog toggle	2017-11-11 21:42:22 -06:00
aschmitz	5128c4261e	Updates per code review ... Thanks, @valerauko!	2017-11-11 14:37:23 -06:00
Eugen Rochko	7bb8b0b2fc	Add moderator role and add pundit policies for admin actions (#5635) ... * Add moderator role and add pundit policies for admin actions * Add rake task for turning user into mod and revoking it again * Fix handling of unauthorized exception * Deliver new report e-mails to staff, not just admins * Add promote/demote to admin UI, hide some actions conditionally * Fix unused i18n	2017-11-11 20:23:33 +01:00
ThibG	2b1190065c	Retry thread resolving (#5599) ... Thread resolving is one of the few tasks that isn't retried on failure. One common cause for failure of this task is a well-connected user replying to a toot from a little-connected user on a small instance: the small instance will get many requests at once, and will often fail to answer requests within the 10 seconds timeout used by Mastodon. This changes makes the ThreadResolveWorker retry a few times, with a rapidly-increasing time before retries and large random contribution in order to spread the load over time.	2017-11-11 16:49:04 +01:00
aschmitz	b95c48748c	Per-user reblog hiding implementation/fixes/tests ... Note that this will only hide/show *future* reblogs by a user, and does nothing to remove/add reblogs that are already in the timeline. I don't think that's a particularly confusing behavior, and it's a lot easier to implement (similar to mutes, I believe).	2017-11-10 22:04:54 -06:00
Lynx Kotoura	f9e7336296	Fix focused background color of direct toots (#5642)	2017-11-09 19:40:34 +01:00
aschmitz	4944515020	"Show reblogs" per-follower UI/database changes ... TODO: * Tests (particularly for FollowRequests). * Anything to respect the setting when putting reblogs in timelines.	2017-11-09 08:41:10 -06:00
ysksn	54b42901df	Add and Remove tests for FollowRequest (#5622) ... * Add a test for FollowRequest#authorize! * Remove tests There is no need to test ActiveModel::Validations::ClassMethods#validates. * Make an alias of destroy! as reject! Instead of defining the method, make an alias of destroy! as reject! because of reducing test.	2017-11-09 14:36:52 +01:00
unarist	49a285ce15	Show confirmation dialog on leaving WebUI while composing (#5616) ... * Show confirmation dialog on leaving WebUI while composing Currently, Back button and Back hotkey can cause leaving from WebUI, as well as browser's back button. Users may hit those buttons accidentally, and their composing text will be lost. So this prevents it by showing confirmation dialog from `onbeforeunload` event. * Fix message and comments	2017-11-09 14:34:41 +01:00
Quenty31	eb97bd8af6	i10n OC: Memorial (#5615) + #5467 (#5623) ... * Changed ĩ => ï * Changed ĩ => ï * Add ability to disable login and mark accounts as memorial (#5615)	2017-11-08 15:19:49 +01:00
ThibG	889ada5ee2	Fix process mentions for local users, as local users are considered to use OStatus (#5618)	2017-11-07 22:15:15 +01:00
nullkal	3f16caaa50	Eliminate space around emoji (#5474) ... * Eliminate space around emoji * More improve emoji style * Make more compatible with Twemoji * Make scss-lint happy * Make not modify normal emoji's behavior * Decrease status__action-bar's margin-top to 5px * Make the test be passed * Revert "Make the test be passed" This reverts commit 54a8c60e5907ef20a5ceb5ab2c86a933e06f3ece. * Revert "Make not modify normal emoji's behavior" This reverts commit 6a5bdf0c11df16ebd190cb3ab9d2e8f1349f435a.	2017-11-07 19:09:53 +01:00
ThibG	5d5c0f4f43	Twidere mention workaround (#5552) ... * Work around Twidere and Tootdon bug Tootdon and Twidere construct @user@domain handles from mentions in toots based solely on the mention text and account URI's domain without performing any webfinger call or retrieving account info from the Mastodon server. As a result, when a remote user has WEB_DOMAIN ≠ LOCAL_DOMAIN, Twidere and Tootdon will construct the mention as @user@WEB_DOMAIN. Now, this will usually resolve to the correct account (since the recommended configuration is to have WEB_DOMAIN perform webfinger redirections to LOCAL_DOMAIN) when processing mentions, but won't do so when displaying them (as it does not go through the whole account resolution at that time). This change rewrites mentions to the resolved account, so that displaying the mentions will work. * Use lookbehind instead of non-capturing group in MENTION_RE Indeed, substitutions with the previous regexp would erroneously eat any preceding whitespace, which would lead to concatenated mentions in the previous commit. Note that users will “lose” up to one character space per mention for their toots, as that regexp is also used to remove the domain-part of mentioned users for character counting purposes, and it also erroneously removed the preceding character if it was a space.	2017-11-07 19:08:14 +01:00
Eugen Rochko	1032f3994f	Add ability to disable login and mark accounts as memorial (#5615) ... Fix #5597	2017-11-07 19:06:44 +01:00
voidSatisfaction	e618edf85a	fix: slang to adequate word (#5453)	2017-11-07 14:49:50 +01:00
nullkal	b6e2e999bd	Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467) ... * Show the local couterpart of emoji when it exists in admin/custom_emojis * Fix indentation * Fix error * Add class table-action-link to Overwrite link * Make it enable to overwrite emojis * Make Code Climate happy	2017-11-07 14:49:32 +01:00
MIYAGI Hikaru	782224c991	Avoid emojifying on invisible text (#5558)	2017-11-07 14:48:13 +01:00
ThibG	84cfee2488	Do not process undeliverable mentions (#5598) ... * Resolve remote accounts when mentioned even if they are already known This commit reduces the risk of not having up-to-date public key or protocol information for a remote account, which is required to deliver toots (especially direct messages). * Do not add mentions in private messages for remote users we cannot deliver to Mastodon does not deliver private and direct toots to OStatus users, as there is no guarantee the remote software understands the toot's privacy. However, users currently do not get any feedback on it (Mastodon won't attempt delivery, but the toot will be displayed exactly the same way to the user). This change introduces *some* feedback by not processing mentions that are not going to be delivered. A long-term solution is still needed to have delivery receipts or at least some better indication of what is going on, but at least an user can see *something* is up.	2017-11-07 14:47:39 +01:00
ThibG	7bea1530f4	Resolve remote accounts when mentioned even if they are already known (#5539) ... This commit reduces the risk of not having up-to-date public key or protocol information for a remote account, which is required to deliver toots (especially direct messages).	2017-11-07 14:31:57 +01:00
nullkal	864c4d869f	Make fullscreen video in detailed status plays in fullscreen (Partly Fix #5160) (#5611) ... * Make fullscreen video in detailed status plays in fullscreen (Fix #5160) * Directly assign the initial state	2017-11-07 14:24:55 +01:00
kedama	d8cd9000d9	Hide disabled custom emojis from emoji picker and emoji auto suggestions. (#5613) ... Make the same behavior as /api/v1/custom_emojis.	2017-11-07 14:24:21 +01:00
kibigo!	bc8532359b	Mastodon GO! -> v0.1.1	2017-11-06 20:00:03 -08:00
kibigo!	e0298d66f8	Autocollapse boosts option	2017-11-05 15:05:12 -08:00
MIYAGI Hikaru	8abe9e9058	don't display any descendants of .invisible (#5567) ... * don't display any descendants of .invisible * reduce the scope of selector * remove some rules for image * lint	2017-11-05 13:05:50 +01:00
beatrix	73bf0ea7d1	Merge pull request #204 from glitch-soc/with-mastodon-go ... Introducing: Mastodon GO!	2017-11-04 09:14:08 -04:00
kibigo!	276432790a	Introducing: Mastodon GO!	2017-11-04 05:48:42 -07:00
Quenty31	da3adc0a73	l10n Occitan (#5586) ... * Update OC: time format Correction for time format according to: https://opinion.jornalet.com/conselh-linguistic-de-jornalet/blog/2379/la-notacion-oraria-en-occitan Harmonisation words in menu and confirmation windows * Update for unlisted custum emoji + #5577 * correction subjonctiu It's either siasque or siague * Corrections Any : qual que, in two words, else it means "some". And "siasque" with S even if I don't pronounce it at all. * Update oc.json	2017-11-03 17:42:30 +09:00
MitarashiDango	38d072446b	add account search condition (instance domain) (#5577)	2017-11-01 14:46:05 +01:00
Sorin Davidoi	5521e94e24	refactor(features/ui): Avoid useless renders in WrappedSwitch (#5580)	2017-11-01 12:17:53 +01:00
Yamagishi Kazutoshi	763a2f8511	Replace react-router-scroll to react-router-scroll-4 (#5568)	2017-11-01 06:58:38 +09:00
Nolan Lawson	60f962eedc	Refactor initial state: auto_play_gif (#5576)	2017-11-01 06:58:07 +09:00
Nolan Lawson	0692991b54	Add ServiceWorker caching for static assets (#5524)	2017-10-31 12:25:51 +01:00
Nolan Lawson	b254e6ca5f	Refactor initial state: "me" (#5563) ... * Refactor initial state: "me" * remove "me" from reducers/meta.js	2017-10-31 11:27:48 +09:00
SerCom_KC	29609fbb6a	Updating Chinese (Simplified) translations (#5508) ... * i18n: (zh-CN) fix punctuations and spaces Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines * i18n: (zh-CN) fix punctuation * i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677 * i18n: (zh-CN) Update missing translations * i18n: (zh-CN) Fixing errors * i18n: (zh-CN) Fix indent error * i18n: (zh-CN) Fix language tag * i18n: (zh-CN) Remove quotes * i18n: (zh-CN) Update translation (#5485) * i18n: (zh-CN) Remove whitespaces, x -> × * i18n: (zh-CN) Rewording on time distance * i18n: (zh-CN) Overall improvements * i18n: (zh-CN) i18n-tasks normalization * i18n: (zh-CN) Add missing translation	2017-10-30 12:34:58 +09:00
ThibG	d37a56c07c	Update remote ActivityPub users when fetching their toots (#5545)	2017-10-30 00:24:16 +09:00
Nolan Lawson	2cea4592a3	Avoid modifying emoji data inline (#5548)	2017-10-30 00:23:38 +09:00
Nolan Lawson	512feab222	Add margin to account for Edge disappearing scrollbar (#5522) ... * Add margin to account for Edge disappearing scrollbar * Fix 16px margin for DMs and horizontal line	2017-10-30 00:11:32 +09:00
Nolan Lawson	5e111ce16d	Reactor unfollow_modal, boost_modal, delete_modal (#5505)	2017-10-30 00:10:15 +09:00
Herbert Kagumba	3e9236b343	Separate Follow/Unfollow and back buttons (#5496)	2017-10-27 19:14:11 +02:00
ThibG	89c77fe225	Instantiate service classes for each call (fixes #5540) (#5543)	2017-10-27 19:08:30 +02:00
Nolan Lawson	e843f62f47	Avoid unnecessary Motion components in icon_button.js (#5544)	2017-10-27 19:08:07 +02:00
Nolan Lawson	ec487166db	Directly use <Motion/> if not reducing motion (#5546)	2017-10-27 19:06:54 +02:00
Nolan Lawson	3de22a82bf	Refactor initial state: reduce_motion and auto_play_gif (#5501)	2017-10-28 00:04:44 +09:00
David Yip	870d71b78b	Merge branch 'master' into gs-master	2017-10-27 09:45:25 -05:00
nullkal	781105293c	Feature: Unlisted custom emojis (#5485)	2017-10-27 16:11:30 +02:00
puckipedia	0cb329f63a	Allow ActivityPub Note's tag and attachment to be single objects (#5534)	2017-10-27 16:10:36 +02:00
Andrew	2827f852c0	Theme: Windows 95	2017-10-26 23:22:48 -07:00
Jenkins	656f5b6f87	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-10-26 15:08:34 +00:00
erin	22da775a85	Fix copying emojos: redirect to the page you were on (#5509)	2017-10-26 23:44:24 +09:00
David Yip	dd28b94cf0	Merge remote-tracking branch 'origin/master' into gs-master	2017-10-26 09:18:27 -05:00
りんすき	d556be2968	Fix column design broken with very long title (#5493) ... * Fix #5314 * fix not beautiful code * fix broken design with mobile view * remove no longer needed code	2017-10-26 22:52:48 +09:00
Nolan Lawson	02f7f3619a	Remove translateZ(0) on modal overlay (#5478)	2017-10-26 22:46:50 +09:00
beatrix	a2612d0d38	Merge pull request #179 from glitch-soc/keyword-mute ... Keyword muting	2017-10-25 17:37:48 -04:00
David Yip	42f2045c21	Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline	2017-10-25 16:01:20 -05:00
Jenkins	5f0268ab84	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2017-10-25 16:17:14 +00:00
Ratmir Karabut	20fee786b1	Update Russian translation (#5517) ... * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency * Update Russian translation * Update Russian translation (pluralizations) * Update Russian translation * Update Russian translation * Update Russian translation (pin) * Update Russian translation (account deletion) * Fix extra line * Update Russian translation (sessions) * Update Russian translation * Update Russian translation * Fix merge conflicts (revert) * Update Russian translation * Update Russian translation (fix) * Update Russian translation (fix quotes) * Update Russian translation (fix quotes) * Update Russian translation (fix) * Update Russian translation * Add quotes * bundle exec i18n-tasks normalize	2017-10-26 00:21:58 +09:00
Olivier Nicole	1ba3725473	Complete Esperanto translation (#5520)	2017-10-25 22:38:37 +09:00
David Yip	e40fe4092d	Remove nil check in Glitch::KeywordMute#=~. ... @regex can no longer be nil, so we don't need to check it.	2017-10-24 19:03:59 -05:00
David Yip	d9485e6497	Assume Glitch::KeywordMute#destroy! works and error out if it doesn't. ... There's nothing useful we can display if the destroy action messes up, so might as well assert it does and complain loudly if it doesn't.	2017-10-24 18:56:57 -05:00
David Yip	d5c8ebe205	Use edit template for displaying errors in update.	2017-10-24 18:56:44 -05:00
David Yip	d03b48cea0	Also filter notifications containing muted keywords.	2017-10-24 18:51:27 -05:00
David Yip	9226257a1b	Override Action View name inference in settings/keyword_mutes. ... Glitch::KeywordMute's name is inferred as glitch_keyword_mutes, and in templates this turns into e.g. settings/glitch/keyword_mutes. Going along with this convention means a lot of file movement, though, and for a UI that's as temporary and awkward as this one I think it's less effort to slap a bunch of as: options everywhere. We'll do the Right Thing when we build out the API and frontend UI.	2017-10-24 18:40:28 -05:00
David Yip	f5a3283976	Switch to Regexp.union for building the mute expression. ... Also make the keyword-building methods private: they always probably should have been private, but now I have encoded enough fun and games into them that it now seems wrong for them to *not* be private.	2017-10-24 18:31:34 -05:00
Ondřej Hruška	516eeeb43d	option to add title to <Button>, use for toot buttons (#197)	2017-10-24 19:08:07 +02:00
David Yip	8410d33b49	Only cache the regex text, not the regex itself. ... It is possible to cache a Regexp object, but I'm not sure what happens if e.g. that object remains in cache across two different Ruby versions. Caching a string seems to raise fewer questions.	2017-10-23 19:31:59 -05:00
David Yip	4f01e6e8d5	Merge remote-tracking branch 'origin/master' into gs-master	2017-10-22 22:57:41 -05:00
Matthew Walsh	a76b024228	Changes to match other timelines in 2.0	2017-10-22 18:45:35 -07:00
Matthew Walsh	3db80f75a6	Added a timeline for Direct statuses ... * Lists all Direct statuses you've sent and received * Displayed in Getting Started * Streaming server support for direct TL	2017-10-22 18:35:14 -07:00
David Yip	af8f06413e	KeywordMute matcher: more closely mimic Regexp#=~ behavior. ... Regexp#=~ returns nil if it does not match. An empty mute set does not match any status, so KeywordMute::Matcher#=~ ought to return nil also.	2017-10-22 01:12:21 -05:00
David Yip	1a60445a5f	Address unused translation errors.	2017-10-22 01:05:56 -05:00
David Yip	4c84513e04	Use current_account from ApplicationController. ... This avoids copy-pasting definitions of set_account.	2017-10-22 01:02:52 -05:00
David Yip	4b68e82a19	Don't add \b to whole-word keywords that don't start with word characters. ... Ditto for ending with \b. Consider muting the phrase "(hot take)". I stipulate it is reasonable to enter this with the default "match whole word" behavior. Under the old behavior, this would be encoded as \b\(hot\ take\)\b However, if \b is before the first character in the string and the first character in the string is not a word character, then the match will fail. Ditto for after. In our example, "(" is not a word character, so this will not match statuses containing "(hot take)", and that's a very surprising behavior. To address this, we only add leading and trailing \b to keywords that start or end with word characters.	2017-10-22 00:38:54 -05:00
David Yip	19826774f0	keyword mutes: also check spoiler (CW) text and reblogged statuses.	2017-10-22 00:38:53 -05:00
Marcin Mikołajczak	fdb0848e08	i18n: Update Polish Translation (#5494)	2017-10-22 08:34:39 +09:00
David Yip	ad86c86fa8	Apply keyword mutes to reblogs.	2017-10-21 15:44:47 -05:00
David Yip	670e6a33f8	Move KeywordMute into Glitch namespace. ... There are two motivations for this: 1. It looks like we're going to add other features that require server-side storage (e.g. user notes). 2. Namespacing glitchsoc modifications is a good idea anyway: even if we do not end up doing (1), if upstream introduces a keyword-mute feature that also uses a "KeywordMute" model, we can avoid some merge conflicts this way and work on the more interesting task of choosing which implementation to use.	2017-10-21 14:54:36 -05:00
David Yip	cd04e3df58	Fill in create, edit, update, and destroy for keyword mutes interface. ... Also add a destroy-all action, which can be useful if you're flushing an old list entirely to start a new one.	2017-10-21 14:54:36 -05:00
David Yip	4a64181461	Allow keywords to match either substrings or whole words. ... Word-boundary matching only works as intended in English and languages that use similar word-breaking characters; it doesn't work so well in (say) Japanese, Chinese, or Thai. It's unacceptable to have a feature that doesn't work as intended for some languages. (Moreso especially considering that it's likely that the largest contingent on the Mastodon bit of the fediverse speaks Japanese.) There are rules specified in Unicode TR29[1] for word-breaking across all languages supported by Unicode, but the rules deliberately do not cover all cases. In fact, TR29 states For example, reliable detection of word boundaries in languages such as Thai, Lao, Chinese, or Japanese requires the use of dictionary lookup, analogous to English hyphenation. So we aren't going to be able to make word detection work with regexes within Mastodon (or glitchsoc). However, for a first pass (even if it's kind of punting) we can allow the user to choose whether they want word or substring detection and warn about the limitations of this implementation in, say, docs. [1]: https://unicode.org/reports/tr29/ https://web.archive.org/web/20171001005125/https://unicode.org/reports/tr29/	2017-10-21 14:54:36 -05:00
David Yip	2e03a10059	Spike out index and new views for keyword mutes controller.	2017-10-21 14:54:36 -05:00
David Yip	4fa2f7e82d	Set up /settings/keyword_mutes. #164. ... This should eventually be accessible via the API and the web frontend, but I find it easier to set up an editing interface using Rails templates and the like. We can always take it out if it turns out we don't need it.	2017-10-21 14:54:36 -05:00
David Yip	b4b657eb1d	Invalidate cached matcher objects on KeywordMute commit. #164.	2017-10-21 14:54:36 -05:00
David Yip	693c66dfde	Use more idiomatic string concatentation. #164. ... The intent of the previous concatenation was to minimize object allocations, which can end up being a slow killer. However, it turns out that under MRI 2.4.x, the shove-strings-in-an-array-and-join method is not only arguably more common but (in this particular case) actually allocates *fewer* objects than the string concatenation. Or, at least, that's what I gather by running this: words = %w(palmettoes nudged hibernation bullish stockade's tightened Hades Dixie's formalize superego's commissaries Zappa's viceroy's apothecaries tablespoonful's barons Chennai tollgate ticked expands) a = Account.first KeywordMute.transaction do words.each { |w| KeywordMute.create!(keyword: w, account: a) } GC.start s1 = GC.stat re = String.new.tap do |str| scoped = KeywordMute.where(account: a) keywords = scoped.select(:id, :keyword) count = scoped.count keywords.find_each.with_index do |kw, index| str << Regexp.escape(kw.keyword.strip) str << '|' if index < count - 1 end end s2 = GC.stat puts s1.inspect, s2.inspect raise ActiveRecord::Rollback end vs this: words = %w( palmettoes nudged hibernation bullish stockade's tightened Hades Dixie's formalize superego's commissaries Zappa's viceroy's apothecaries tablespoonful's barons Chennai tollgate ticked expands ) a = Account.first KeywordMute.transaction do words.each { |w| KeywordMute.create!(keyword: w, account: a) } GC.start s1 = GC.stat re = [].tap do |arr| KeywordMute.where(account: a).select(:keyword, :id).find_each do |m| arr << Regexp.escape(m.keyword.strip) end end.join('|') s2 = GC.stat puts s1.inspect, s2.inspect raise ActiveRecord::Rollback end Using rails r, here is a comparison of the total_allocated_objects and malloc_increase_bytes GC stat data: total_allocated_objects malloc_increase_bytes string concat 3200241 -> 3201428 (+1187) 1176 -> 45216 (44040) array join 3200380 -> 3201299 (+919) 1176 -> 36448 (35272)	2017-10-21 14:54:36 -05:00
David Yip	a4851100fd	Make use of the regex attr_reader. #164. ... It would also have been valid to get rid of the attr_reader, but I like being able to reach inside KeywordMute::Matcher without resorting to instance_variable_get tomfoolery.	2017-10-21 14:54:36 -05:00
David Yip	603cf02b70	Rework KeywordMute interface to use a matcher object; spec out matcher. #164. ... A matcher object that builds a match from KeywordMute data and runs it over text is, in my view, one of the easier ways to write examples for this sort of thing.	2017-10-21 14:54:36 -05:00
David Yip	4745d6eeca	Spec out KeywordMute interface. #164.	2017-10-21 14:54:21 -05:00
David Yip	9093e2de7a	Add KeywordMute model. ... Gist of the proposed keyword mute implementation: Keyword mutes are represented server-side as one keyword per record. For each account, there exists a keyword regex that is generated as one big alternation of all keywords. This regex is cached (in Redis, I guess) so we can quickly get it when filtering in FeedManager.	2017-10-21 14:53:41 -05:00
Ondřej Hruška	d589dd7cd0	Compose buttons bar redesign + generalize dropdown (#194) ... * Generalize compose dropdown for re-use * wip stuffs * new tootbox look and removed old doodle button files * use the house icon for ...	2017-10-21 20:24:53 +02:00
beatrix	a7be86e875	hide mentions of muted accounts (in home col) (#190) ... * hide mentions of muted accounts (in home col) also cleans up some old crap * add test	2017-10-20 10:49:54 -04:00
kibigo!	21bafc6555	Updates to bio metadata script	2017-10-19 16:11:53 -07:00
Nolan Lawson	8392ddbf87	Remove unnecessary translateZ(0) when doing scale() (#5473)	2017-10-19 18:27:55 +02:00
David Yip	9423553e5c	Make the compose area optionally scrollable. ... On desktop, the compose text box grows to accommodate the content. On mobile, the text box does not grow to accommodate text context, but does grow to accommodate images. It is possible in both cases to overflow the available area, which makes accessing other UI elements (e.g. visibility setttings) difficult. This commit makes the compose area optionally scrollable, which allows those UI elements to remain available even if they go off-screen.	2017-10-19 10:59:50 -05:00
David Yip	90770f6d59	Merge pull request #185 from glitch-soc/fix-null-status ... workaround for null status	2017-10-18 17:01:31 -05:00
Ondřej Hruška	eb907a5bab	formatting fix for eslint	2017-10-18 23:44:06 +02:00
David Yip	39c9cdf7fe	Remove unused filesAttached property.	2017-10-18 13:20:45 -05:00
David Yip	86cf4468af	Update stylesheet imports in glitch components. ... Commit 6e54719474 moved the Mastodon variables and mixins deeper in the directory hierarchy; this commit brings the glitch components in line with that change.	2017-10-18 11:52:34 -05:00
David Yip	42e8c8eb0e	Merge tag 'v2.0.0' into gs-master	2017-10-18 11:52:04 -05:00
Sho Kusano	09d81defcd	Suppress type error(not a function) on calling fastSeek (#5452)	2017-10-18 17:13:51 +02:00
Renato "Lond" Cerqueira	26b2a6a71e	Fix pt-BR translation strings related to advanced search. (#5449)	2017-10-18 13:53:17 +02:00
Technowix	edf9a5e4fc	Revert #5438 for FR (#5450) ... As said here https://github.com/tootsuite/mastodon/pull/5438 the point of shortening the timestamp is legit, and after some time of adaptation no mistakes can be mades.	2017-10-18 13:51:30 +02:00
Håkan Eriksson	c710069c12	Some typos and supplementation in sentence structures (#5441) ... * Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete * Swedish - Typos and supplementation in sentence structure * Update simple_form.sv.yml * Update sv.yml * Update sv.yml Rearranged the alphabetical order.	2017-10-18 13:50:52 +02:00
JohnD28	e7099d8d9e	fr.json typo (realtive time) (#5447) ... Typo correction : https://fr.wikipedia.org/wiki/Heure#Typographie	2017-10-18 16:47:14 +09:00
YaQ	6e54719474	Make theme directory and Rename application.scss (#5336) ... * Rename application.scss * Move to 'default' directory * Follow review Move directory, and Rename "mastodon". * Revert rename * undo removal of newline	2017-10-18 05:20:07 +09:00
Eugen Rochko	f3003417c5	When unreblog arrives over streaming API, just delete in UI (#5439)	2017-10-17 22:17:02 +02:00
JeanGauthier	33ea042dec	i18n better wording (OC/CA/FR) + string added in FR (#5438) ... * Update oc.json * Update fr.json * Update ca.json * Update fr.json * Update simple_form.fr.yml * Update ca.json * Update fr.json * Update oc.json * Update oc.json * Update fr.json	2017-10-17 21:49:39 +02:00
Nolan Lawson	8b22a63ab0	Fix scrolling of dropdown when offscreen (#5434)	2017-10-17 20:38:16 +02:00
Eugen Rochko	05686cc99d	Fix unwanted content warning gap in CSS (#5436) ... Fix #5356	2017-10-17 20:07:44 +02:00
Eugen Rochko	484208ce12	When status is fetched instead of delivered, do not stream it (#5437)	2017-10-17 20:05:21 +02:00
unarist	3bc8924940	Don't capture scheme-less URLs in the status (#5435) ... Specifically, this fixes status length calculation to be same as JS side. BTW, since this pattern used in not only preview card fetching, we should extract it (with twitter-regex?) and write tests I think.	2017-10-17 18:32:25 +02:00
JeanGauthier	a02de9e012	i18n update (#5427) in OC/CA/FR/ES (#5431) ... * Update oc.json * Update ca.json * Update fr.json * Update es.json	2017-10-17 13:03:28 +02:00
unarist	2d395324e1	Fix React warning about tabIndex on status with CW (#5432)	2017-10-17 13:03:12 +02:00
Jakob Kramer	e6c9756fa9	Update German translation (#5425)	2017-10-17 12:02:47 +02:00
Yamagishi Kazutoshi	5050719fac	Add Japanese translations (#5427) ... * yarn manage:translations * Add Japanese translation for #5410 * Add Japanese translation for #5393	2017-10-17 11:47:05 +02:00
aschmitz	554c2fd8af	Clean up reblog tracking keys, related improvements (#5428) ... * Clean up reblog-tracking sets from FeedManager Builds on #5419, with a few minor optimizations and cleanup of sets after they are no longer needed. * Update tests, fix multiply-reblogged case Previously, we would have lost the fact that a given status was reblogged if the displayed reblog of it was removed, now we don't. Also added tests to make sure FeedManager#trim cleans up our reblog tracking keys, fixed up FeedCleanupScheduler to use the right loop, and fixed the test for it.	2017-10-17 11:45:06 +02:00
Håkan Eriksson	a2b600428c	Swedish translation (#5406) ... * Swedish file added * Swedish file added * Swedish file updated * Swedish languagefile added * Add Swedish translation * Add Swedish translation * Started the Swedish translation * Added Swedish lang settings * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Updating Swedish language * Swedish language completed and added * Swedish language Simple_form added * Swedish language Divise added * Swedish language doorkeeper added * Swedish language - now all file complete	2017-10-17 13:41:36 +09:00
Jeroen	df1a9c5ab5	Small update Dutch (nl) strings (#5424) ... * Update Dutch strings * Update Dutch	2017-10-17 01:00:23 +02:00
Ondřej Hruška	4421f6598f	Fix dual toot button wrong behavior after compose re-design	2017-10-16 23:32:13 +02:00
Ondřej Hruška	64a5e9a1de	workaround for null status	2017-10-16 23:09:39 +02:00
beatrix	7364b26e4b	Merge pull request #184 from tootsuite/master ... Fix reduced motion breaking public galleries (#5423)	2017-10-16 17:05:42 -04:00
David Yip	313ba202ef	Merge pull request #182 from glitch-soc/wide-tootbox-panel ... Full-width tootbox panel to make room for buttons	2017-10-16 15:49:22 -05:00
Ondřej Hruška	37ff061d9b	satisfy eslint and jest	2017-10-16 22:24:44 +02:00
Ondřej Hruška	3d7de06db4	rem a comment	2017-10-16 22:12:38 +02:00
Ondřej Hruška	26f08f0791	double-decker tootbox	2017-10-16 22:10:14 +02:00
Ondřej Hruška	8b9ee5f16b	Merge remote-tracking branch 'upstream/master' into upstream-merge-again	2017-10-16 21:13:47 +02:00
Ondřej Hruška	4b397adb5b	fix some lint errors	2017-10-16 21:13:34 +02:00
Nolan Lawson	8980aa804f	Fix reduced motion breaking public galleries (#5423)	2017-10-16 21:08:01 +02:00
Eugen Rochko	34118169ac	Keep references to all reblogs of a status on home feed (#5419) ... * Keep references to all reblogs of a status on home feed When inserting reblog: Add to set of reblogs of this status on the feed, if original status was present in the feed, add it to that set as well. When removing a reblog: Remove it from that set. Take random remaining item from the set. If one exists, re-insert it into feed, otherwise do not re-insert anything. Fix #4210 * When original is removed, toss out reblog references	2017-10-16 20:44:31 +02:00
David Yip	7e9d93472c	Merge remote-tracking branch 'upstream/master' into gs-master	2017-10-16 09:27:01 -05:00
David Yip	dbb1fce94d	Merge remote-tracking branch 'upstream/master' into gs-master	2017-10-16 09:23:59 -05:00
Eugen Rochko	7cc71748ce	Ensure that feed renegeration restores non-zero items (#5409) ... Fix #5398 Ordering the home timeline query by account_id meant that the first 100 items belonged to a single account. There was also no reason to reverse-iterate over the statuses. Assuming the user accesses the feed halfway-through, it's better to have recent statuses already available at the top. Therefore working from newer->older is ideal. If the algorithm ends up filtering all items out during last-mile filtering, repeat again a page further. The algorithm terminates when either at least one item has been added, or if the database query returns nothing (end of data reached)	2017-10-16 16:08:51 +02:00
Eugen Rochko	aec70b44fc	Filter out duplicate IDs in timelines reducer (#5417) ... Possibly the cause of #5379, #5377	2017-10-16 15:59:30 +02:00
unarist	6f490b4bfe	Fix un-reblogged status being at wrong position in the home timeline (#5418) ... We've changed un-reblogging behavior when we implement Snowflake, to insert un-reblogged status at the position reblogging status existed. However, our API expects home timeline is ordered by status ids, and max_id/since_id filters by zset score. Due to this, un-reblogged status appears as a last item of result set, and timeline expansion may skips many statuses. So this reverts that change...reblogged status inserted at corresponding position to its id.	2017-10-16 15:58:23 +02:00
voidSatisfaction	03975dbde4	Add up-to-date korean translation on client (#5402) ... * chore: add Korean translation for client * fix: change unlisted and embed Korean words	2017-10-16 14:39:28 +02:00
KY	f72936b4e6	Fix #5082 - disable retweet link for followers only toot (#5397) ... * Fix #5082 - disable retweet link for followers only toot * Hide reblog count when it is a direct message	2017-10-16 14:10:12 +02:00
Marcin Mikołajczak	3c530d95f6	i18n: Update Polish translation (#5416) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2017-10-16 14:09:51 +02:00
JeanGauthier	1e7b3bf625	i18n ultim hour «More» dropdown title + reduce motion (#5415) ... * Correction fem. form * More dropdown title * More dropdown title * More dropdown title * Add option to reduce motion (#5393)	2017-10-16 14:09:26 +02:00
Yamagishi Kazutoshi	bf0ee1a25c	Enable ESLint rules import/* (#5414) ... * Enable ESLint rules import/* * fix	2017-10-16 11:12:09 +02:00
Nolan Lawson	fa0be3f834	Add option to reduce motion (#5393) ... * Add option to reduce motion * Use HOC to wrap all Motion calls * fix case-sensitive issue * Avoid updating too frequently * Get rid of unnecessary change to _simple_status.html.haml	2017-10-16 09:36:15 +02:00
Nolan Lawson	981e20b03a	Fix offline-plugin warning in dev mode (#5411)	2017-10-16 09:33:50 +02:00
Yamagishi Kazutoshi	d5b767c374	Replace JavaScript Testing Framework from Mocha to Jest (#5412)	2017-10-16 09:33:08 +02:00
Nolan Lawson	93b54b8d4b	i18n "More" dropdown title (#5410)	2017-10-16 09:31:47 +02:00
Nolan Lawson	e7ab9bf8b4	Refactor and simplify icon_button.js (#5413)	2017-10-16 09:30:09 +02:00
David Yip	6cd5b3bbe5	Merge remote-tracking branch 'origin/master' into gs-master	2017-10-16 01:29:02 -05:00
David Yip	f72ad67a39	Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification ... Avatar unification, mk.II	2017-10-16 00:49:05 -05:00
Matthew Walsh	56094cb4bd	1.6 changed files for unified avatar styling -- updated to restore unity	2017-10-15 21:14:21 -07:00
David Yip	22df18e902	Merge pull request #173 from glitch-soc/zerowidthmoji ... use zerowidth spaces with emojis	2017-10-15 20:04:19 -05:00
Eugen Rochko	894da3dcca	Clear timer when unmounting RelativeTimestamp components (#5408) ... Possibly the cause of #5379, #5377	2017-10-16 03:03:36 +02:00
JeanGauthier	8eb7d30a6c	l10n Occitan: finishing touches (#5404) ... * Update oc.json * Update oc.yml	2017-10-15 23:07:32 +02:00
Yannick A	7fe1428cc4	Update French translation (#5401)	2017-10-15 21:21:05 +09:00
Lynx Kotoura	b3b4b5a2eb	Adjust public hashtag pages (#5357)	2017-10-14 14:48:12 +02:00
unarist	8125fdc19f	Use atomUri in Undo activity of Announce (#5376) ... This allows deletion of reblogs which delivered before with OStatus URI.	2017-10-14 14:42:09 +02:00
Ondřej Hruška	ae716a12e1	replace newlines in desktop notif with spaces instead of removing them (#5361)	2017-10-14 14:41:12 +02:00
spla	f63a40e7c2	Updated Catalan strings (#5323) ... * Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Update ca.json Removed : <<<<<<< HEAD "getting_started.support": "{faq} • {userguide} • {apps}", ======= >>>>>>> upstream/master * Syncing to master * Added new Catalan strings * removed config.secret_key line * Corrected <sotrong> tag to <strong> Line 515 * Removed extra line * Reverted * yarn.lock reverted * Updated Catalan strings * Updated Catalan strings	2017-10-14 14:40:35 +02:00
KY	1bdd694a0a	Fix #5351 - Redirection with page params after copy emoji (#5387) ... * Fix #5351 - Redirection with page params after copy emoji * Add page params to copy emoji link	2017-10-14 14:40:10 +02:00
abcang	2eab41cd1a	Close connection when succeeded posting (#5390) ... * Close connection when succeeded posting * Update webmock	2017-10-14 14:38:57 +02:00
Yannick A	c6f76db2e1	Update French translation (#5384) ... Update French translation	2017-10-14 14:30:19 +02:00
Masoud Abkenar	2c704ca9c6	l10n: update Persian translation for 2.0 (#5391)	2017-10-14 14:28:19 +02:00
Ondřej Hruška	cdc22d23b9	Doodle improvements 2 (#176) ... * Fix some doodle bugs and added Background color functionality * added protections against accidental doodle erase, screen size changing * resolve react warning about 'selected' on <option>	2017-10-14 12:24:35 +02:00
Jakob Kramer	eb96aa86a4	Update German translation (#5389)	2017-10-14 19:00:23 +09:00
Ondřej Hruška	531dadad86	Doodle palette, options, fill tool (#172)	2017-10-14 00:58:38 +02:00
Ondřej Hruška	723890b6fa	use zerowidth spaces for emojis	2017-10-14 00:48:53 +02:00
Ondřej Hruška	2af964ef20	Fixed a bug where the canvas would get transparent bg upon erase	2017-10-13 18:13:00 +02:00
Ondřej Hruška	33e806217f	Initial doodle support	2017-10-13 18:07:01 +02:00
Jeroen	c35132a738	Dutch strings: small change (#5375) ... * Dutch strings: small change * And this too.	2017-10-13 18:03:56 +02:00
unarist	a1c54220e8	Optimize Status#permitted_for 500x (account timeline) (#5373) ... The main change of this PR is removing `order by visibility` hack. This was introduced to force using of `index_statuses_on_account_id` instead of PK index, but it seems no longer needed probably due to `index_statuses_on_account_id_id`. Removing this avoids reading all rows, so really improves first fetching of the user who has lot of statuses. I have also changed JOIN to IN + subquery, which slightly faster in most cases.	2017-10-13 16:53:43 +02:00
Eugen Rochko	df7dbc41ae	Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5371) ... This error occurred at least in development environment	2017-10-13 16:44:43 +02:00
Eugen Rochko	b8db386e05	Fix UserTrackingConcern firing on every request, optimize some queries (#5368) ... - For some reason, :if option on before_action did not work. It got executed every time, returned false, and the action run anyway, which led to the current_sign_in_at and sign_in_count being updated on every request - Return "do not filter" early in FeedManager#filter_from_home? if the status is authored by receiver. Usually this method is not called for own statuses at all, but it is called when Feed#get uses the database - Return early if #reload_stale_associations! has nothing to load to save a database query with WHERE 1=0	2017-10-13 16:44:29 +02:00
Eugen Rochko	48f7a58799	Do not try to guess why home timeline is empty in web UI (#5370) ... * Do not try to guess why home timeline is empty in web UI * Fix style issue	2017-10-13 16:44:16 +02:00
Eugen Rochko	388d093beb	When unfollowing, remove from home in web UI immediately (#5369) ... Do NOT send "delete" through streaming API when unmerging from home timeline. "delete" implies that the original status was deleted, which is not true!	2017-10-13 16:44:02 +02:00
ThibG	95fe20b78a	Fix remote status fetching for “pure” ActivityPub WEB_ACCOUNT users (#5372) ... Remote ActivityPub users that have never been known as OStatus users (whether or not they support it) will not have a “remote_url” attribute set. In case they reside on an instance with WEB_DOMAIN ≠ LOCAL_DOMAIN, the current check did rely on “remote_url” to verify the user's domain.	2017-10-13 12:58:13 +02:00
Yamagishi Kazutoshi	dc91fd482a	Set InstancePresenter to Auth::RegistrationsController#create (#5366)	2017-10-13 09:35:07 +02:00
Lex Alexander	b8bae96647	Retoot count increases without reason (#5363) ... * Retoot count increases without reason -The store_uri method for Statuses was being called on after_create and causing reblogs to be incremented twice. -This calls it when the transaction is finished by using after_create_commit. -Fixes #4916. * Added test case for after_create_commit callback for checking reblog count. * Rewrote test to keep original, but added one for only the after_create_commit callback.	2017-10-13 02:52:09 +02:00
ThibG	d37305c628	Reduce discrepancies between server and client-side character count (#5360)	2017-10-12 23:26:34 +02:00
Anna e só	ad917cda10	l10n: PT-BR translation updated (#5362) ... * PT-BR translation updated * Testing * Indentation error fixed * More indentation errors fixed	2017-10-13 06:16:43 +09:00
Ondřej Hruška	df626fdd43	Fix the notification bug with newlines	2017-10-12 21:28:17 +02:00
David Yip	6a2b1ba91e	Another tabs-vs-spaces fix, but with ~feeling~	2017-10-12 09:36:26 -05:00
Alda Marteau-Hardi	3cfcc7a50e	Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)	2017-10-12 16:31:14 +02:00
David Yip	fe1c20cfb9	Fix tabs-vs-spaces issue pointed out by eslint.	2017-10-12 09:23:06 -05:00
JeanGauthier	cb7ba23cd8	Update oc.json (#5343)	2017-10-12 15:40:45 +02:00
unarist	35ec1c91e3	Fix some failure cases on FetchLinkCardService (#5347) ... * If OEmbed response doesn't have a required property `type`, ignore it. e.g. `NoMethodError: undefined method 'type' for ...` * If we failed to detect encoding, fallback to default behavior of Nokogiri. e.g. `KeyError: key not found: :encoding`	2017-10-12 12:01:32 +02:00
David Yip	edd1a00faf	Restore variable assignment in MuteService#call. ... 291feba6f1 made MuteService return the result of Account#mute!; this commit restores that behavior.	2017-10-12 04:27:45 -05:00
David Yip	13e05fece2	Merge tag 'v2.0.0rc2' into gs-master	2017-10-12 04:22:59 -05:00
Sylvhem	3ebe03b729	Fixes and updates for the French translation (#5340) ... * Ajout du support des thèmes multiples Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples. Add translations for the new strings allowing support for multiple themes. * Mise à jour de la traduction Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas. Update modified strings and add new translations for the ones who are missing them. * Remplace « ' » par « ’ » Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019). En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux. Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019). In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.	2017-10-12 00:58:01 +02:00
Ondřej Hruška	eeaa8fba43	Fix our media gallery not having alt text and tooltips	2017-10-11 22:02:24 +02:00
Ondřej Hruška	b0b5ff1b0f	workaround for scrollIntoView bug ???	2017-10-11 21:49:22 +02:00
Ondřej Hruška	bd51a16150	add duck beaks in haml	2017-10-11 21:34:00 +02:00
Ondřej Hruška	0bf9261e65	Merge remote-tracking branch 'upstream/master'	2017-10-11 21:27:17 +02:00
Jeroen	6bc07d3de3	Updating Dutch strings for 2.0 (#5334)	2017-10-11 21:21:22 +02:00
Alda Marteau-Hardi	0352c40e99	Use gender neutral language as in the rest of the french translation (#5331)	2017-10-11 21:20:56 +02:00
Lynx Kotoura	07ea625cb2	Fix styles of error pages (#5335) ... Signed-off-by: Lynx Kotoura <admin@sanin.link> Signed-off-by: Lynx Kotoura <admin@sanin.link>	2017-10-11 21:18:45 +02:00
kibigo!	3cc6255a7e	Removed length check which now happens in reducer	2017-10-11 11:50:11 -07:00
kibigo!	35e2cad4eb	Fixed header emojification	2017-10-11 11:00:28 -07:00
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	2017-10-11 10:43:10 -07:00
takayamaki	27101f1beb	fix presented og:url is incorrect (#5320)	2017-10-11 19:22:21 +02:00
Eugen Rochko	1823cf435a	In thread view, only scroll first update, scroll to replied-to post (#5322)	2017-10-11 19:21:44 +02:00
Nolan Lawson	6a50329a9c	Only preload JS in /web pages (#5325)	2017-10-11 19:20:55 +02:00
Eugen Rochko	476e79b8e3	Fully disable hotkeys when input element is focused (#5324) ... Because alt+n is a way to enter some kinda letter on some keyboard	2017-10-11 16:31:07 +02:00
JohnD28	19d3317a69	Update french translation : mastodon/locales/fr.json (#5318) ... * Update fr.json * Update fr.json * Update fr.json	2017-10-11 22:07:09 +09:00
ButterflyOfFire	38600b2792	Update ar.json (#5316) ... Pushing new arabic translated strings for Mastodon web client.	2017-10-11 21:19:04 +09:00
unarist	b0407ece42	Fix an error when ancestors get loaded before the status itself (#5312) ... When ancestors get loaded, we scroll to the target status (i.e. skip ancestors). However, ancestors may get loaded before the status itself, then it causes TypeError because `this.node` is undefined yet. Since we don't show anything until the status gets loaded, we don't need to scroll to the target status in this time. If we get the status itslef later, it causes `componentDidUpdate` and scrolling correctly.	2017-10-11 11:25:15 +02:00
Eugen Rochko	b3d7ad958f	Fix #5306: Stop hotkeys in input fields even when shift is pressed (#5309) ... AZERTY layouts require pressing shift to press a number at all, so it triggers a column switch even when simply typing numbers in textarea	2017-10-11 01:01:17 +02:00
takayamaki	552d22bec9	sign_in and sign_up views present og meta infos (#5308)	2017-10-11 00:52:25 +02:00
Eugen Rochko	9815be2a44	Fix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305)	2017-10-10 20:47:14 +02:00
Eugen Rochko	61d3ecc805	Fix custom emoji copy not copying file (#5298)	2017-10-10 15:18:27 +02:00
Eugen Rochko	4bb3e4eeba	Fix #5295 - Order custom emoji lexicographically (#5297)	2017-10-10 15:18:12 +02:00
unarist	784c7510d7	Fix an error when video playback buffer is empty (#5300)	2017-10-10 15:17:53 +02:00
nullkal	6c54d2e583	foreign_key, non-nullable, dependent: destroy in account_moderation_notes (#5294) ... * Add foreign key constraint to column `account` in `account_moderation_notes` * Change account_id and target_account_id to non-nullable in account_moderation_notes * Add dependent: :destroy to account and target_account in account_moderation_notes	2017-10-10 13:12:17 +02:00
Eugen Rochko	1c6fc0e4ce	Center error layout (#5289)	2017-10-09 20:51:36 +02:00
Akihiko Odaki	cc796298c9	Fix pagination in Api::V1::BlocksController (#5285)	2017-10-09 17:30:31 +02:00
beatrix	f0a2a6c875	try to tighten up local only toot stuff, like... properly (#163) ... * try to tighten up local only toot stuff, like... properly * try to un-break tests	2017-10-09 09:56:17 -04:00
Eugen Rochko	6e9e0c14e6	Fix dependency of error page generation on database (#5280)	2017-10-09 10:05:10 +02:00
Eugen Rochko	3888a12c79	Fix #5272 - Order of checks in ActivityPub handler (#5276)	2017-10-08 22:03:34 +02:00
Eugen Rochko	cfa68907ae	Fix #5271 - Fix missing attribute in remove_from_feed (#5277) ... Regression from #4801	2017-10-08 21:55:34 +02:00
Eugen Rochko	488584bfc1	Track frequently used emojis in web UI (#5275) ... * Track frequently used emojis in web UI * Persist emoji usage, but debounce commits to the settings API * Fix #5144 - Add tooltips to picker * Display only 2 lines of frequently used emojis	2017-10-08 21:47:15 +02:00
Eugen Rochko	0717d9b3e6	Set snowflake IDs for backdated statuses (#5260) ... - Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity - Skip for statuses coming from inbox, aka delivered in real-time - Skip for statuses that claim to be from the future	2017-10-08 17:34:34 +02:00
Eugen Rochko	6e4046fc3f	Fix #5178 - Use object URI only in Announce, instead of embedding (#5266)	2017-10-08 14:41:59 +02:00
Ondřej Hruška	92a3181dc6	improve static page metadata look	2017-10-08 10:46:59 +02:00
JeanGauthier	94f15338c3	i18n update Occitan (#5263) ... * Update oc.json * Update oc.yml * Update oc.yml * Update oc.json	2017-10-08 14:18:27 +09:00
Nolan Lawson	db33a53ee8	Video preload should be a string (#5267)	2017-10-08 03:06:43 +02:00
Nolan Lawson	7de6d269d2	Use ES module build of react-router-dom (#5264)	2017-10-08 02:55:58 +02:00
Eugen Rochko	684001d729	Dynamically calculate card height for embeds instead of padding (#5265) ... The padding trick was hard-coded to a 16:9 ratio, but we can use width and height provided from OEmbed information and width of the card itself to calculate a new height	2017-10-08 02:34:49 +02:00
Eugen Rochko	292f3cd7e0	Show buffering in video player (#5261)	2017-10-08 02:33:08 +02:00
beatrix	7cc0da756d	Merge pull request #161 from DJSundog/audio-uploads-feature ... Audio uploads feature	2017-10-07 20:13:53 -04:00
DJ Sundog	979b0d66a7	update indentation	2017-10-07 13:53:46 -07:00
DJ Sundog	6ca03a7f58	add faststart to audio transcoding	2017-10-07 19:59:22 +00:00
DJ Sundog	96ba3482b9	adding support for audio uploads, transcoded to mp4 videos	2017-10-07 19:54:10 +00:00
nullkal	633426b261	Add moderation note (#5240) ... * Add moderation note * Add frozen_string_literal * Make rspec pass	2017-10-07 20:26:43 +02:00
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237)	2017-10-07 20:00:35 +02:00
Eugen Rochko	d2dee6ea43	Fix custom emoji in emoji picker, persist skin tone (#5258)	2017-10-07 19:02:30 +02:00
Eugen Rochko	967e70663f	In REST API, when URL can be missing, cast it to nil (#5259)	2017-10-07 18:55:48 +02:00
MitarashiDango	b7e65a004f	Japanese translation (relative time) (#5251)	2017-10-08 01:32:03 +09:00
Eugen Rochko	3a3475450e	Encode custom emojis as resolveable objects in ActivityPub (#5243) ... * Encode custom emojis as resolveable objects in ActivityPub * Improve code style	2017-10-07 17:43:42 +02:00
Nolan Lawson	057db0ecd0	Update emoji-mart to v2.1.1 (#5256)	2017-10-07 12:17:02 +02:00
Eugen Rochko	11436358b4	Fix regression from #5206 - deduplicate descendants (#5253)	2017-10-07 12:16:39 +02:00
kibigo!	6610d57f91	Basic static metadata styling	2017-10-06 22:22:34 -07:00
Eugen Rochko	45682f876d	Make auto-play GIFs preference affect custom emojis in web UI (#5254)	2017-10-07 02:38:52 +02:00
Lynx Kotoura	5a2c7bd4ce	Fix overflowing in web UI (#5246) ... * Fix overflowing in web UI * Revert fixing dropdown menu modal	2017-10-06 20:40:17 +02:00
unarist	5c8ca024ef	Improve error handling on LinkCrawlWorker (#5250) ... * Improve error handling on LinkCrawlWorker * Ignore TimeoutError and InvalidURIError too * Record errors to debug log * Enable dead job queue on LinkCrawlWorker Since most of acceptable errors were already ignored, only our side issue should go to dead job queue. * Ignore all http gem errors	2017-10-06 20:39:08 +02:00
unarist	d8b2f89d33	Fix remote profile being displayed in HTML on remote_follow (#5249)	2017-10-06 20:38:29 +02:00
K.SHIRAKASHI	d5f490b1a2	Fix error on reloading status detail column (#5248)	2017-10-06 20:37:56 +02:00
MIYAGI Hikaru	6f2d88dd28	Fix error at emoji_compressed in Firefox ESR (#5241)	2017-10-06 16:40:41 +02:00
Lynx Kotoura	daa59dd454	Fix theme settings (#5242)	2017-10-06 13:29:53 +02:00
Nolan Lawson	72d939b69f	Fix thinking_face emoji autocomplete (#5238)	2017-10-06 12:03:13 +02:00
Ondřej Hruška	37e141bccb	comment out unused stuff with Video	2017-10-06 09:23:28 +02:00
Nolan Lawson	97b3d0cd56	Import only Spring/Motion from react-motion (#5236)	2017-10-06 03:46:15 +02:00
Nolan Lawson	fd7f0732fe	Compress and combine emoji data (#5229)	2017-10-06 03:42:34 +02:00
Nolan Lawson	2aca22b8ea	import only Overlay from react-overlays (#5235)	2017-10-06 03:24:33 +02:00
Eugen Rochko	7db0f8dcb2	Implement hotkeys for web UI (#5164) ... * Fix #2102 - Implement hotkeys Hotkeys on status list: - r to reply - m to mention author - f to favourite - b to boost - enter to open status - p to open author's profile - up or k to move up in the list - down or j to move down in the list - 1-9 to focus a status in one of the columns - n to focus the compose textarea - alt+n to start a brand new toot - backspace to navigate back * Add navigational hotkeys The key g followed by: - s: start - h: home - n: notifications - l: local timeline - t: federated timeline - f: favourites - u: own profile - p: pinned toots - b: blocked users - m: muted users * Add hotkey for focusing search, make escape un-focus compose/search * Fix focusing notifications column, fix hotkeys in compose textarea	2017-10-06 01:07:59 +02:00