tootlab-mastodon

Commit Graph

Author	SHA1	Message	Date
ThibG	55abff8af7	Various fixes to scrollable lists and media gallery (#9501 ) * Always use the scrollable class for the ScrollList component Fixes #9499 as well as empty timelines' scrollbar “blinking” between loading state and empty state. * Do not display empty message when the list is known to have more elements Fixes #9500 * Fix LoadMore usage in account media gallery (Even though that codepath is probably never actually used…) * Make account media gallery more consistent with account timeline Fixes #9498 Display “load more” more consistently, add a loading indicator on first load. * Fix “load more” button when no data has been fetched	2018-12-12 22:32:44 +01:00
ysksn	b048926e67	Create Settings::BaseController (#9507 ) Define `Settings::BaseController#set_body_classes` so that sub classes inherit `Settings::BaseController` don't need to define `#set_body_classes` agein.	2018-12-12 22:32:13 +01:00
ysksn	83975a2394	Remove redundant (#9503 )	2018-12-12 05:54:34 +01:00
ysksn	351ed12b2f	Use find_or_initialize_by (#9504 )	2018-12-12 05:54:09 +01:00
ThibG	cf6ee4ff24	Add admin ability to remove an user's header image (#9495 ) * Fix markup in admin/accounts/:id table for avatar * Add admin ability to remove an user's header image	2018-12-11 19:28:03 +01:00
ThibG	720daa8143	Add instance-wide setting to disable profile directory (#9497 ) * Add instance-wide setting to disable profile directory Fixes #9496 When the profile directory is disabled: - The “discoverable” setting is hidden from users - The “profile directory” link is not shown on public pages - /explore returns 404 * Move Setting.profile_directory check to a before_action filter	2018-12-11 19:18:29 +01:00
Yamagishi Kazutoshi	9650bbc8b2	[i18n] Update Occitan (#9491 ) * Adds the Profil directory * Adds the line about directory * Harmonisation * Update oc.yml * i18n-tasks normalize && i18n-tasks remove-unused * yarn manage:translations	2018-12-11 05:38:57 +01:00
Adam Copp	7d00e4edbd	Make custom emoji domains case insensitive #9351 (#9474 ) * Make custom emoji domains case sensitive #9351 * Fixup style in downcase_domain to comply with codeclimate. * switch if! to unless * Don't use transactions, operate in batches. Also revert spurious schema change.	2018-12-11 05:30:57 +01:00
Eugen Rochko	dbb1ee269f	Improve e-mail MX validator and add tests (#9489 )	2018-12-10 22:53:25 +01:00
ysksn	ed24bb2c3e	Add specs for activitypub collections controller (#9484 ) * Add specs for ActivityPub::CollectionsController#show * Raise ActiveRecord::RecordNotFound Raising ActiveRecord::NotFound raises NameError: uninitialized constant ActiveRecord::NotFound.	2018-12-10 21:39:25 +01:00
ysksn	189a6b17fb	Remove RemoteAccountControllerConcern never used (#9482 )	2018-12-10 21:38:01 +01:00
ysksn	361818e931	Fix Admin::TagsController#unhide (#9481 )	2018-12-10 21:37:38 +01:00
Thibaut Girka	4f59d1efd7	Fix directory controller in glitch-soc	2018-12-09 16:08:10 +01:00
Thibaut Girka	480f938511	[Glitch] Fix various things in the directory Port `ecd303c097` to glitch-soc	2018-12-09 16:08:10 +01:00
Thibaut Girka	0b1bc66695	Port directory CSS changes from upstream Port `73be8f38c1` to glitch-soc	2018-12-09 16:08:10 +01:00
Thibaut Girka	e7f1bfdc2d	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/javascript/packs/public.js - app/models/user.rb - config/settings.yml - db/schema.rb Moved public.js changes to settings.js.	2018-12-09 16:08:04 +01:00
ThibG	81bda7d67c	Add setting to not aggregate reblogs (#9248 ) * Add setting to not aggregate reblogs Fixes #9222 * Handle cases where user is nil in add_to_home and add_to_list * Add hint for setting_aggregate_reblogs option * Reword setting_aggregate_reblogs label	2018-12-09 13:03:01 +01:00
Eugen Rochko	6b78e5b5ab	Cache hashtag sample accounts, and exclude ineligible ones (#9465 )	2018-12-08 01:32:26 +01:00
Eugen Rochko	4638b16822	Make notification time smaller and reduce contrast (#9464 )	2018-12-08 00:40:11 +01:00
Paweł Ngei	5c7f641565	Escape HTML in profile name preview in profile settings (#9446 ) * fix non-escaped html in the profile settings * provide a default profile text in case if there's no custom one * update haml syntax * simplify default profile name to username * sanitize user-input html but display emojified icons	2018-12-07 16:42:22 +01:00
Eugen Rochko	ecd303c097	Fix various things in the directory (#9449 ) * Fix missing variable in directory page title * Order hashtags by number of people instead of alphabetically * Add icon to OpenGraph preview of directory page * Prevent line breaks in hashtags and ensure lowercase in the table	2018-12-07 16:37:32 +01:00
Takeshi Umeda	c1c0f7c516	Fix tag mb_chars comparison of profile directory (#9448 )	2018-12-07 04:18:37 +01:00
ThibG	e3682c9c17	Merge pull request #848 from ThibG/glitch-soc/merge-upstream Merge upstream changes	2018-12-06 17:40:43 +01:00
Eugen Rochko	73be8f38c1	Add profile directory (#9427 ) Fix #5578	2018-12-06 17:36:11 +01:00
Thibaut Girka	4167ed375b	Fix mention links in detailed statuses not opening in the WebUI	2018-12-06 15:31:21 +01:00
Thibaut Girka	1df392819d	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-06 12:44:38 +01:00
ThibG	1a22eff1e0	Attempt fixing deadlocks by moving account stats update outside transaction (#9437 ) * Use `update_column` instead of `update_attribute` in callback `update_attribute` would normally cause callbacks to be called. Called from a callback, it seems to stop further callbacks from executing. `update_column` does the same work, but without calling callbacks or preventing other callbacks from executing. * Fix deadlocks by moving account stats update outside transaction	2018-12-05 22:51:12 +01:00
Paweł Ngei	9897cf0701	Add visible dates for notifications in Notification column (#9423 ) * add RelativeTimestamp elements * style the elements properly with CSS	2018-12-05 05:08:43 +01:00
ThibG	e88c6a5c3c	Fix thread depth computation in statuses_controller (#9426 ) * Add test that should currently fail * Fix depth computation (will still fail if statuses have been filtered out) * Fix handling of broken threads	2018-12-05 02:12:29 +01:00
Eugen Rochko	6ddf0432e7	Improve account suspension speed and completeness (#9290 ) - Some associations were missing from the clean-up - Some attributes were not reset on suspension - Skip federation and streaming deletes when purging a dead domain - Move account association definitions to concern	2018-12-03 01:32:08 +01:00
David Yip	fe9340d95e	Merge pull request #838 from ThibG/glitch-soc/features/reply-all-streaming-entries Display a double reply arrow on public pages for toots that are replies	2018-12-02 16:30:52 -06:00
Thibaut Girka	a07e37cc17	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
Thibaut Girka	4b85bf12ab	Fix since_id	2018-12-01 18:59:24 +01:00
ThibG	5648b30d6c	Fix last_status parameter for notifications and conversations (#9407 )	2018-12-01 18:36:41 +01:00
Quentí	6a285f0a15	[i18n] update and corrections for Occitan locale (#9404 ) * Update + correction Colomna and not columna Pòt, verb missing * Correction D’aquí is followed by a time period, and dins by a season. Read : https://github.com/briannesbitt/Carbon/pull/1403 for more details. * Correction admin zone * Correction Reïnicializacion, with the funny ï	2018-12-01 17:39:13 +01:00
Paweł Ngei	b9ec34de57	Add a tooltip explaining what a locked account is (#9403 ) * create a title tooltip explaining what a locked account is * improve phrasing * minor phrasing fix to unify default and english	2018-12-01 14:25:15 +01:00
ThibG	3cbe0c26bb	Merge pull request #837 from ThibG/glitch-soc/merge-upstream Merge upstream changes	2018-11-30 22:37:58 +01:00
Thibaut Girka	76320bf6d8	Scroll to selected toot even if the ancestors happen to be loaded	2018-11-30 22:37:38 +01:00
Thibaut Girka	a10fee3c09	Scroll to detailed status when new ancestors get inserted	2018-11-30 22:37:38 +01:00
Thibaut Girka	31599ad91c	[Glitch] Fix bug in order of conversations in web UI Port `e18390cfe6` to glitch-soc	2018-11-30 22:37:38 +01:00
Thibaut Girka	837ea32c88	[Glitch] Replace recursion in status mapStateToProps Port `dfbadd6837` to glitch-soc	2018-11-30 22:37:38 +01:00
Thibaut Girka	a28f5695f3	[Glitch] Fix context building in the reducer Port `7706ed038f` to glitch-soc	2018-11-30 22:37:38 +01:00
Thibaut Girka	1624a95b2b	[Glitch] Introduce flat layout to contexts reducer Port `023fe5181b` to glitch-soc	2018-11-30 22:37:38 +01:00
Thibaut Girka	1a5de04789	Display a double reply arrow on public pages for toots that are replies	2018-11-30 22:09:52 +01:00
Thibaut Girka	bc8411ec87	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-30 20:16:26 +01:00
mayaeh	bfec030a4e	Fix that translation is not applied to "joining hashtags" (#9397 )	2018-11-30 19:36:09 +01:00
Eugen Rochko	3948b6fa52	Remove npm-run-all dependency (#9401 ) Fix #9359	2018-11-30 19:16:32 +01:00
Thibaut Girka	ad7a3974cc	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-29 19:22:52 +01:00
Thibaut Girka	6a264c9379	Improve detailed status component lifecycle - Move componentWillMount and componentWillReceiveProps logic to getDerivedStateFromProps. - Compute CW auto-unfold status earlier	2018-11-29 18:32:42 +01:00
ThibG	fa9f28f52d	Swap avatar and header input fields in profile page (#9271 ) Fixes #9211	2018-11-29 02:56:09 +01:00
Thibaut Girka	7e63fb26e0	Do not hardcode preferences link, pleroma doesn't have it	2018-11-28 22:36:01 +01:00
Thibaut Girka	922d05864f	Add error boundary component to catch Web UI crashes	2018-11-28 22:36:01 +01:00
Thibaut Girka	39c8a71df8	Do not crash the whole UI when loading an invalid column	2018-11-28 22:36:01 +01:00
Thibaut Girka	c18bb5d245	Switch “cycling” reply policy link to set of radio inputs Fixes #832	2018-11-28 22:35:42 +01:00
Thibaut Girka	f17a61a916	Add basic UI to set list replies setting in glitch-soc	2018-11-28 14:46:07 +01:00
Thibaut Girka	06c7fb8015	Add backend support to read and update list-specific show_replies settings	2018-11-28 14:46:07 +01:00
Thibaut Girka	53d0293d25	Add database support for list show-reply preferences	2018-11-28 14:46:07 +01:00
David Yip	74a281475a	Merge pull request #829 from ThibG/glitch-soc/features/volume-sliders [Glitch] Volume sliders for videos	2018-11-27 15:27:21 -06:00
Eugen Rochko	c39d7e7b2b	Fix TLS handshake timeout not being enforced (#9381 ) Follow-up to #9329	2018-11-27 19:46:05 +01:00
Eugen Rochko	11955600ad	Skip deliveries to inboxes that have already been marked as unavailable (#9358 )	2018-11-27 19:15:08 +01:00
Eugen Rochko	81f96c973a	Don't count suspended users in user count (#9380 ) Fix #7637	2018-11-27 18:49:37 +01:00
Eugen Rochko	43c311b3a1	Fix nil error when no DNS addresses are found for host (#9379 )	2018-11-27 18:13:36 +01:00
Thibaut Girka	3b707bdc12	[Glitch] Volume sliders for videos Port `f978afa487` to glitch-soc	2018-11-27 15:21:57 +01:00
Thibaut Girka	55edfd6e0e	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-27 15:10:58 +01:00
Eugen Rochko	4afda5444a	Change identities id column to a bigint (#9371 ) * fix: change Identity's id column to a bigint This appears to be the last model created using a 5.0 migration, where column types defaulted to `integer` rather than `bigint`. This migration changes the column type to match that of all of the other ID columns. * Change user_id column in identities to bigint and fix down-migration	2018-11-27 13:56:25 +01:00
Thibaut Girka	f969eca07e	[Glitch] check_boxes label should use display: inline-block Port `180ae0472a` to glitch-soc	2018-11-27 13:29:12 +01:00
Thibaut Girka	f8e07ca5cd	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).	2018-11-27 13:23:02 +01:00
Renato "Lond" Cerqueira	496a6b3dc5	Weblate translations (2018-11-27) (#9367 ) * Translated using Weblate (Malay) Currently translated at 0.4% (3 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ms/ * Added translation using Weblate (Malay) * Translated using Weblate (Bulgarian) Currently translated at 14.0% (98 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/bg/ * Translated using Weblate (Croatian) Currently translated at 14.3% (100 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hr/ * Translated using Weblate (Asturian) Currently translated at 31.1% (218 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/ * Translated using Weblate (Arabic) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 96.0% (673 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Czech) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/ * Translated using Weblate (Malay) Currently translated at 28.7% (201 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ms/ * Translated using Weblate (Polish) Currently translated at 98.0% (687 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Serbian (latin)) Currently translated at 68.3% (479 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr_Latn/ * Translated using Weblate (Hebrew) Currently translated at 43.1% (302 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (Indonesian) Currently translated at 31.2% (219 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/id/ * Translated using Weblate (Turkish) Currently translated at 32.0% (224 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/tr/ * Translated using Weblate (Ido) Currently translated at 19.3% (135 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/io/ * Translated using Weblate (Asturian) Currently translated at 49.3% (167 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ast/ * Translated using Weblate (Ido) Currently translated at 36.9% (125 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/io/ * Translated using Weblate (Hungarian) Currently translated at 70.2% (238 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Slovenian) Currently translated at 45.7% (155 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Indonesian) Currently translated at 62.5% (212 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Serbian (latin)) Currently translated at 72.0% (244 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr_Latn/ * Translated using Weblate (Catalan) Currently translated at 99.4% (337 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Polish) Currently translated at 98.2% (333 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ * Translated using Weblate (Galician) Currently translated at 99.4% (337 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Occitan) Currently translated at 99.4% (337 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Spanish) Currently translated at 97.3% (330 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Romanian) Currently translated at 97.1% (329 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ * Translated using Weblate (Turkish) Currently translated at 45.4% (154 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/tr/ * Translated using Weblate (Welsh) Currently translated at 97.9% (332 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Portuguese) Currently translated at 72.6% (246 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Bulgarian) Currently translated at 22.4% (76 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/bg/ * Translated using Weblate (Norwegian (old code)) Currently translated at 74.0% (251 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * Translated using Weblate (Slovenian) Currently translated at 89.9% (80 of 89 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/ * Translated using Weblate (Czech) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/ * Translated using Weblate (Slovenian) Currently translated at 13.3% (93 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Czech) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Korean) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Corsican) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (French) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Asturian) Currently translated at 29.0% (18 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ast/ * Translated using Weblate (Asturian) Currently translated at 50.0% (1 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/ast/ * Translated using Weblate (Asturian) Currently translated at 36.2% (254 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/ * Translated using Weblate (Asturian) Currently translated at 43.9% (43 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/ast/ * Translated using Weblate (Asturian) Currently translated at 68.1% (231 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ast/ * Translated using Weblate (Asturian) Currently translated at 59.6% (53 of 89 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ast/ * Translated using Weblate (Asturian) Currently translated at 68.1% (231 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ast/ * Translated using Weblate (Persian) Currently translated at 99.7% (699 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (89 of 89 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Slovenian) Currently translated at 15.5% (109 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Slovenian) Currently translated at 46.0% (156 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Galician) Currently translated at 100,0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (German) Currently translated at 99,7% (699 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Czech) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Dutch) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Basque) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/zh_Hant/ * Translated using Weblate (Basque) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Corsican) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Danish) Currently translated at 98.9% (693 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Danish) Currently translated at 99.4% (337 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Danish) Currently translated at 91.0% (81 of 89 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ * Translated using Weblate (Finnish) Currently translated at 97.9% (332 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Dutch) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Italian) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (89 of 89 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Welsh) Currently translated at 91.0% (638 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Dutch) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (French) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Malay) Currently translated at 42.9% (301 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ms/ * Translated using Weblate (Japanese) Currently translated at 99.4% (337 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Japanese) Currently translated at 99.7% (338 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Czech) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Danish) Currently translated at 100,0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Czech) Currently translated at 100,0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Basque) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Japanese) Currently translated at 99.6% (698 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Basque) Currently translated at 100.0% (89 of 89 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Slovak) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Czech) Currently translated at 100.0% (89 of 89 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Translated using Weblate (Slovak) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 94.4% (84 of 89 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Czech) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Japanese) Currently translated at 99.7% (699 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.6% (698 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Telugu) Currently translated at 0.6% (4 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/te/ * Translated using Weblate (Slovak) Currently translated at 100.0% (89 of 89 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 96.6% (677 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 96.6% (677 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Czech) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Slovak) Currently translated at 97.7% (685 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 97.7% (685 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Greek) Currently translated at 99.6% (698 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Slovak) Currently translated at 100.0% (89 of 89 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 97.7% (685 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Basque) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Dutch) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Basque) Currently translated at 100.0% (89 of 89 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Telugu) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/ * Translated using Weblate (Czech) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Telugu) Currently translated at 100.0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/ * Translated using Weblate (Catalan) Currently translated at 100,0% (339 of 339 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Slovak) Currently translated at 97.7% (685 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 97.9% (686 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Normalize translations * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused Also ran i18n-tasks check-consistent-interpolations * Fix ast translation * Fix missing plurals for ar * Add missing plurals for cs * Add missing plurals for sk * Add missing plurals for sl * Normalize translations	2018-11-27 12:50:26 +01:00
ThibG	395615d9f3	Allow hyphens in the middle of remote user names (#9345 ) Fixes #9309 This only allows hyphens in the middle of a username, much like dots, although I don't have a compelling reason to do so other than keeping the changes minimal.	2018-11-27 12:28:01 +01:00
Sumit Khanna	f978afa487	Volume sliders for videos #7429 (#9366 ) * Volume sliders for videos #7429 * Code formatting updates * Code formatting updates	2018-11-27 12:25:38 +01:00
Hugo Gameiro	b6681d21ad	add loglevel to ffmpeg in gif upload (#9368 )	2018-11-27 12:19:12 +01:00
Eugen Rochko	73faadad28	Redesign admin accounts index (#9340 ) * Improve overview of accounts in admin UI - Display suspended status, role, last activity and IP prominently - Default to showing local accounts - Default to not showing suspended accounts * Remove unused strings * Fix tests * Allow filtering accounts by IP mask	2018-11-26 15:53:27 +01:00
valerauko	db9aea34de	Ensure replied-to is a status not a boost (#9129 ) * Ensure replied-to is a status not a boost * Consider case of not a reply * Add test case for replying to boost * Move reblog-reply resolution to model * Remove unnecessary comment	2018-11-25 16:35:21 +01:00
takayamaki	180ae0472a	check_boxes label should use display: inline-block (#9348 )	2018-11-25 16:26:15 +01:00
Thibaut Girka	6b6e633c09	Update MediaGallery and Video props when folding/unfolding CWs in detailed statuses	2018-11-25 11:29:56 +01:00
Thibaut Girka	b41d60f2d8	Render placeholder when inline video container width isn't known	2018-11-25 11:29:56 +01:00
Thibaut Girka	0d3612482e	Render placeholder instead of image when MediaGallery container width isn't known	2018-11-25 11:29:56 +01:00
Eugen Rochko	0eaf6d7693	Sort self-replies to the top of descendants (#9320 ) Fix #6463	2018-11-24 20:48:50 +01:00
Eugen Rochko	87a43274f1	Revert "Sort self-replies to the top of the thread (#9296 )" (#9335 ) This reverts commit `074960bb0f`. Fix #9315	2018-11-23 21:58:01 +01:00
Eugen Rochko	fd8145d232	Fix connect timeout not being enforced (#9329 ) * Fix connect timeout not being enforced The loop was catching the timeout exception that should stop execution, so the next IP would no longer be within a timed block, which led to requests taking much longer than 10 seconds. * Use timeout on each IP attempt, but limit to 2 attempts * Fix code style issue * Do not break Request#perform if no block given * Update method stub in spec for Request * Move timeout inside the begin/rescue block * Use Resolv::DNS with timeout of 1 to get IP addresses * Update Request spec to stub Resolv::DNS instead of Addrinfo * Fix Resolve::DNS stubs in Request spec	2018-11-22 20:12:04 +01:00
valerauko	824497fbce	Ignore JSON-LD profile in mime type comparison (#9179 ) Ignore JSON-LD profile in mime type comparison	2018-11-22 12:49:07 +01:00
ThibG	466e3d710c	Include replies to list owner and replies to list members in list statuses (#9324 )	2018-11-21 17:02:58 +01:00
Eugen Rochko	384e953b75	Revert connect timeout from 1s to 10s (#9319 ) The failure rate in Sidekiq is too high	2018-11-21 17:00:56 +01:00
Alexandre Alapetite	d1d2377870	WebSub: ATOM before RSS (#9302 ) Hello, The ATOM feed contains the hub declaration for WebSub, but the RSS version does not. RSS/ATOM readers will typically pick whichever version comes first, and will thus not see the WebSub feature. I therefore suggest putting the ATOM version first, as it is more feature-rich than its RSS counterpart is. Clients not compatible with ATOM would not pick it anyway due to the different type attribute. A more complicated alternative would be to declare the WebSub feature in the RSS version as well, using something like the following code, and ensuring that clients subscribed to the RSS version would receive PuSH updates just like those subscribed to the ATOM version. ````xml <rss version="2.0" xmlns:webfeeds="http://webfeeds.org/rss/1.0" xmlns:atom="http://www.w3.org/2005/Atom"> <channel> <atom:link rel="self" type="application/rss+xml" href="https://diaspodon.fr/users/test.rss"/> <atom:link rel="hub" href="https://diaspodon.fr/api/push"/> </channel> </rss> ```	2018-11-20 22:25:04 +01:00
Eugen Rochko	0c666ae5e6	Cast status_count to integer (#9314 ) It is returned as a double because the sum is now over bigint columns Fix #9312	2018-11-20 02:52:52 +01:00
Thibaut Girka	b3ff35a75c	Move URLs to backend in their own file	2018-11-19 15:56:38 +01:00
James Kiesel	6a65d87f4d	Simplify hashtag query service, perf increase for 'any' tags (#9298 )	2018-11-19 12:49:50 +01:00
Eugen Rochko	1d38c9750a	Fix filter ID not being a string in REST API (#9303 )	2018-11-19 10:37:57 +01:00
Eugen Rochko	d6b9a62e0a	Extract counters from accounts table to account_stats table (#9295 )	2018-11-19 00:43:52 +01:00
James Kiesel	4fdefffb99	Deep compare tags for hashtag column reload (#9297 ) * Deep compare tags for hashtag column reload * Don't use global lodash	2018-11-17 11:07:48 +01:00
Eugen Rochko	9311430ed7	Prevent multiple handlers for Delete of Actor from running (#9292 )	2018-11-16 19:46:23 +01:00
Eugen Rochko	074960bb0f	Sort self-replies to the top of the thread (#9296 ) Fix #6463	2018-11-16 19:34:10 +01:00
Thibaut Girka	a77ee0bb6d	Fix composer not displaying on iPad	2018-11-16 15:04:32 +01:00
Eugen Rochko	8069fd636b	Remove intermediary arrays when creating hash maps from results (#9291 )	2018-11-16 15:02:18 +01:00
mayaeh	bdd3c8c255	Change the password form order (#9267 ) * Change order of password. * Update Japanese translation for "Show thread". * Separate the translation PR.	2018-11-16 11:18:43 +01:00
mayaeh	560acf171e	Update Japanese translation for "Show thread". (#9287 )	2018-11-16 11:16:10 +09:00
Thibaut Girka	86527024aa	In detailed status view, take displayMedia setting into account when changing media Fixes #819	2018-11-15 16:38:50 +01:00
Thibaut Girka	f84897c7d7	Add field to serialized local-only statuses	2018-11-13 18:55:57 +01:00
Thibaut Girka	759750801e	Exclude local-only toots from atom feeds	2018-11-13 18:55:57 +01:00
Thibaut Girka	6ce7e74b46	[Glitch] Fix race condition when interacting with deleted toots Port `c875f19673` to glitch-soc	2018-11-13 16:30:07 +01:00
Thibaut Girka	bfe2b9cc50	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-13 16:28:07 +01:00
Thibaut Girka	2fe0cb1623	[Glitch] Prepend account header even when status list is empty Partially port `90b64c0069`	2018-11-13 15:54:04 +01:00
Thibaut Girka	c78c80f807	[Glitch] Fix loading indicator inconsistency Port `3cecf3e5b9` to glitch-soc	2018-11-13 15:54:04 +01:00
Thibaut Girka	5ebbaffaa3	[Glitch] Use local instead of global loading indicator for timelines, account timelines Port `dd00cd19d2` to glitch-soc	2018-11-13 15:54:04 +01:00
ThibG	c875f19673	Fix race condition causing shallow status with only a "favourited" attribute (#9272 ) Fixes #9231	2018-11-13 14:58:14 +01:00
Eugen Rochko	bb69d154c4	Fix null error introduced in #9270 (#9275 )	2018-11-12 22:07:31 +01:00
ThibG	bbd8fdd185	Perform deep comparison for card data when receiving new props (#9270 ) Fixes #9226	2018-11-12 18:17:50 +01:00
Les Orchard	cc1f13dfd0	Only consider mouse move in scrolling on item insertion (#9262 ) Fixes #9259	2018-11-11 23:20:20 +01:00
mayaeh	208d278cbc	i18n: Add ja translations (#9261 ) * Run yarn manage:translations * Add Japanese translations.	2018-11-11 18:57:16 +01:00
ThibG	7f5a4be580	Fix emoji update date processing (#9255 )	2018-11-10 23:59:51 +01:00
ThibG	9b89c62d43	Check that twitter:player is valid before using it (#9254 ) Fixes #9251	2018-11-10 20:42:04 +01:00
Thibaut Girka	0506c6f62f	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-10 17:57:19 +01:00
Eugen Rochko	3cecf3e5b9	Fix loading indicator inconsistency (#9252 ) * Use global loading indicator when loading more items * Use local loading indicator for notifications And remove global loading indicator for initial custom emojis load	2018-11-10 15:04:13 +01:00
ThibG	09562b0fcc	Merge pull request #806 from ThibG/glitch-soc/merge-upstream Merge upstream changes	2018-11-09 22:29:52 +01:00
Thibaut Girka	868cace797	[Glitch] Remove unused computation of reblog references from updateTimeline	2018-11-09 21:57:56 +01:00
Thibaut Girka	0e80661e42	[Glitch] Don't remove originals of boosted toots from timeline Port `2b51b4094c` to glitch-soc	2018-11-09 21:57:56 +01:00
Les Orchard	2f86fc5e0a	Identify manual scrolling to cancel scroll to top reset on mouse idle (#9245 )	2018-11-09 18:06:43 +01:00
Thibaut Girka	44f5f7bab4	Fix drawer waves being displayed in the list editor	2018-11-09 18:00:29 +01:00
ThibG	08b3de4d5e	Remove unused computation of reblog references from updateTimeline (#9244 )	2018-11-09 17:43:25 +01:00
Thibaut Girka	c6fc3e0c65	[Glitch] Fix form validation flash message color and input borders Port `ccbdf689e8` to glitch-soc	2018-11-09 15:10:09 +01:00
Thibaut Girka	9201398507	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-09 14:56:31 +01:00
Thibaut Girka	bf92e7aaa6	[Glitch] Implement adding a user to a list from their profile Port `bb5558de62` to glitch-soc	2018-11-09 14:50:08 +01:00
Eugen Rochko	4615512285	Reduce connect timeout limit and limit signature failures by source IP (#9236 ) * Reduce connect timeout from 10s to 1s * Limit failing signature verifications per source IP	2018-11-08 21:35:58 +01:00
Eugen Rochko	dd00cd19d2	Use local instead of global loading indicator for timelines, account timelines (#9224 ) So that opening a profile feels faster. Also, pinned toots are not shown before other toots have loaded. Also, if no toots are loaded, added empty message	2018-11-08 21:35:06 +01:00
Eugen Rochko	5cbf6cf3ec	Add "Show thread" link to self-replies (#9228 ) Fix #4716	2018-11-08 21:08:57 +01:00
Eugen Rochko	ccbdf689e8	Fix form validation flash message color and input borders (#9235 ) * Fix form validation flash message color and input borders * Fix typo	2018-11-08 21:06:14 +01:00
Eugen Rochko	7f4adfaf77	Fix follow limit validator reporting lower number past threshold (#9230 ) * Fix follow limit validator reporting lower number past threshold * Avoid floating point follow limit	2018-11-08 21:06:01 +01:00
Eugen Rochko	6d59dfa15d	Optimize the process of following someone (#9220 ) * Eliminate extra accounts select query from FollowService * Optimistically update follow state in web UI and hide loading bar Fix #6205 * Asynchronize NotifyService in FollowService And fix failing test * Skip Webfinger resolve routine when called from FollowService if possible If an account is ActivityPub, then webfinger re-resolving is not necessary when called from FollowService. Improve options of ResolveAccountService	2018-11-08 21:05:42 +01:00
Les Orchard	9cfd610484	Cancel list scroll reset after mouse move on wheel scroll (#9233 ) - Use object properties rather than component state for mouseMovedRecently and scrollToTopOnMouseIdle flags - Remove redundant scrollToTop prop call, also fixing an attempt to call an undefined prop. Fixes #9217	2018-11-08 18:45:20 +01:00
Eugen Rochko	b22db8162a	Increase default column width from 330px to 350px (#9227 )	2018-11-08 07:42:17 +01:00
Thibaut Girka	a2a254625b	[Glitch] Update reset.scss from upstream	2018-11-06 16:03:53 +01:00
Thibaut Girka	36dab188fd	Merge branch 'master' into glitch-soc/merge-upstream	2018-11-06 15:22:44 +01:00
Les Orchard	6a1216d2cd	Temporarily hold timeline if mouse moved recently (fixes #8630 ) (#9200 ) - On recent mouse movement, hold timeline position so statuses remain in place for interactions in progress. - If the timeline had been scrolled to the top before mouse movement, restore scroll on mouse idle.	2018-11-05 18:59:41 +01:00
m.b	cd41c2c6ad	Update resolve_url_service.rb (#9188 )	2018-11-05 18:54:07 +01:00
James Kiesel	4c03e05a4e	Allow joining several hashtags in a single column (#8904 ) * Nascent tag menu on frontend * Hook up frontend to search * Tag intersection backend first pass * Update yarnlock * WIP * Fix for tags not searching correctly * Make radio buttons function * Simplify radio buttons with modeOption * Better naming * Rearrange options * Add all/any/none functionality on backend * Small PR cleanup * Move to service from scope * Small cleanup, add proper service tests * Don't use send with user input :D * Set appropriate column header * Handle auto updating timeline * Fix up toggle function * Use tag value correctly * A bit more correct to use 'self' rather than 'all' in status scope * Fix some style issues * Fix more code style issues * Style select dropdown more better * Only use to_id'ed value to ensure no SQL injection * Revamp frontend to allow for multiple selects * Update backend / col header to account for more flexible tagging * Update brakeman ignore * Codeclimate suggestions * Fix presenter tag_url * Implement initial PR feedback * Handle additional tag streaming * CodeClimate tweak	2018-11-05 18:53:25 +01:00
namelessGonbai	bb5558de62	Implement adding a user to a list from their profile (#9062 ) * Add add user to list from thier profile * Fix listAdderCss	2018-11-05 18:52:38 +01:00
Steven Tappert	a7e3bd0300	Check for empty "last_status" before sorting DM column (#9207 ) * Check for empty "last_status" before sorting * Small touchups for codeclimate	2018-11-05 18:51:43 +01:00
Sorin Davidoi	d6c7b01d08	fix(reset): Property name for styled scrollbars (#9210 ) https://webplatform.news/issues/2018-10-26	2018-11-05 18:51:26 +01:00
Thibaut Girka	34209c0340	Fix timestamp position in public pages with RTL languages	2018-10-31 11:37:47 +01:00
Thibaut Girka	b3c1380980	Fix styling of display names in public pages	2018-10-31 11:37:47 +01:00
Thibaut Girka	75b48dc177	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-31 10:08:36 +01:00
Thibaut Girka	2b2facbbdf	[Glitch] Port some of upstream's getting started footer links	2018-10-31 10:07:41 +01:00
Eugen Rochko	b9d0d209cd	Fix reducer error when conversation has no last status in web UI (#9173 ) Fix #9170	2018-10-31 00:55:20 +01:00
Eugen Rochko	ce2ee68b64	Revert "Fix FetchAtomService content type handling (#9132 )" (#9171 ) This reverts commit `c36a4a1617`.	2018-10-31 00:43:34 +01:00
Quentí	804586172e	[i18n] Update for Occitan (#9169 ) * Update oc.json * Update oc.yml * Update simple_form.oc.yml * Update simple_form.oc.yml * Update oc.json	2018-10-30 22:06:31 +01:00
Thibaut Girka	0d6b8f36aa	[Glitch] Fix empty display name precedence over username in web UI Port `f59b840549` to glitch-soc	2018-10-30 17:54:50 +01:00
Thibaut Girka	1c448d6474	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.	2018-10-30 17:52:08 +01:00
Thibaut Girka	7e18e95716	Add a local setting for inline preview cards	2018-10-30 17:51:06 +01:00
Thibaut Girka	bdc2338833	Add a “link” status icon for toots with a preview card	2018-10-30 17:51:06 +01:00
Thibaut Girka	b21615e957	[Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warning Port `9c38c5daa3` to glitch-soc	2018-10-30 17:51:06 +01:00
Thibaut Girka	ac9780b844	[Glitch] Include preview cards in status entity in REST API Port `795f0107d2` to glitch-soc	2018-10-30 17:51:06 +01:00
Eugen Rochko	f59b840549	Fix empty display name precedence over username in web UI (#9163 ) Fix #9131	2018-10-30 17:06:12 +01:00
Eugen Rochko	cc45a8f9f7	Fix td instead of th in sessions table header (#9162 ) Fix #9130	2018-10-30 17:00:34 +01:00
Eugen Rochko	5c8e7f0e1d	Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out (8627)" (#9161 ) This reverts commit `10680f93e7`.	2018-10-30 16:25:54 +01:00
valerauko	c36a4a1617	Fix FetchAtomService content type handling (#9132 ) * Add profile to json+ld in Accept It's required by the ActivityPub spec * Use headers['Content-type'] instead of mime_type mime_type strips the profile from the content type, but it's still available raw in the headers hash * Add test for ld+json with profile	2018-10-30 15:07:57 +01:00
Quentí	a3d40ba53b	[i18n] Update for Occitan (#9157 ) * Update oc.json * Update devise.oc.yml * Update oc.yml * Update oc.json	2018-10-30 15:05:01 +01:00
Eugen Rochko	be202f9377	Accept the same payload in multiple inboxes and deliver (#9150 )	2018-10-30 15:03:55 +01:00
Eugen Rochko	47b8d195e6	Always let through notifications from staff (#9152 ) * Always let through notifications from staff Follow-up to #8993 * Let messages from staff through, but no other notifications	2018-10-30 15:02:55 +01:00
ThibG	a03d506626	Fix Pleroma mentions being fetched as preview cards (#9158 )	2018-10-30 15:02:24 +01:00
Masoud Abkenar	3aa2418217	[Glitch] RTL: fix toot privacy preferences radio buttonss Port `e961a763a2` to glitch-soc	2018-10-30 11:24:40 +01:00
Masoud Abkenar	e32a4f55fe	[Glitch] RTL: fix preferences page checkbox margins Port `5ee0b51ac8` to glitch-soc	2018-10-30 11:24:19 +01:00
Thibaut Girka	94ad76a5b9	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-30 11:22:25 +01:00
trwnh	2cc099c70f	Make detailed-status__wrapper actually wrap detailed status (#8547 ) * Remove class from scrollable div .detailed-status__wrapper does not actually wrap the detailed status here * Re-add class to focusable div .detailed-status__wrapper now wraps the detailed status instead of the entire scrollable area	2018-10-30 06:33:02 +01:00
Masoud Abkenar	e961a763a2	RTL: fix toot privacy preferences radio buttonss (#9146 )	2018-10-30 00:49:29 +01:00
Masoud Abkenar	5ee0b51ac8	RTL: fix preferences page checkbox margins (#9145 ) * RTL: fix preferences page checkbox margins * Update rtl.scss	2018-10-30 00:47:43 +01:00
ThibG	33a71e8f7c	Do not hide boost notifications from followed people with hidden boosts (#9147 ) * Do not hide boost notifications from followed people with hidden boosts Not displaying boosts from a followed user in the Home timeline and not having notifications when they reblog your own content are two very separate concerns, tying them together seem counter-intuitive and unwanted. * Update specs accordingly	2018-10-30 00:47:31 +01:00
ash lea	7ec3f6022d	move some constants to rails environment	2018-10-29 21:29:31 +01:00
Thibaut Girka	a942ad3062	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.	2018-10-29 14:00:41 +01:00
m.b	2b18f5f85d	Add Page AP type support (#9121 )	2018-10-29 13:23:29 +01:00
Renato "Lond" Cerqueira	9d84d55cf0	Weblate translations (2018-10-26) (#9113 ) * Translated using Weblate (French) Currently translated at 99.7% (699 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Italian) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/it/ * Translated using Weblate (Italian) Currently translated at 90.7% (636 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Japanese) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 95.7% (89 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 99.4% (697 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Greek) Currently translated at 99.6% (698 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Basque) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Korean) Currently translated at 100.0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (French) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Spanish) Currently translated at 98.7% (692 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Dutch) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 89.2% (83 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 97.4% (683 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Occitan) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Occitan) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Occitan) Currently translated at 99.7% (699 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (German) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Arabic) Currently translated at 97.0% (680 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 99.7% (337 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Czech) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Serbian) Currently translated at 89.2% (83 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (Dutch) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100,0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Czech) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Corsican) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/co/ * Translated using Weblate (French) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Galician) Currently translated at 100,0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Welsh) Currently translated at 99.4% (336 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Welsh) Currently translated at 81.7% (76 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.9% (700 of 701 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% (338 of 338 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% (93 of 93 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% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt_BR/ * Translated using Weblate (Welsh) Currently translated at 94.4% (662 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Welsh) Currently translated at 97.8% (91 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Corsican) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Welsh) Currently translated at 96.9% (95 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/ * Translated using Weblate (Catalan) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 100,0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Welsh) Currently translated at 99.4% (336 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Occitan) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Persian) Currently translated at 99.7% (699 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Arabic) Currently translated at 97.6% (684 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (English) Currently translated at 99.7% (699 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (Galician) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Persian) Currently translated at 99.6% (698 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (English) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/en/ * Translated using Weblate (Welsh) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Catalan) Currently translated at 100.0% (701 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Occitan) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Welsh) Currently translated at 99.4% (336 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Welsh) Currently translated at 99.0% (97 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cy/ * Translated using Weblate (Welsh) Currently translated at 94.7% (664 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Persian) Currently translated at 99.7% (699 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Welsh) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Persian) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Czech) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Welsh) Currently translated at 94.7% (664 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Czech) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Spanish) Currently translated at 99.9% (700 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 85.4% (599 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 93.3% (654 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hans/ * Translated using Weblate (Finnish) Currently translated at 61.3% (57 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Hebrew) Currently translated at 57.0% (53 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/he/ * Translated using Weblate (French) Currently translated at 100,0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Bulgarian) Currently translated at 14,8% (104 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/bg/ * Translated using Weblate (Asturian) Currently translated at 31,2% (219 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ast/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 85,2% (597 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant/ * Translated using Weblate (Croatian) Currently translated at 15,0% (105 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hr/ * Translated using Weblate (Georgian) Currently translated at 94,3% (661 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ka/ * Translated using Weblate (Hebrew) Currently translated at 43,1% (302 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/he/ * Translated using Weblate (Ido) Currently translated at 30,0% (210 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/io/ * Translated using Weblate (Hungarian) Currently translated at 74,3% (521 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Indonesian) Currently translated at 32,7% (229 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/id/ * Translated using Weblate (Polish) Currently translated at 98,1% (688 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Romanian) Currently translated at 0,0% (0 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ro/ * Translated using Weblate (Russian) Currently translated at 96,0% (673 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Serbian (latin)) Currently translated at 69,6% (488 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr_Latn/ * Translated using Weblate (Thai) Currently translated at 32,7% (229 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/th/ * Translated using Weblate (Turkish) Currently translated at 32,5% (228 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/tr/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 96,7% (327 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hans/ * Translated using Weblate (Ukrainian) Currently translated at 89,9% (630 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/ * Translated using Weblate (Ido) Currently translated at 38,7% (36 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/io/ * Translated using Weblate (Turkish) Currently translated at 95,9% (324 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/tr/ * Translated using Weblate (Portuguese) Currently translated at 57,0% (53 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Indonesian) Currently translated at 37,6% (35 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/id/ * Translated using Weblate (Norwegian (old code)) Currently translated at 57,0% (53 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/no/ * Translated using Weblate (Serbian (latin)) Currently translated at 58,1% (54 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr_Latn/ * Translated using Weblate (Ukrainian) Currently translated at 39,8% (37 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/uk/ * Translated using Weblate (Thai) Currently translated at 43,0% (40 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/th/ * Translated using Weblate (Turkish) Currently translated at 38,7% (36 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/tr/ * Translated using Weblate (Finnish) Currently translated at 84.0% (589 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Polish) Currently translated at 98.1% (688 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Italian) Currently translated at 93.6% (656 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Serbian (latin)) Currently translated at 68.2% (478 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr_Latn/ * Translated using Weblate (Slovenian) Currently translated at 12.8% (90 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Armenian) Currently translated at 71.0% (240 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hy/ * Translated using Weblate (Asturian) Currently translated at 99.1% (335 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ast/ * Translated using Weblate (French) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Indonesian) Currently translated at 97.0% (328 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Ido) Currently translated at 94.1% (318 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/io/ * Translated using Weblate (Finnish) Currently translated at 86.1% (291 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Romanian) Currently translated at 99.7% (337 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ * Translated using Weblate (Russian) Currently translated at 96.4% (326 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ru/ * Translated using Weblate (Polish) Currently translated at 99.1% (335 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ * Translated using Weblate (Serbian (latin)) Currently translated at 72.2% (244 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr_Latn/ * Translated using Weblate (Slovenian) Currently translated at 88.8% (300 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * Translated using Weblate (Ido) Currently translated at 66.1% (41 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/io/ * Translated using Weblate (Asturian) Currently translated at 46.2% (43 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ast/ * Translated using Weblate (Bulgarian) Currently translated at 34.4% (32 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/bg/ * Translated using Weblate (Croatian) Currently translated at 34.4% (32 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hr/ * Translated using Weblate (Slovenian) Currently translated at 7.5% (7 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 69.9% (65 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/zh_Hans/ * Translated using Weblate (Italian) Currently translated at 94.4% (662 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Greek) Currently translated at 89.1% (301 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Indonesian) Currently translated at 31.4% (220 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/id/ * Translated using Weblate (Bulgarian) Currently translated at 22.5% (76 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/bg/ * Translated using Weblate (Croatian) Currently translated at 48.8% (165 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hr/ * Translated using Weblate (Hebrew) Currently translated at 69.2% (234 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/he/ * Translated using Weblate (Hungarian) Currently translated at 70.7% (239 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Tamil) Currently translated at 69.5% (235 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ta/ * Translated using Weblate (Thai) Currently translated at 65.1% (220 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 87.3% (295 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant_HK/ * Normalize translations ran yarn build:development && i18n-tasks normalize && yarn manage:translations && i18n-tasks remove-unused * Translated using Weblate (Danish) Currently translated at 98,5% (333 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (Bulgarian) Currently translated at 14,1% (99 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/bg/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 82,6% (579 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 92,4% (648 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hans/ * Translated using Weblate (Danish) Currently translated at 98,0% (687 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/da/ * Translated using Weblate (Georgian) Currently translated at 94,3% (661 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ka/ * Translated using Weblate (Hungarian) Currently translated at 73,0% (512 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Norwegian (old code)) Currently translated at 74,8% (524 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/ * Translated using Weblate (Ido) Currently translated at 19,3% (135 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/io/ * Translated using Weblate (Russian) Currently translated at 96,0% (673 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Swedish) Currently translated at 85,9% (602 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Turkish) Currently translated at 32,0% (224 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/tr/ * Translated using Weblate (Ukrainian) Currently translated at 89,3% (626 of 701 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/uk/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 98,5% (333 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/zh_Hant/ * Translated using Weblate (Esperanto) Currently translated at 90,5% (306 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Galician) Currently translated at 85,5% (289 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Georgian) Currently translated at 90,2% (305 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ka/ * Translated using Weblate (Greek) Currently translated at 99,1% (335 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Norwegian (old code)) Currently translated at 74,3% (251 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * Translated using Weblate (Portuguese) Currently translated at 72,8% (246 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Serbian) Currently translated at 98,5% (333 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sr/ * Translated using Weblate (Slovak) Currently translated at 98,5% (333 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Spanish) Currently translated at 97,6% (330 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Swedish) Currently translated at 88,5% (299 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Telugu) Currently translated at 98,5% (333 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/ * Translated using Weblate (Ukrainian) Currently translated at 82,0% (277 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/uk/ * Translated using Weblate (Danish) Currently translated at 90,3% (84 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/da/ * Translated using Weblate (Occitan) Currently translated at 100,0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Danish) Currently translated at 98.8% (334 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/da/ * Translated using Weblate (French) Currently translated at 100.0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (93 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Slovenian) Currently translated at 11.8% (11 of 93 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/ * Translated using Weblate (Galician) Currently translated at 100,0% (338 of 338 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Normalize translations * Fix cy locale	2018-10-29 13:20:29 +01:00
Eugen Rochko	9c38c5daa3	Fix dimensions of preview cards, fix crash in web UI, fix warning (#9133 )	2018-10-29 04:42:07 +01:00
ThibG	7f22ed0fc9	Merge pull request #794 from ThibG/glitch-soc/merge-upstream Merge upstream changes	2018-10-28 20:36:55 +01:00
Thibaut Girka	b00f60f1d3	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-28 08:37:49 +01:00
Eugen Rochko	11b3ee4f4c	Reset status cache when status_stat or media_attachment updates (#9119 ) * Reset status cache when status_stat or media_attachment updates Fix #8711 Media attachments are generally immutable, but admins can update the sensitive flag, and this would ensure the change is visible instantly. Same for updates to status stats. That is a regression from #8185, because even the correct updated_at fetched from a join doesn't seem to invalidate the cache. * Remove join from Status#cache_ids since it has no effect	2018-10-28 06:42:34 +01:00
kedama	678f5ed296	Set z-index of dropdown to 9999. (#9126 )	2018-10-28 06:39:59 +01:00
Eugen Rochko	795f0107d2	Include preview cards in status entity in REST API (#9120 ) * Include preview cards in status entity in REST API * Display preview card in-stream * Improve in-stream display of preview cards	2018-10-28 06:35:03 +01:00
Thibaut Girka	ee1f1a2ec9	When searching for an emoji with multiple separators, consider the full input e.g., typing “blob_cat_p” used to search for “blob” and “cat”, but not “blob_cat_p”, which means “blob_cat_patpat” is very unlikely to show up, although it is likely what the user wanted to type in the first place.	2018-10-27 22:45:11 +02:00
ThibG	a90b569350	When searching for an emoji with multiple separators, consider the full input (#9124 ) e.g., typing “blob_cat_p” used to search for “blob” and “cat”, but not “blob_cat_p”, which means “blob_cat_patpat” is very unlikely to show up, although it is likely what the user wanted to type in the first place.	2018-10-27 22:32:54 +02:00
Thibaut Girka	8f4fab65a1	Do not rely on hover for upload form options if touch is used	2018-10-27 19:06:49 +02:00
Thibaut Girka	008f98b304	[Glitch] RTL: fix column-back-button__icon margins/content Port `6e1a4f85ad` to glitch-soc	2018-10-27 18:55:11 +02:00
Thibaut Girka	c13cfeac09	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-27 18:54:26 +02:00
Eugen Rochko	eef8d9a5f7	Add locality check to ActivityPub::FetchRemoteAccountService (#9109 ) * Add locality check to ActivityPub::FetchRemoteAccountService Fix #8643 Because there are a few places where it is called, it is difficult to confirm if they all previously checked it for locality. It's better to make sure within the service. * Remove faux-remote duplicates of local accounts	2018-10-26 23:08:34 +02:00
Masoud Abkenar	6e1a4f85ad	RTL: fix column-back-button__icon margins/content (#9112 ) * RTL: fix column-back-button__icon margins/content * Update rtl.scss * Update rtl.scss	2018-10-26 22:49:39 +02:00
ThibG	215e649391	Fix styling in /auth/edit (#9117 )	2018-10-26 22:49:17 +02:00
ThibG	e53cc673e7	Ignore invalid hashtags on remote statuses instead of rejecting them (#9118 ) Fixes #9115	2018-10-26 22:48:35 +02:00
Thibaut Girka	5bb8563f6c	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/admin/base_controller.rb - app/controllers/filters_controller.rb - app/controllers/invites_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/exports_controller.rb - app/controllers/settings/follower_domains_controller.rb - app/controllers/settings/migrations_controller.rb - app/controllers/settings/notifications_controller.rb - app/controllers/settings/preferences_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb - app/javascript/packs/public.js - app/views/settings/profiles/show.html.haml Conflicts were mostly due to the addition of body classes to the settings page, this was caused by rejecting upstream changes for most of those files and modifying Settings::BaseController instead. Another cause of conflicts was the deletion of client-side checking of display name / bio length, this was modified in app/javascript/core/settings.js instead.	2018-10-26 20:41:43 +02:00
ThibG	82e7988afc	Fix missing `mention` argument when processing incoming Create activities (#9114 ) * Fix missing `mention` argument when processing incoming Create activities * Fix typo (param → params)	2018-10-26 12:59:59 +02:00
abcang	1e2695198a	Skip link-back check if body is nil (#9107 )	2018-10-26 03:31:23 +02:00
Eugen Rochko	161aeadbb4	Remove character counter from edit profile (#9100 ) * Remove display name and bio counter hint, simply limit input * Remove now redundant translations * Fix code style issue	2018-10-26 01:55:24 +02:00
Eugen Rochko	768b0f132d	Fix direct messages column not loading more items on scroll (#9102 ) Fix #9097	2018-10-26 01:55:08 +02:00
Eugen Rochko	a2e3401e48	Fix conversations not being marked read on click (#9103 ) Fix #9096	2018-10-26 01:54:58 +02:00
ThibG	7fee968e9f	Do not fetch preview card for mentioned users (#6934 )	2018-10-25 18:13:19 +02:00
Eugen Rochko	d4cf963749	Allow inbox owner to view implicitly targeted ActivityPub payload (#9093 ) Fix #9091	2018-10-25 18:12:22 +02:00
Eugen Rochko	4ea718ef18	Migrate all old direct messages to new conversations schema (#9085 )	2018-10-25 01:44:02 +02:00
Yamagishi Kazutoshi	e8ffecbd36	Set @body_classes to admin layout (#9081 )	2018-10-25 00:10:01 +02:00
Eugen Rochko	d723f2a0a8	Fix RTL layout of status display names (#9075 ) Fix #2350	2018-10-24 18:18:08 +02:00
Eugen Rochko	288e435fe5	Show upload options on click as well as hover (#9074 ) Fix #8918	2018-10-24 18:17:15 +02:00
Eugen Rochko	01c169e796	Fix JS error when posting from page without router context (#9073 ) Fix #9057	2018-10-24 01:31:31 +02:00
Thibaut Girka	ed8d06212f	Keep back own DMs in Home timeline Follow-up to `e45a6edd65`, fixes inconsistencies in glitch-soc behavior.	2018-10-23 20:03:35 +02:00
Thibaut Girka	8f3096b846	Merge branch 'master' into glitch-soc/merge-upstream	2018-10-23 17:15:57 +02:00
Eugen Rochko	39abec4d25	Fix public timelines not instantly updating on compose (#9050 ) Fix #9034	2018-10-23 00:43:18 +02:00
Eugen Rochko	ad510db3a1	Show suggested follows on search screen in mobile layout (#9010 ) Reminder: Suggestions were added in #7918 and are based on who you interact with who you do not follow. E.g. if you boost someone a lot from seeing other people's boosts of that person, it makes sense you might be interested in following the original source; or if you reply to someone a lot, maybe you'd want to follow them Each suggestion can be dismissed	2018-10-23 00:08:39 +02:00
Eugen Rochko	81017eaea7	Revert "RTL: remove blank character inside bdi (#9038 )" (#9056 ) This reverts commit `c7e9f9ff1e`.	2018-10-22 23:23:00 +02:00
Thibaut Girka	0c7f710be1	[Glitch] Surround mid-text display names with bdi tags Port `7861c5f108` to glitch-soc	2018-10-22 18:57:20 +02:00
Thibaut Girka	323ae1403a	[Glitch] fix: initial state of PrivacyDropdown is should not be null Port `bebe8ec887` to glitch-soc	2018-10-22 18:41:34 +02:00
Thibaut Girka	1bb23d0407	[Glitch] RTL: fix cardbar margins and alignment Port `c73864c137` to glitch-soc	2018-10-22 18:39:37 +02:00
Thibaut Girka	c9b19e05e2	[Glitch] RTL: fix admin account avatar margin in about page Port `3a157210c8` to glitch-soc	2018-10-22 18:38:52 +02:00
Thibaut Girka	c14be538a6	[Glitch] RTL: fix column settings toggle label Port `bf58461d36` to glitch-soc	2018-10-22 18:38:11 +02:00
Thibaut Girka	a1f512f18b	[Glitch] Fix domain label position and color Port `25f9ead041` to glitch-soc	2018-10-22 18:37:17 +02:00
Thibaut Girka	9950db2e1c	[Glitch] RTL: fix preferences layout Port `029943d59b` to glitch-soc	2018-10-22 18:34:48 +02:00
Thibaut Girka	076f0a0eb6	[Glitch] Fix admin account avatar margin Port `065b39e7a4` to glitch-soc	2018-10-22 18:33:35 +02:00
Thibaut Girka	aa277ab5fb	[Glitch] RTL: fix user stats in about page Port `301cbcc980` to glitch-soc	2018-10-22 18:31:50 +02:00
Thibaut Girka	ef9c11e050	[Glitch] RTL: fix domain append at signup form Port `65b3804a6c` to glitch-soc	2018-10-22 18:31:50 +02:00
Thibaut Girka	e18724363d	[Glitch] Fixes 8987 broken alignment at "Remote interaction dialog" Port `d35801aaa2` to glitch-soc	2018-10-22 18:31:50 +02:00
Thibaut Girka	1139b758c5	[Glitch] RTL: fix admin account margins in about page Port `f8c1b32541` to glitch-soc	2018-10-22 18:31:50 +02:00
Thibaut Girka	bf9c4b6d98	[Glitch] undo part of PR 8202 to fix RTL Port `efd09e2ebb` to glitch-soc	2018-10-22 18:22:01 +02:00
Thibaut Girka	9f1c9b6135	[Glitch] Improve style of notice/alert messages Port `b972478812` to glitch-soc	2018-10-22 18:20:43 +02:00
Thibaut Girka	e45a6edd65	Keep new DMs in home feeds and in the old DM timeline Revert server-side part of `87fdd139b8`	2018-10-22 18:15:51 +02:00
Thibaut Girka	dcded13a99	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.	2018-10-22 17:51:38 +02:00
Masoud Abkenar	c7e9f9ff1e	RTL: remove blank character inside bdi (#9038 ) * RTL: remove blank character inside bdi * Update app/javascript/mastodon/components/display_name.js Co-Authored-By: mabkenar <ampbox@gmail.com>	2018-10-22 01:04:32 +02:00
ThibG	84cf78da8a	Fix og:url on toots' public view (#9047 ) Fixes #9045	2018-10-21 22:52:10 +02:00
Masoud Abkenar	c73864c137	RTL: fix cardbar margins and alignment (#9044 )	2018-10-21 18:37:57 +02:00
Masoud Abkenar	3a157210c8	RTL: fix admin account avatar margin in about page (#9039 ) * RTL: fix admin account avatar margin in about page * fix code style	2018-10-21 16:45:08 +02:00
Thibaut Girka	4739e0f090	Put a video camera emoji or a picture frame emoji instead of “.” This uses the same logic as the status icons in the glitch flavor.	2018-10-21 16:09:18 +02:00
Thibaut Girka	8729f5e466	Do not move CWs to toot body when toot body is empty Fixes #395 Instead of leaving the toot body blank, it replaces it with a single “.” in order for the fold/unfold CW behavior to not look too weird on upstream Mastodon. Note that this does not fix upstream's CW-dropping behavior, as that is decided at the time the toot is posted, not received.	2018-10-21 16:09:18 +02:00
Thibaut Girka	04bedd237b	Attempt at fixing inline video player	2018-10-21 16:09:07 +02:00
Thibaut Girka	dfa5b0576f	Update mediaGallery component's width when opening CWs	2018-10-21 16:09:07 +02:00
Masoud Abkenar	bf58461d36	RTL: fix column settings toggle label (#9037 )	2018-10-21 20:31:40 +09:00
kedama	25f9ead041	Fix domain label position and color (#9033 ) * Fix position of the domain label * Fix position of the domain label for RTL - Fix color mismatch of linear gradient which assigned to "::after" pseudo class	2018-10-21 14:35:25 +09:00
Thibaut Girka	e4c3ea1809	Force sensitive content flag when posting a toot with a CW Indeed, when the “Always enable the Content Warning field” setting is enabled, sending a content-less toot with a CW would move the CW to the toot's content and leave the toot not marked as sensitive.	2018-10-20 17:06:21 +02:00
Thibaut Girka	13c3fa8d36	Focus the UI when pressing Escape in the CW field	2018-10-20 15:00:39 +02:00
Eugen Rochko	fd5285658f	Add option to block reports from domain (#8830 )	2018-10-20 08:02:44 +02:00
Eugen Rochko	9486f0ca77	Add "disable" button to report screen (#9024 ) * Add "disable" button to report screen * i18n-tasks remove-unused	2018-10-20 02:39:39 +02:00
Eugen Rochko	eb1b9903a6	Redesign direct messages column (#9022 )	2018-10-20 02:23:58 +02:00
Masoud Abkenar	029943d59b	RTL: fix preferences layout (#9021 )	2018-10-20 01:05:17 +02:00
bsky	065b39e7a4	Fix admin account avatar margin (#9020 )	2018-10-19 20:35:42 +02:00
Masoud Abkenar	301cbcc980	RTL: fix user stats in about page (#9018 )	2018-10-19 20:16:13 +09:00
Eugen Rochko	a38a452481	Add unread indicator to conversations (#9009 )	2018-10-19 01:47:29 +02:00
takayamaki	bebe8ec887	fix: initial state of PrivacyDropdown is should not be null (#9008 )	2018-10-19 00:00:19 +02:00
Masoud Abkenar	65b3804a6c	RTL: fix domain append at signup form (#9007 )	2018-10-18 21:19:31 +02:00
ThibG	007f7690fa	Fix fav/boosts hotkeys not working on detailed statuses (#9006 )	2018-10-18 19:52:00 +02:00
Thibaut Girka	b13c34de3a	Fix fav/boosts hotkeys not working on detailed statuses	2018-10-18 19:00:59 +02:00
Masoud Abkenar	f8c1b32541	RTL: fix admin account margins in about page (#9005 )	2018-10-18 14:35:49 +02:00
Eugen Rochko	72d7d3003b	Do not show "limited" visibility in default visibility preference (#8999 ) * Do not show "limited" visibility in default visibility preference Fix regression from #8950 * Fix code style issue	2018-10-17 22:04:40 +02:00
Eugen Rochko	ddd30f331c	Improve support for aspects/circles (#8950 ) * Add silent column to mentions * Save silent mentions in ActivityPub Create handler and optimize it Move networking calls out of the database transaction * Add "limited" visibility level masked as "private" in the API Unlike DMs, limited statuses are pushed into home feeds. The access control rules between direct and limited statuses is almost the same, except for counter and conversation logic * Ensure silent column is non-null, add spec * Ensure filters don't check silent mentions for blocks/mutes As those are "this person is also allowed to see" rather than "this person is involved", therefore does not warrant filtering * Clean up code * Use Status#active_mentions to limit returned mentions * Fix code style issues * Use Status#active_mentions in Notification And remove stream_entry eager-loading from Notification	2018-10-17 17:13:04 +02:00
ThibG	adb06baef6	Handle global hotkeys even when no element has focus (#8998 ) This fixes hotkeys not working when pressing the column “back” button, for instance.	2018-10-17 16:56:16 +02:00
Quint Guvernator	f5e2e96e95	always allow DMs from staff (#8993 )	2018-10-16 19:55:05 +02:00
Eugen Rochko	35b576dbec	Improve form for selecting media display preference (#8965 ) Regression from #8569	2018-10-16 14:07:54 +02:00
Masoud Abkenar	d35801aaa2	Fixes 8987 broken alignment at "Remote interaction dialog" (#8988 )	2018-10-15 16:09:08 +02:00
Masoud Abkenar	efd09e2ebb	undo part of PR 8202 to fix RTL (#8979 )	2018-10-15 04:39:20 +02:00

... 3 4 5 6 7 ...

5896 Commits