metu.life

Commit Graph

Author	SHA1	Message	Date
David Yip	2c578a01d8	Merge remote-tracking branch 'origin/master' into gs-master	6 years ago
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	6 years ago
David Yip	24b6e4121f	Merge pull request #342 from glitch-soc/merge-upstream Merge upstream	6 years ago
Iijima Yasushi	72f9eab3d6	Change mailer avatar url (#6309 ) * Change mailer avatar url * Use full_asset_url method	6 years ago
David Yip	3cae362214	Merge new onboarding styles; delete refs to PNGs.	6 years ago
David Yip	38f6d8130d	Eliminate stray conflict markers.	6 years ago
David Yip	071c2c9c85	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	6 years ago
Eugen Rochko	0b7a0d15c7	Bump version to 2.2.0rc1	6 years ago
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	6 years ago
Eugen Rochko	45afdf1781	Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305 )	6 years ago
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	6 years ago
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	6 years ago
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	6 years ago
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	6 years ago
David Yip	b8c6656ce9	Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaks Do not discard statuses obtained via websocket when API request finishes	6 years ago
Thibaut Girka	1619efd735	Do not discard statuses obtained via websocket when API request finishes This backports `0b888acfd4`	6 years ago
ThibG	0b888acfd4	Do not throw away statuses obtained via websocket when API request finishes (#6302 )	6 years ago
Yamagishi Kazutoshi	238de58e65	Change belongs_to_required_by_default to true (#5888 )	6 years ago
Yamagishi Kazutoshi	7233ac07d2	Add support Ruby v2.5.0 (#6097 )	6 years ago
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.	6 years ago
Pierre Ozoux	7be53a10b0	Fix "tzinfo-data is not present" docker error (#6300 ) when starting the container.	6 years ago
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.	6 years ago
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	6 years ago
Marcin Mikołajczak	852b48295f	i18n: Update Polish translation (#6297 )	6 years ago
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.	6 years ago
David Yip	2b2de41bc7	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	6 years ago
David Yip	26ecee79bf	Merge pull request #332 from glitch-soc/merge-upstream Merge in home feed regeneration changes from upstream	6 years ago
David Yip	ae369bceb3	Merge pull request #333 from glitch-soc/win95-update Update win95 theme from cybrespace/mastodon	6 years ago
Eugen Rochko	9b3b40df66	Fix regeneration marker not expiring (#6290 ) * Fix regeneration key not getting expired * Add rake task to remove old regeneration markers	6 years ago
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	6 years ago
David Yip	766d6aac44	Strip trailing whitespace on win95.scss	6 years ago
David Yip	d3f64812a6	Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update Conflicts: app/javascript/styles/win95.scss config/themes.yml	6 years ago
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.	6 years ago
David Yip	bcd86404da	Port `7badad7797` to glitch frontend	6 years ago
David Yip	1964a0f941	Merge remote-tracking branch 'origin/master' into merge-upstream	6 years ago
David Yip	e27eedbd08	Merge branch 'gs-master' into merge-upstream	6 years ago
David Yip	708ec07e27	Style fixes to make eslint happier, hopefully	6 years ago
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	6 years ago
David Yip	201e82686f	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	6 years ago
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	6 years ago
Jenkins	fe5c1f0803	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	6 years ago
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	6 years ago
Jenkins	aa2bf07281	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	6 years ago
りんすき	fbe7756da6	implement web share target (#6278 ) * web share target * fix * fix	6 years ago
Yamagishi Kazutoshi	0a103c7749	Upgrade ESLint to version 4.x (#6276 )	6 years ago
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	6 years ago
Eugen Rochko	6f244ba82c	Use better reblog icon and improve contrast in HTML e-mails (#6272 )	6 years ago
Mike Burns	ea75ae2d1f	Use be_within instead of eq for a to_f test match (#6275 ) Floating point values are notoriously hard to pin down, so use the `be_within` matcher to verify the approximate value.	6 years ago
Jeong Arm	acb982fc66	Korean translate (#6277 ) * Translate Korean * Translate Korean #6263	6 years ago
mayaeh	eed7484cd6	Change mailer image url (#6279 ) * Change image URL in mailer to full path * Add application_mailer.view_profile localization.	6 years ago

1 2 3 4 5 ...

5642 Commits (2c578a01d86ef65d1b0117f6fff32a6b57463dde) All Branches Search

5642 Commits (2c578a01d86ef65d1b0117f6fff32a6b57463dde)

All Branches