catstodon

mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-24 09:18:06 +01:00

Author	SHA1	Message	Date
David Yip	b6159bcb0a	Merge remote-tracking branch 'origin/merge-upstream'	2018-02-10 22:08:45 -06:00
beatrix	136458eaf4	Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearing Revert `245816ab27` (fixes #348)	2018-02-10 21:47:27 -05:00
Thibaut Girka	fb6f131fa1	Revert `245816ab27` (fixes #348 ) Since `245816ab27`, IntersectionObserverArticle assumes that its children do not change unless the number of children changes. This is not the case with the notification overlay, which resulted in the checkmark of notification cleaning mode not updating unless scrolling to make notifications appear/disappear. This change may negatively impact performances.	2018-02-10 20:59:50 +01:00
David Yip	f1f67c46c5	Use Html2Text to generate plaintext for keyword mutes. #236 . This allows us to match URLs inside link hrefs.	2018-02-10 10:36:16 -06:00
David Yip	53c86b29f0	Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234 . The class helps out with keyword mutes, not just some general concept of "filtering".	2018-02-10 10:36:15 -06:00
ThibG	411c9ecb4b	Fix password recovery (#6459 ) * Fix password recovery * Use “resource” instead of “current_user”	2018-02-10 17:09:44 +01:00
David Yip	d263e3bc2d	Fill out some examples for Glitch::FilterHelper. #234 . Also add HTML entity decoding to Glitch::FilterHelper, which is needed to e.g. match "<" to the tag-stripped version of "<p><3</p>" or "<p><3</p>".	2018-02-10 02:40:27 -06:00
David Yip	29b5b46c87	Strip HTML from keyword mute input. #234 .	2018-02-10 02:40:27 -06:00
Eugen Rochko	3ebc0ad4d3	Full-text search for authorized statuses (#6423 ) * Add full-text search for authorized statuses - Search API will return statuses that match the query - Only for logged in users - Only if you are author of the status, - Or you were mentioned in it - Or you favourited or reblogged it - Configuration over `ES_ENABLED`, `ES_HOST`, `ES_PORT`, `ES_PREFIX` - Run `rails chewy:deploy` to create & populate index Fix #5880 Fix #4293 Fix #1152 * Add commented out docker-compose configuration for ES container * Optimize index import, filter search results * Add basic normalization to the index * Add better stemming and normalization to the index * Skip webfinger request if search query includes both @ and a space * Fix code style * Visually separate search result sections * Fix code style issues	2018-02-09 23:04:47 +01:00
David Yip	020b40efdb	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: .travis.yml app/lib/user_settings_decorator.rb app/models/user.rb app/serializers/initial_state_serializer.rb app/views/stream_entries/_detailed_status.html.haml app/views/stream_entries/_simple_status.html.haml config/locales/simple_form.en.yml	2018-02-09 09:25:53 -06:00
Eugen Rochko	2ef9d0e101	Change web UI "posts" to "toots" on profile for consistency (#6447 )	2018-02-09 00:27:18 +01:00
Eugen Rochko	76f3d5d16b	Add preference to always display sensitive media (#6448 )	2018-02-09 00:26:57 +01:00
Jenkins	5ba2c300d8	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-08 23:17:14 +00:00
abcang	298c81c00f	Clear account cache of notification target_status (#6442 )	2018-02-08 15:33:23 +01:00
abcang	cf32f7da5c	Fix response of signature_verification_failure_reason (#6441 )	2018-02-08 05:00:45 +01:00
Akihiko Odaki	67f7ffa792	Change user_id column non-nullable (#6435 )	2018-02-07 16:35:44 +01:00
Jenkins	3405ea6dd9	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-05 02:17:12 +00:00
Daniel King	95c8232109	match hashtag regex in js client with server (#6431 ) the slight mismatch in hashtag regex between js and ruby was causing hashtag warning to be displayed for unlisted tweets when an invalid hashtag was entered exact version of ruby regex not possible in js as POSIX bracket expressions are not supported, this version approximates and doesn't give same unicode support	2018-02-05 02:44:13 +01:00
David Yip	a6fb1c58ee	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb	2018-02-04 16:36:19 -06:00
Eugen Rochko	38e0133e1b	Make PAM gem optional, allow configuration over environment (#6415 )	2018-02-04 15:05:53 +01:00
abcang	9b6223f5e2	Validation of count works even when text of status is nil (#6429 )	2018-02-04 12:32:41 +01:00
abcang	3f35d43222	Exclude nil from relationships array (#6427 )	2018-02-04 12:32:10 +01:00
abcang	c156a83e7d	Make sure status is not nil (#6428 )	2018-02-04 12:31:46 +01:00
Renato "Lond" Cerqueira	4e4f1b0dcb	Add option to show only local toots in timeline preview (#6292 ) * Add option to show only local toots in timeline preview Right know, toots from all the known fediverse are shown in the main page of an instance. That however doesn't reflect the instance itself. With this option the admin may choose to display only local toots so that users checking the instance get a better idea of internal conversations. * Fix issues pointed by codeclimate and eslint * Add default message for community timeline * Update pl.yml	2018-02-04 06:00:10 +01:00
Eugen Rochko	26f21fd5a0	CAS + SAML authentication feature (#6425 ) * Cas authentication feature * Config * Remove class_eval + Omniauth initializer * Codeclimate review * Codeclimate review 2 * Codeclimate review 3 * Remove uid/email reconciliation * SAML authentication * Clean up code * Improve login form * Fix code style issues * Add locales	2018-02-04 05:42:13 +01:00
Jenkins	530fcc1c14	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-02-04 03:17:11 +00:00
ncls7615	15a5b3372a	Fix detailed-status	2018-02-04 10:35:09 +09:00
takayamaki	d75d2a9f99	fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417 )	2018-02-03 18:41:51 +01:00
David Yip	4c1fd9a19c	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	2018-02-02 08:39:52 -06:00
abcang	33f56811e3	Fix column header button (#6411 )	2018-02-02 13:31:28 +01:00
abcang	7e5c433dfc	Fix saving of oEmbed image (#6409 )	2018-02-02 11:57:59 +01:00
Akihiko Odaki	c1efe0aa1d	Set minimum height for mastodon on drawer (#6142 )	2018-02-02 11:56:50 +01:00
ThibG	ac1093256c	Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207 )	2018-02-02 10:54:04 +01:00
Charlotte Fields	af40824998	moved save button (#3792 ) * moved save button * added save back to the bottom * Update show.html.haml	2018-02-02 10:45:43 +01:00
Akihiko Odaki	77dd9e7d27	Remove wave from list drawer (#6381 )	2018-02-02 10:32:41 +01:00
Akihiko Odaki	5da5c65db8	Unify links container implementation in about pages (#6382 ) They were redundant, and also had a inconsistency; the button for "other instances" had an icon for the external link in "more" page, but it didn't in the other pages. This unifies the implementation, and the external link icon is now shown in all the about pages.	2018-02-02 10:32:21 +01:00
Akihiko Odaki	0be9a1e321	Accept ActivityPub announce from the author of the original note (#6236 )	2018-02-02 10:22:15 +01:00
puckipedia	8e4cf6282b	Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225 )	2018-02-02 10:19:59 +01:00
Alexander	04fef7b888	pam authentication (#5303 ) * add pam support, without extra column * bugfixes for pam login * document options * fix code style * fix codestyle * fix tests * don't call remember_me without password * fix codestyle * improve checks for pam usage (should fix tests) * fix remember_me part 1 * add remember_token column because :rememberable requires either a password or this column. * migrate db for remember_token * move pam_authentication to the right place, fix logic bug in edit.html.haml * fix tests * fix pam authentication, improve username lookup, add comment * valid? is sometimes not honored, return nil instead trying to authenticate with pam * update devise_pam_authenticatable2 and adjust code. Fixes sideeffects observed in tests * update devise_pam_authenticatable gem, fixes for codeconventions, fix finding user * codeconvention fixes * code convention fixes * fix idention * update dependency, explicit conflict check * fix disabled password updates if in pam mode * fix check password if password is present, fix templates * block registration if account is maintained by pam * Revert "block registration if account is maintained by pam" This reverts commit 8e7a083d650240b6fac414926744b4b90b435f20. * fix identation error introduced by rebase * block usernames maintained by pam * document pam settings better * fix code style	2018-02-02 10:18:55 +01:00
abcang	ffb2b8ef8c	Fix button hiding when header title is too long (#6406 )	2018-02-01 17:17:17 +01:00
Jenkins	ad3a2dfb66	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-31 23:17:13 +00:00
Evgeny Petrov	3ed194b67d	Russian language updated (#6397 )	2018-02-01 07:33:54 +09:00
David Yip	f4b2478af1	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/views/layouts/mailer.html.haml config/locales/ko.yml	2018-01-28 22:45:17 -06:00
Eugen Rochko	47eda1e5fb	Fix padding bug in landing page column header (#6374 )	2018-01-29 01:10:59 +01:00
Eugen Rochko	79bc3d5845	Add direction tags to HTML e-mails for RTL languages (#6373 )	2018-01-29 00:22:20 +01:00
Renato "Lond" Cerqueira	106efba800	Weblate translations (#6370 ) * Translated using Weblate (German) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * Translated using Weblate (Slovak) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Arabic) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 69.6% (39 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Japanese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Galician) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Arabic) Currently translated at 67.7% (42 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Arabic) Currently translated at 71.4% (40 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Dutch) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Japanese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Spanish) Currently translated at 70.9% (44 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/ * Translated using Weblate (Spanish) Currently translated at 92.1% (515 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Spanish) Currently translated at 93.5% (58 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/ * Translated using Weblate (French) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/fr/ * Translated using Weblate (French) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (German) Currently translated at 89.0% (498 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/no/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/no/ * Translated using Weblate (Swedish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/no/ * Translated using Weblate (Hungarian) Currently translated at 37.5% (21 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hu/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/ * Translated using Weblate (German) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/de/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/ * Translated using Weblate (French) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Esperanto) Currently translated at 93.3% (70 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt/ * Translated using Weblate (German) Currently translated at 90.3% (505 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Portuguese) Currently translated at 91.4% (511 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Spanish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/ * Added translation using Weblate (Spanish) * Translated using Weblate (Spanish) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/es/ * Translated using Weblate (French) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Korean) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 99.6% (557 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (German) Currently translated at 90.8% (508 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.0% (509 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.9% (514 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 91.9% (514 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 92.6% (518 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 92.8% (519 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Spanish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/es/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/no/ * Translated using Weblate (Swedish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sv/ * Translated using Weblate (Arabic) Currently translated at 85.7% (48 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Esperanto) Currently translated at 90.3% (56 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/eo/ * Translated using Weblate (Esperanto) Currently translated at 97.3% (73 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/eo/ * Translated using Weblate (Norwegian (old code)) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/no/ * Translated using Weblate (Finnish) Currently translated at 25.9% (145 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fi/ * Translated using Weblate (Portuguese) Currently translated at 96.2% (538 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Portuguese) Currently translated at 92.8% (52 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Spanish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Spanish) Currently translated at 99.4% (556 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Esperanto) Currently translated at 87.5% (49 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eo/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Slovak) Currently translated at 59.7% (334 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (French) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Korean) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ko/ * Translated using Weblate (Korean) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Korean) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ko/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 99.2% (555 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Hungarian) Currently translated at 67.9% (380 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Hungarian) Currently translated at 72.2% (404 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ Sajnos nem találtam magyar megfelelőt * Translated using Weblate (Hungarian) Currently translated at 96.0% (537 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Hungarian) Currently translated at 66.0% (37 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/hu/ * Translated using Weblate (Catalan) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Finnish) Currently translated at 83.9% (47 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Catalan) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Swedish) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sv/ * Translated using Weblate (Swedish) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sv/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Hungarian) Currently translated at 96.9% (542 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/hu/ * Translated using Weblate (Japanese) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Esperanto) Currently translated at 60.2% (337 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eo/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ [eo] Tiu parto de la frazo jam estas tradukita aliloke ☺ * Translated using Weblate (Slovak) Currently translated at 60.8% (340 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (264 of 264 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 70.9% (44 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations * Add back translations weblate removed	2018-01-28 22:48:09 +09:00
Quenty31	bd8d8ad894	l10n Occitan update (#6367 ) * Final point missing + s'acabar => expirar * Update oc.yml * Update oc.json	2018-01-27 08:51:03 +09:00
Jenkins	0e10667fbe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-24 19:17:11 +00:00
abcang	a3c0a20373	Fix initial_state me in push_notification_register (#6349 )	2018-01-24 14:37:46 +01:00
codl	9abb5becf4	remove escapes from server-side γaml handler this matches a change that was made in the client-side equivalent	2018-01-24 14:23:25 +01:00
abcang	8cd2828e91	Fix hide and show media button on admin page (#6347 )	2018-01-24 13:29:46 +01:00
Quenty31	7650506b39	l10n Occitan language update (#6346 ) * Small changes * update for email templates * Digest changed * Update oc.yml waiting to finish * Update oc.yml * Update oc.yml * Update oc.yml * Update oc.json	2018-01-24 13:29:03 +01:00
Eugen Rochko	daefbd66a6	Fix style of legacy column headers (#6342 ) * Fix regression from #6199: Style of legacy column headers * Fix tests * Clean up variables	2018-01-24 04:03:51 +01:00
Eugen Rochko	1cc44cba81	Fix #6331 (#6341 ) UserTrackingConcern is circumvented by SessionsController#create because it calls warden, which calls the User#update_tracked_fields! method directly. Move returning user logic to that method.	2018-01-23 20:52:30 +01:00
ThibG	4ec9d8b4d9	Display deleted users' role as “Suspended” (#6339 ) Follow-up to `6eb60260b1` which missed a spot where the same error occurs.	2018-01-23 14:31:31 +01:00
Eugen Rochko	2fc2725076	Fix e-mail icon for reblog being stretched (#6336 )	2018-01-23 14:30:28 +01:00
Thibaut Girka	2107891edb	Remove some leftover code, I guess	2018-01-23 09:20:18 +01:00
cwm	0ddeed9377	add 'this.props' to fetchLists	2018-01-23 01:23:56 -06:00
Eugen Rochko	69f13e7bca	Fix regression from #6199 : Make entire column header clickable (#6334 )	2018-01-23 05:06:29 +01:00
cwm	939075899e	remove unused openOnboardingModal from getting_started	2018-01-22 19:38:34 -06:00
cwm	00be9eb3fe	merge tootsuite pr #6313 into glitch	2018-01-22 19:05:13 -06:00
Akihiko Odaki	613e7c7521	Rename ResolveRemoteAccountService to ResolveAccountService (#6327 ) The service used to be named ResolveRemoteAccountService resolves local accounts as well.	2018-01-22 14:25:09 +01:00
Akihiko Odaki	17cecd75ca	Rename FetchRemoteResourceService to ResolveURLService (#6328 ) The service used to be named FetchRemoteResourceService resolves local URL as well.	2018-01-22 14:24:22 +01:00
Akihiko Odaki	8cc65cde27	Resolve URL for local account in follow authorization success view (#6324 )	2018-01-22 14:22:14 +01:00
Renato "Lond" Cerqueira	b7f6ddeaf1	Weblate translations (#6323 ) * Translated using Weblate (Galician) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (543 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (543 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 95.2% (517 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 99.6% (259 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Dutch) Currently translated at 97.1% (543 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (559 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Japanese) Currently translated at 99.1% (554 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (French) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Polish) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Catalan) Currently translated at 94.6% (529 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 95.3% (533 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Dutch) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 98.3% (550 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 95.3% (533 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Japanese) Currently translated at 0.0% (0 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 1.7% (1 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 1.7% (52 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Galician) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Polish) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ * Translated using Weblate (Catalan) Currently translated at 99.6% (260 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Japanese) Currently translated at 99.6% (260 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Japanese) Currently translated at 99.6% (260 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (French) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (French) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (French) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (French) Currently translated at 99.2% (555 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 99.8% (558 of 559 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (French) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/ * Translated using Weblate (French) Currently translated at 100.0% (261 of 261 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations * Add back values removed by weblate	2018-01-22 14:20:58 +01:00
David Yip	48d79007f6	Merge remote-tracking branch 'origin/master' into merge-upstream-20180121	2018-01-21 16:26:50 -06:00
Norayr Chilingarian	48cd6dc6ca	armenian translations initial commit (#6320 ) * adding armenian translations * updating config files for armenian translations * armenian translation fix * fixing spaces	2018-01-22 05:02:23 +09:00
David Yip	1253279feb	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	2018-01-21 13:36:10 -06:00
codl	cfd2b06821	fix filter search index being too strict when looking for line breaks (#6318 )	2018-01-21 13:23:17 +01:00
Aboobacker MK	112b1fa265	Redirect to 2FA creation page when otp_secret is not available (#6314 )	2018-01-21 13:21:28 +01:00
Eugen Rochko	31d1485887	Display number of follow requests in getting started menu, and (#6313 ) if notifications column is not mounted, also display number of unread notifications there.	2018-01-21 13:20:20 +01:00
Eugen Rochko	1287de1b83	Fix invalid value passed to full_asset_url in mailers (#6312 )	2018-01-21 13:20:00 +01:00
David Yip	2c578a01d8	Merge remote-tracking branch 'origin/master' into gs-master	2018-01-20 16:42:57 -06:00
David Yip	e7a0840f8c	Merge pull request #336 from ThibG/glitch-soc/features/tag-warning Display a warning when composing unlisted toots with something looking like a hashtag	2018-01-20 16:37:52 -06:00
David Yip	24b6e4121f	Merge pull request #342 from glitch-soc/merge-upstream Merge upstream	2018-01-20 16:37:35 -06:00
Iijima Yasushi	72f9eab3d6	Change mailer avatar url (#6309 ) * Change mailer avatar url * Use full_asset_url method	2018-01-20 19:27:13 +01:00
David Yip	3cae362214	Merge new onboarding styles; delete refs to PNGs.	2018-01-20 11:23:06 -06:00
David Yip	38f6d8130d	Eliminate stray conflict markers.	2018-01-20 10:46:43 -06:00
David Yip	071c2c9c85	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	2018-01-20 10:45:43 -06:00
SerCom_KC	80b3ca0f6f	Update Simplified Chinese translations (#6306 ) * i18n: (zh-CN) Add translations of #6251 * i18n: (zh-CN) Improve translations for #6291 * Fix en.json * i18n: (zh-CN) Update translations for #6303 * i18n: (zh-CN) Add translations of #6273 with minor adjustment * Minor fix * Minor fix	2018-01-21 00:11:21 +09:00
Eugen Rochko	45afdf1781	Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305 )	2018-01-20 03:49:06 +01:00
Eugen Rochko	79b34a0fa2	Restore onboarding modal (#6303 ) * Restore onboarding modal Revert 5ba8b3a396895ecec083c5258aaf9084d584a7c4 * Change greeting elephant graphic, fix up some design issues * Fix wrong link color in onboarding modal	2018-01-20 01:32:37 +01:00
Eugen Rochko	872a0d5bd8	Improve HTML e-mails based on Litmus tests (#6301 ) * Use PNG images in HTML e-mails * Make webpack use URLs with host so fonts load inside HTML e-mails Convert this back to a relative URL in the premailer CSS loader since local requests are quicker * Improve responsive design * Add missing PNG icon	2018-01-20 01:32:21 +01:00
Eugen Rochko	01421999ae	Make text e-mails consistent with HTML ones in UserMailer (#6291 ) * Make text e-mails consistent with HTML ones in UserMailer * Fix UserMailer specs	2018-01-20 01:32:05 +01:00
David Yip	2ca965c704	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	2018-01-19 15:22:10 -06:00
Thibaut Girka	1619efd735	Do not discard statuses obtained via websocket when API request finishes This backports `0b888acfd4`	2018-01-19 21:59:12 +01:00
ThibG	0b888acfd4	Do not throw away statuses obtained via websocket when API request finishes (#6302 )	2018-01-19 21:48:00 +01:00
Yamagishi Kazutoshi	238de58e65	Change belongs_to_required_by_default to true (#5888 )	2018-01-19 20:56:47 +01:00
ThibG	b1e03197fa	Process mentions and reblogs even from resolved threads (#6299 ) This may lead to out-of-order notifications, but this is better than not having notifications at all.	2018-01-19 19:11:35 +01:00
ThibG	a0de3222dd	Retry delivering toots over ActivityPub for about 2 days (#6298 ) Currently, Mastodon will retry delivering toots for a bit over 1 hour. This is a very short timespan when considering private and direct toots, which cannot be seen by the recipient at all after the delivery attempts have failed. Ideally, private and direct toots should have a different number of retries, but I do not know how to do that.	2018-01-19 15:49:48 +01:00
Eugen Rochko	540b3f37ae	Replace drawer elephant graphic with a vector image (#6286 ) * Replace drawer elephant graphic with a vector image * Replace wave graphic with SVG * Remove unused elephant graphic	2018-01-19 15:25:27 +01:00
Thibaut Girka	1287b2782b	Display a warning when composing unlisted toots with something looking like a hashtag This is a backport of `b6af88192f` to the glitch flavour.	2018-01-19 12:59:33 +01:00
David Yip	26ecee79bf	Merge pull request #332 from glitch-soc/merge-upstream Merge in home feed regeneration changes from upstream	2018-01-18 22:00:11 -06:00
Eugen Rochko	9b3b40df66	Fix regeneration marker not expiring (#6290 ) * Fix regeneration key not getting expired * Add rake task to remove old regeneration markers	2018-01-18 20:29:56 +01:00
Eugen Rochko	d799921c75	Replace tutorial modal with welcome e-mail (#6273 ) * Remove onboarding modal * Welcome e-mail * Send welcome e-mail after confirmation * Remove obsolete translations	2018-01-18 19:17:25 +01:00
David Yip	766d6aac44	Strip trailing whitespace on win95.scss	2018-01-18 10:54:50 -06:00
David Yip	d3f64812a6	Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update Conflicts: app/javascript/styles/win95.scss config/themes.yml	2018-01-18 10:54:12 -06:00
David Yip	3896cd5d79	Use absolute paths for new working/not-found SVGs This allows these component styles to be used in i.e. the win95 skin.	2018-01-18 10:25:54 -06:00
David Yip	bcd86404da	Port `7badad7797` to glitch frontend	2018-01-18 10:25:37 -06:00
David Yip	1964a0f941	Merge remote-tracking branch 'origin/master' into merge-upstream	2018-01-18 09:17:58 -06:00
David Yip	e27eedbd08	Merge branch 'gs-master' into merge-upstream	2018-01-18 09:14:28 -06:00
David Yip	708ec07e27	Style fixes to make eslint happier, hopefully	2018-01-18 09:13:07 -06:00
Renato "Lond" Cerqueira	e56404be41	When must_be_following_dm is on, only notify if recipient dm'ed user (#6283 ) * When must_be_following_dm is on, only notify if recipient dm'ed user Currently, when must_be_following_dm is on, if a user sends a direct message replying to any status from the recipient, the recipient gets a notification. This should not be the case, as if the recipient posted something publicly this can be used to spam their notifications. * Refactor replied_to_status_is_direct_message? Following suggestion in PR	2018-01-18 16:12:10 +01:00
David Yip	201e82686f	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	2018-01-17 18:37:09 -06:00
Eugen Rochko	7badad7797	Fix home regeneration (#6251 ) * Fix regeneration marker not being removed after completion * Return HTTP 206 from /api/v1/timelines/home if regeneration in progress Prioritize RegenerationWorker by putting it into default queue * Display loading indicator and poll home timeline while it regenerates * Add graphic to regeneration message * Make "not found" indicator consistent with home regeneration	2018-01-17 23:56:03 +01:00
Renato "Lond" Cerqueira	59797ee233	Weblate translations (#6284 ) * Translated using Weblate (French) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Catalan) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ca/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 100.0% (529 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/nl/ * Translated using Weblate (Galician) Currently translated at 100.0% (529 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (527 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (528 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Slovak) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 37.2% (197 of 529 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (260 of 260 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Russian) Currently translated at 99.0% (526 of 531 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Catalan) Currently translated at 100.0% (45 of 45 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/ * Translated using Weblate (Catalan) Currently translated at 99.8% (530 of 531 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Japanese) Currently translated at 92.8% (52 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 75.8% (47 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ * Translated using Weblate (Polish) Currently translated at 77.4% (48 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Slovak) Currently translated at 38.3% (204 of 532 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Japanese) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ja/ * Translated using Weblate (Catalan) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ca/ * Translated using Weblate (Polish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pl/ * Translated using Weblate (Russian) Currently translated at 96.8% (525 of 542 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Japanese) Currently translated at 99.0% (537 of 542 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Polish) Currently translated at 99.8% (541 of 542 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Japanese) Currently translated at 99.0% (538 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Dutch) Currently translated at 97.4% (529 of 543 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations	2018-01-18 07:00:23 +09:00
Jenkins	aa2bf07281	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-17 16:17:10 +00:00
りんすき	fbe7756da6	implement web share target (#6278 ) * web share target * fix * fix	2018-01-17 17:08:10 +01:00
Yamagishi Kazutoshi	0a103c7749	Upgrade ESLint to version 4.x (#6276 )	2018-01-17 16:57:15 +01:00
SerCom_KC	fb16c37d2a	Update Simplified Chinese translations (#6280 ) * i18n: (zh-CN) Update translation for #6252 * e-mail -> email * i18n: (zh-CN) Update translations for #6256 * i18n: (zh-CN) Minor Improvements * i18n: (zh-CN) Update translations for #6263 * i18n: (zh-CN) Update translations for #6279	2018-01-17 16:47:25 +01:00
Eugen Rochko	6f244ba82c	Use better reblog icon and improve contrast in HTML e-mails (#6272 )	2018-01-17 14:12:59 +01:00
mayaeh	eed7484cd6	Change mailer image url (#6279 ) * Change image URL in mailer to full path * Add application_mailer.view_profile localization.	2018-01-17 12:41:24 +01:00
Eugen Rochko	02194838dd	HTML e-mails for NotificationMailer (#6263 ) * HTML e-mails for NotificationMailer (except digest) * Add HTML template for digest * Fix build	2018-01-16 20:20:15 +01:00
Yamagishi Kazutoshi	9a28052e92	Change image URL in mailer to full path (#6264 )	2018-01-16 06:26:46 +01:00
kibi!	60ff086960	Fixed improper mailer import	2018-01-15 21:23:26 -08:00
kibi!	cda845ae0e	Fix mailer to use webpack core	2018-01-15 21:17:03 -08:00
David Yip	89a9d629f7	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock	2018-01-15 22:17:48 -06:00
Eugen Rochko	5276c0a090	HTML e-mails for UserMailer (#6256 ) - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	2018-01-16 03:29:11 +01:00
Eugen Rochko	7861c5f108	Surround mid-text display names with bdi tags (#6257 ) * Fix #1095 - Surround mid-text display names with bdi tags * Update jest snapshot	2018-01-15 18:55:10 +01:00
Eugen Rochko	3987bd18a4	Fix #6128 - Display unfollow button even if account moved (#6258 )	2018-01-15 18:42:15 +01:00
Jenkins	0c7dc6c781	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-15 06:17:15 +00:00
puckipedia	74c1c9ec01	Allow attributedTo in a status to be an embedded object (#6238 )	2018-01-15 06:51:46 +01:00
Patrick Figel	537d2939b1	Suppress CSRF token warnings (#6240 ) CSRF token checking was enabled for API controllers in #6223, producing "Can't verify CSRF token authenticity" log spam. This disables logging of failed CSRF checks. This also changes the protection strategy for PushSubscriptionsController to use exceptions, making it consistent with other controllers that use sessions.	2018-01-15 06:51:23 +01:00
neetshin	2091ae92be	Make columns-area unscrollable when modal opened (#6241 ) * Add aria-autocomplete='list' in Textaria ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete * Make detect empty string brefore assign upload description * Change code elements in keyboard-shortcuts component to kbd * Add validation for onMuteNotifications * Make columns-area unscrollable when modal opend * Make columns-area unscrollable when modal opened	2018-01-15 06:51:00 +01:00
Eugen Rochko	ed867eca9d	Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252 )	2018-01-15 04:34:28 +01:00
Gô Shoemake	08e4c78e78	Fix column headers accessibility (#6199 ) * Fix accessibility of column headers As a screen reader user new to Mastodon, I encountered the following issues with the column headers as designed: * Jumping between them was difficult. FOr instance, passing my home timeline to reach notification settings was difficult to impossible, especially considering infinite scrolling. * There doesn't appear to be any means for triggering the control via the keyboard. the `titleClick` handler only responds to mouse clicks. * I didn't even realize there was a Settings toggle until I made this change. Thanks for using ARIA in your designs. It's a huge help. But adding a `button` role doesn't add keyboard handling and other button behavior. Also, because the role was on the heading container, it obscured the controls within the container itself. This fix resolve that. It also exposes the headings as headings rather than buttons, enabling skipping columns by using screen readers' heading navigation commands. Since I myself am blind, if this fix requires additional visual styling, I'd like help applying that so it can be merged. I'd consider it an essential accessibility fix for my and other blind users' existence on the platform. Thanks! * Styling fixes * Fixed overflow issue	2018-01-15 04:33:06 +01:00
kibi!	8ee6ed358f	Increase priority of favstar gold	2018-01-14 16:05:44 -08:00
kibi!	1ee0e91fb6	Fixes to notification styling	2018-01-14 15:48:54 -08:00
kibi!	b9f4896830	Fixes to drawer and CWs	2018-01-14 15:31:00 -08:00
beatrix	cd6674606f	Merge pull request #329 from KnzkDev/scss-refactor SCSS Refactor	2018-01-14 17:48:02 -05:00
beatrix	39f231f3da	Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend Add glitchy elephant friend	2018-01-14 17:40:27 -05:00
kibi!	0fb3bd09e9	Oops this should have been a part of last commit	2018-01-14 14:21:41 -08:00
kibi!	1fa03e026a	Fixes onboarding modal (#318 )	2018-01-14 14:13:24 -08:00
kibi!	a5931e1f48	Fixed autocollapse detection	2018-01-14 13:29:51 -08:00
David Yip	c2669f93d0	Fix eslint errors. #294 .	2018-01-14 05:56:43 -06:00
David Yip	756a9cd139	Run slightly less afoul of accessibility checks. #294 . This makes the clickable element an interactive element, but doesn't add alt text and makes it not-obvious that you can click the elefriend. On one hand, this goes against good practice; on the other hand, it's not supposed to be obvious that you can click the elefriend.	2018-01-14 05:07:08 -06:00
David Yip	e64cc311dd	Introduce a bit of luck into the elefriend selection. #294 .	2018-01-14 04:46:21 -06:00
David Yip	53cbc9933e	Add wave background; blend elefriend in a bit more. #294 .	2018-01-14 04:00:21 -06:00
David Yip	cd1377de7f	Bind click event to elefriend cycling. #294 .	2018-01-14 03:35:25 -06:00
David Yip	1dbb6b5e08	Set glitchy elephant friend variant in initial state. #294 . Also lay some groundwork needed to interactively change the glitchfriend. The codebase uses "elefriend" because it's shorter and didn't require me to realign the actions in actions/compose.js. Same idea, though.	2018-01-14 03:06:11 -06:00
David Yip	1e0b707018	Add the shrinking glitchy elefriend. #294 .	2018-01-13 21:27:39 -06:00
David Yip	835eec8a4c	Prototype out glitchy elephant friend. #294 . Glitched elephant friends kindly provided by @ncls7615.	2018-01-13 21:27:14 -06:00
ncls7615	f9b08e2142	Fix collapsed toot style	2018-01-14 11:13:55 +09:00
ncls7615	1ebe66b78c	Fix un-fullwidth media style	2018-01-14 11:07:32 +09:00
ncls7615	be2bac05aa	Fix media detailed style	2018-01-14 10:38:51 +09:00
ncls7615	b5476f6c75	Fix confirmation modal bug	2018-01-14 09:51:01 +09:00
ncls7615	bc0524834e	Fix letterbox bug	2018-01-14 09:25:35 +09:00
ncls7615	6ecf81cacf	Improve scss refactor 5	2018-01-14 09:17:38 +09:00
ncls7615	64425dbb77	Improve scss refactor 4	2018-01-14 09:12:10 +09:00
ncls7615	a16d885ac9	Improve scss refactor 3	2018-01-14 08:47:59 +09:00
ncls7615	5f35b39f6f	Improve scss refactor 2	2018-01-14 07:48:18 +09:00
ncls7615	bb2ca23839	Improve scss refactor 1	2018-01-14 07:18:50 +09:00
ncls7615	a9be680807	Fix padded-blocks error	2018-01-14 04:12:41 +09:00
ncls7615	6a73c8c8a2	Initial scss refactor	2018-01-14 03:41:20 +09:00
Gô Shoemake	3a0b47982d	load public.js on vanilla#admin	2018-01-12 18:52:53 -08:00
Gô Shoemake	9b9b7fa005	Load packs/public.js for glitch#admin	2018-01-12 18:51:52 -08:00
David Yip	0210e59759	Merge remote-tracking branch 'remotes/origin/fix-column-headers-accessibility'	2018-01-12 20:10:58 -06:00
Marcin Mikołajczak	ee7217bc94	i18n: Update Polish translation Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	2018-01-12 23:08:51 +01:00
ncls7615	cf5789146b	Fix dropdown text	2018-01-12 23:18:25 +09:00
Jenkins	9fa79bc317	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-12 02:17:15 +00:00
Jeong Arm	704053d221	Handle sessions that can't be translated (#6245 ) * Handle sessions that can't be translated This commit fixes #6165. * Fix typo	2018-01-12 02:44:28 +01:00
David Yip	395e64e858	Thank you, Officer Murphy	2018-01-10 12:10:43 -06:00
David Yip	514db316f7	The flavour parameter is unused, so omit it (#317 )	2018-01-10 12:09:42 -06:00
David Yip	6fcb870d96	Allow for user object to be empty. Fixes #317 . If a flavour has only one skin, the skin selector will be omitted. This omits the user[setting_skin] field, and because that's the only user[...] field on the page, the entire user object will not be present in the request handler's params object. This commit accounts for that scenario by avoiding params.require(:user) and instead picking out what we need from the params hash.	2018-01-10 12:09:42 -06:00
David Yip	095a00ef3d	Merge pull request #316 from glitch-soc/fix-async Fix glitch async chunks	2018-01-09 18:30:45 -06:00
kibigo!	35be02f21d	Renamed glitch async chunks	2018-01-09 16:26:14 -08:00
David Yip	622c8fdb75	Merge pull request #314 from chriswmartin/merge-vanilla-updates-2 Merge vanilla updates into glitch - round 2	2018-01-09 17:01:23 -06:00
David Yip	991371af5f	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: db/schema.rb	2018-01-09 14:16:45 -06:00
Eugen Rochko	35b84985a8	Skip ActivityPub Announces of non-public objects (#6230 ) * Skip ActivityPub Announces of non-public objects * Skip OStatus reblogs of non-public statuses	2018-01-09 19:35:10 +01:00
Eugen Rochko	d41f0b66cc	Fix #6204 : Use content warning for page title when present (#6231 )	2018-01-09 19:34:58 +01:00
cwm	aef4b1af66	Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223 )	2018-01-09 10:51:14 -06:00
cwm	f43c2f12f3	Fix overflowing audit logs (tootsuite pr #6184 )	2018-01-09 10:40:14 -06:00
cwm	9bdbe66316	Set background to the navigation of Getting Started column (tootsuite pr #6163 )	2018-01-09 10:37:27 -06:00
cwm	b535f24fe5	Use const instead of let for constant (tootsuite pr #6106 )	2018-01-09 10:35:36 -06:00
cwm	0d4dcb5fb2	change key to path in timeline settings containers	2018-01-09 09:58:40 -06:00
cwm	6d1c325167	Rename key to path in actions and reducers for settings (tootsuite pr #6105 )	2018-01-09 09:48:14 -06:00
cwm	7f4374d97d	Fix newlines-to-spaces functionality (tootsuite pr #6158 )	2018-01-09 08:52:14 -06:00
cwm	8a0e4bb9a4	Hide moved account's follow button in search result (tootsuite pr #5913 )	2018-01-09 08:50:55 -06:00
cwm	5963630c63	Prevent duplicate load of favourites (tootsuite pr #5931 )	2018-01-09 08:46:35 -06:00
Jenkins	e780d5951b	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-09 12:17:16 +00:00
Renato "Lond" Cerqueira	9f04b0d4b1	Weblate translations (#6228 ) * Translated using Weblate (Catalan) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (523 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Dutch) Currently translated at 100.0% (525 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Arabic) Currently translated at 80.3% (45 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 83.9% (47 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Persian) Currently translated at 87.6% (460 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Japanese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ja/ * Translated using Weblate (Japanese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Catalan) Currently translated at 99.2% (521 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Portuguese) Currently translated at 47.2% (248 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 48.0% (252 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Persian) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Dutch) Currently translated at 100.0% (525 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Japanese) Currently translated at 99.0% (520 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Persian) Currently translated at 90.4% (475 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Polish) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Polish) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pl/ * Translated using Weblate (Persian) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/ * Translated using Weblate (Persian) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fa/ * Translated using Weblate (Polish) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (Persian) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fa/ * Translated using Weblate (Portuguese) Currently translated at 48.3% (254 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Portuguese) Currently translated at 56.5% (297 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 59.4% (312 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/nl/ * Translated using Weblate (Arabic) Currently translated at 91.0% (51 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Portuguese) Currently translated at 59.6% (313 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.6% (523 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Portuguese) Currently translated at 67.6% (355 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Arabic) Currently translated at 98.2% (55 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Arabic) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Galician) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Arabic) Currently translated at 51.1% (22 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Galician) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/gl/ * Added translation using Weblate (Galician) * Added translation using Weblate (Galician) * Translated using Weblate (Galician) Currently translated at 50.0% (1 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (43 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/gl/ * Added translation using Weblate (Galician) * Translated using Weblate (Galician) Currently translated at 24.0% (126 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Added translation using Weblate (Portuguese) * Translated using Weblate (Arabic) Currently translated at 55.2% (290 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Galician) Currently translated at 42.6% (224 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Portuguese) Currently translated at 80.9% (425 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Arabic) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt/ * Translated using Weblate (Arabic) Currently translated at 62.7% (27 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (75 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/pt/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/pt/ * Translated using Weblate (Arabic) Currently translated at 100.0% (56 of 56 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/pt/ * Translated using Weblate (Portuguese) Currently translated at 81.3% (427 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Galician) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/ * Translated using Weblate (Galician) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Portuguese) Currently translated at 93.7% (492 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese) Currently translated at 95.4% (501 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (525 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Galician) Currently translated at 99.8% (524 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (525 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Portuguese) Currently translated at 96.0% (504 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Dutch) Currently translated at 100.0% (257 of 257 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Arabic) Currently translated at 69.7% (30 of 43 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/ar/ * Translated using Weblate (Portuguese) Currently translated at 97.9% (514 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (523 of 525 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations * Add back simple_forms removed by weblate Weblate for some reason removed this files, add back to their previous versions * Remove linebreak on doorkeeper.pt.yml PR review	2018-01-09 20:30:28 +09:00
David Yip	ce7f4aef16	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2018-01-08 23:20:39 -06:00
David Yip	ec0bdd6c1a	Merge pull request #312 from glitch-soc/tag-sensitive-imgs Show SENSITIVE tag on sensitive images (#267)	2018-01-08 23:19:14 -06:00
David Yip	df04da098a	Merge pull request #311 from glitch-soc/dont-show-solo-skins Don't show skins selector when there's only one (#256)	2018-01-08 23:18:30 -06:00
Jenkins	7c719c567c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-09 05:17:13 +00:00
kibigo!	60433d03f5	Add missing comma	2018-01-08 18:38:28 -08:00
kibigo!	5d2ef7a616	Show SENSITIVE tag on sensitive images (#267 )	2018-01-08 18:25:29 -08:00
kibigo!	44792de49a	Don't show skins selector when there's only one (#256 )	2018-01-08 16:45:32 -08:00
kibigo!	824a790e63	Threads now inherit privacy directly (#309 )	2018-01-08 16:35:01 -08:00
puckipedia	628358aeea	Add the author of a status to cc if reblogged (#6226 ) This makes slightly more sense, and ensures that the author of a post is always referenced in the audience (which some servers might rely on). And the announce is POSTed to the author's inbox anyways.	2018-01-09 00:47:43 +01:00
Andrew	fe6663ef50	Minor style fixes	2018-01-08 11:49:08 -08:00
nightpool	c235711ffe	Refactor /api/web APIs to use the centralized axios instance (#6223 ) Also adds the ability to decouple the centralized axios logic from the state dispatcher	2018-01-08 20:01:33 +01:00
ncls7615	ef0b7d1e76	fix list editor scss	2018-01-09 02:50:24 +09:00
David Yip	65986b6f0b	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	2018-01-08 09:48:42 -06:00
David Yip	2dc4fbbd1a	When pulling out max_toot_chars, handle nulls flavours/glitch/util/initial_state is used in places where we want to exhibit different behavior based on user preferences. This means that it's used in places where no preference is defined, i.e. on an unauthenticated access. All values exported from that module must therefore expect that case; previously, the max chars value didn't. Addresses #306.	2018-01-08 09:45:59 -06:00
Jenkins	f839ac694c	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 10:17:15 +00:00
Eugen Rochko	dbda87c31f	Revert #5772 (#6221 )	2018-01-08 10:57:52 +01:00
Jenkins	722b3f567f	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-01-08 04:17:11 +00:00
Eugen Rochko	e4a241abef	Fix bad URL schemes being accepted (#6219 ) * Fix actors accepting invalid URI schemes or different host between URI and URL * Fix statuses accepting invalid URI scheme or different host to actor * Adjust tests to new requirements * Improve readability of mismatching_origin?/invalid_origin? methods	2018-01-08 05:00:23 +01:00
Eugen Rochko	93555182c3	Do not display elephant friend in single-column layout (#6222 )	2018-01-08 03:50:53 +01:00

... 2 3 4 5 6 ...

4129 commits