5166 Commits (18965cb0e611b226c6252f1669f228f5b95f1ac6)

 

All Branches   

Search

Author	SHA1	Message	Date
Stephen Burgess	18965cb0e6	feat(ShowMore): Add classname to show more/show less button (#6904)	7 years ago
Yuto Tokunaga	f691afaae9	Refactor scss (#6913) ... * Refactoring scss introduce scss variables for the media modal fix css block structure corresponding to react components fix flex layouts remove background image of the loaded image on the media modal * Fix typo	7 years ago
unarist	605a92b460	Fix moved account handling in IndexedDB feature (#6915) ... * Fix stack overflow on importFetchedAccounts When the account has moved property, it should process destination account instead of source account itself. * Set account id instead of account object for moved property This restores "foo has moved to" indication on account view, and fixes `reblog` index on `accounts` object store.	7 years ago
Yann Klis	3b2c7a33a9	Missing OTP_SECRET in scalingo.json (#6917)	7 years ago
Marcin Mikołajczak	85a395fab6	i18n: Update Polish translation (#6903) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Akihiko Odaki	cbf97c03bb	Allow clients to fetch notifications made while they were offline (#6886)	7 years ago
Akihiko Odaki	9a1a55ce52	Allow clients to fetch statuses made while they were offline (#6876)	7 years ago
Akihiko Odaki	59657e24b9	Rename variables to have semantic meanings in notifications reducer (#6890)	7 years ago
Akihiko Odaki	fe398a098e	Store objects to IndexedDB (#6826)	7 years ago
Yamagishi Kazutoshi	28384c1771	Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808) ... This reverts commit 40871caa4b.	7 years ago
Akihiko Odaki	ff7941e652	Show media modal on public pages (#6801)	7 years ago
Marcin Mikołajczak	1c15329cce	Change “Toots with replies” to “Toots and replies” (#6875) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	7 years ago
Akihiko Odaki	b2a4ffd3a9	Change columns in notifications nonnullable (#6764)	7 years ago
Akihiko Odaki	fa310695fa	Note if the user is already following the target when authorizing follow (#6325)	7 years ago
Jeroen	580835ab69	Invites: Add '1 week' as expire option (#6872) ... * Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Update en.yml	7 years ago
Akihiko Odaki	54b273bf99	Close http connection in perform method of Request class (#6889) ... HTTP connections must be explicitly closed in many cases, and letting perform method close connections makes its callers less redundant and prevent them from forgetting to close connections.	7 years ago
Akihiko Odaki	4e71b104e6	Internationalize unexpected error message (#6887)	7 years ago
Yamagishi Kazutoshi	65c10c0bc8	Weblate translations (2018-03-23) (#6874) ... * Translated using Weblate (Galician) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (587 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Arabic) Currently translated at 76.4% (449 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Japanese) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 92.3% (542 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Polish) Currently translated at 98.9% (581 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * Translated using Weblate (French) Currently translated at 99.6% (585 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.8% (586 of 587 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pt_BR/ * Translated using Weblate (Catalan) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * bundle exec i18n-tasks normalize && yarn manage:translations	7 years ago
Quentí	ecdc5957a3	[i18n] Occitan update (#6869) ... * Update oc.yml * Update simple_form.oc.yml * Update oc.json * Update oc.yml * bundle exec i18n-tasks normalize	7 years ago
Eugen Rochko	6cc432bbc4	Bump version to 2.3.2	7 years ago
Eugen Rochko	dafae9818d	Bump version to 2.3.2rc5	7 years ago
Eugen Rochko	9fe1619db9	Do not re-query mentions from serializers (#6858) ... Fix performance regression from #6836	7 years ago
Eugen Rochko	da70aca28e	Restore username validation to disallow dots, for now (#6863) ... Usernames with dots in them do not work with routes, because the dot usually separates the desired page format (e.g. json). I don't want to mess with changing route constraints for this patch release.	7 years ago
ThibG	6f531d140b	Fix MENTION_RE to not match nil usernames (#6862)	7 years ago
Eugen Rochko	f66a786029	Hide floating action button on thread views (#6859)	7 years ago
Patrick Figel	d97903a358	Update sanitize and loofah (#6855) ... Fixes CVE-2018-8048 and CVE-2018-3740, two medium-severity XSS vulnerabilities present in these gems when built against libxml2 >= 2.9.2.	7 years ago
Eugen Rochko	93897134ca	Permit dots in usernames with conditions (#6844) ... * Permit dots in usernames with conditions - Dot cannot be the start or end of username - a.lice and al.ice are considered the same during sign-up * Fix regex mixin flags	7 years ago
Akihiko Odaki	a6b59cd1a3	Remove debug option from Babel preset env (#6852)	7 years ago
Eugen Rochko	f64af6473f	Bump version to 2.3.2rc4	7 years ago
Eugen Rochko	ac49c7932d	Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845) ... Fix #6816, fix #6790	7 years ago
Akihiko Odaki	61dcb686a8	Fix i18n fallback configuration conflicts with environment configurations (#6843)	7 years ago
Eugen Rochko	9381a7d9d5	Use username/domain to match existing accounts in ActivityPub (#6842) ... See also: #6837, #6667	7 years ago
ThibG	a5c6c748e0	Cancel outdated pending compose suggestions (#6838)	7 years ago
Rey Tucker	36b5703796	request: in the event of failure, try other IPs (#6761) (#6813) ... * request: in the event of failure, try other IPs (#6761) In the case where a name has multiple A/AAAA records, we should try subsequent records instead of immediately failing when we have a failure on the first IP address. This significantly improves delivery success when there are network connectivity problems affecting only IPv4 or IPv6. * fix method call style * request_spec: adjust test case to use Addrinfo * request: Request/open: move private addr check to within begin/rescue * request_spec: add case to test failover, fix exception check * Double Addrinfo.foreach so that it correctly yields instances	7 years ago
ThibG	ff6b8a6443	Serialize mentions in the order they are added (#6836) ... Up until now, the order seemed to be in the *opposite* order, which caused the WebUI to populate mentions in reversed order when replying to toots local to one's instance.	7 years ago
ThibG	6b76a6212d	Display content warning in mail notification emails (#6832)	7 years ago
Alexander	33ee347c99	rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) (#6833)	7 years ago
Alexander	0306e3e9be	bugfixes and gem update (#6831) ... * update to new version of devise_pam_authenticatable2 * fix behaviour if suffix is nil, fix environment loading, fix user email creation * code cleanup/fix linter warning	7 years ago
ThibG	357f9298bd	Fix e-mail changed notification (fixes #6778) (#6835) ... In Devise::Mailer#email_changed, the new email might be in the email attr. See: https://github.com/plataformatec/devise/blob/master/app/views/devise/mailer/email_changed.html.erb	7 years ago
Renato "Lond" Cerqueira	f7c46fc113	Weblate translations 20180319 (#6827) ... * Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/pt_BR/ * Translated using Weblate (Spanish) Currently translated at 99.6% (579 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Japanese) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (French) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/ * Translated using Weblate (Spanish) Currently translated at 100.0% (58 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/es/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Spanish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Indonesian) Currently translated at 94.6% (71 of 75 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/id/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * 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 (Indonesian) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Dutch) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Arabic) Currently translated at 75.5% (439 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 76.2% (443 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Russian) Currently translated at 95.8% (557 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ru/ * Translated using Weblate (Finnish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 91.7% (533 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Dutch) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/ * Translated using Weblate (Spanish) Currently translated at 99.8% (580 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Finnish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fi/ * Translated using Weblate (Slovak) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Spanish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/es/ * Translated using Weblate (Swedish) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sv/ * Translated using Weblate (Finnish) Currently translated at 93.1% (54 of 58 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fi/ * Translated using Weblate (Arabic) Currently translated at 76.7% (446 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Slovak) Currently translated at 93.2% (542 of 581 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Arabic) Currently translated at 100.0% (280 of 280 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Normalize translations Ran i18n-tasks normalize && yarn manage:translations	7 years ago
Eugen Rochko	74c39fada0	Bump version to 2.3.2rc3	7 years ago
Eugen Rochko	f02411da40	Ignore media validation when attaching to status during processing (#6822) ... Fix #6821	7 years ago
Eugen Rochko	a568e3ca8e	Revert #6479, hide sensitive text/images from OpenGraph previews (#6818) ... Display summary of attachments in description, and mark up content warning if present, e.g.: Attached: 3 images · Content warning: Dota 2 When text is not supposed to be hidden, it looks more like: Attached: 3 images Here is the text of the toot With #6817, multilinguagility should be assured...	7 years ago
Eugen Rochko	3b440bd5af	Fix elephant graphic being draggable and selectable (#6819)	7 years ago
Eugen Rochko	39f27b6cf3	If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817) ... Fix #6784	7 years ago
Akihiko Odaki	721234230c	Synchronize HTML page cache with sessions (#6815)	7 years ago
nightpool	566ace2d64	Add entropy to download filenames (#6811) ... pretty quick fix, and with the 1 week expiration i don't think we need to be too worried about the existing files closes #6798	7 years ago
Eugen Rochko	092f1df9d0	Bump version to 2.3.2rc2	7 years ago
Eugen Rochko	844616e950	Re-add git and nodejs-npm to Dockerfile (#6810) ... Fix #6809 I don't know why, either	7 years ago
Eugen Rochko	40871caa4b	Revert "Upgrade Paperclip to version 6.0.0" (#6807) ... * Revert "Bump version to 2.3.2rc1" This reverts commit cdf8b92fea. * Revert "Downgrade Dockerfile to Ruby 2.4.3 on Alpine 3.6 (#6806)" This reverts commit 0074cad44f. * Revert "Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)" This reverts commit 4a0a19fe54. * Revert "Correct the reference to user's password in mastodon:add_user task (#6800)" This reverts commit 338bff8b93. * Revert "Upgrade Paperclip to version 6.0.0 (#6754)" This reverts commit b88fcd53f7.	7 years ago