glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Norayr Chilingarian	62e47f7041	armenian translations initial commit (#6320 ) * adding armenian translations * updating config files for armenian translations * armenian translation fix * fixing spaces	7 years ago
David Yip	a95ca95b7b	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/settings/two_factor_authentication/confirmations_controller.rb	7 years ago
codl	4d15390eb6	fix filter search index being too strict when looking for line breaks (#6318 )	7 years ago
ThibG	55567d05b2	Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319 ) Since `896cadceed`, assets URL are absolute and not relative. Unfortunately, the domain used to build such URLs is the wrong one: LOCAL_DOMAIN, and not WEB_DOMAIN, where the assets are stored.	7 years ago
Aboobacker MK	a1979b50c9	Redirect to 2FA creation page when otp_secret is not available (#6314 )	7 years ago
Eugen Rochko	4ee27e1630	Display number of follow requests in getting started menu, and (#6313 ) if notifications column is not mounted, also display number of unread notifications there.	7 years ago
Eugen Rochko	d9421e01df	Fix invalid value passed to full_asset_url in mailers (#6312 )	7 years ago
David Yip	d000f5dd80	Merge remote-tracking branch 'origin/master' into gs-master	7 years ago
David Yip	8354cca2fa	Merge pull request #336 from ThibG/glitch-soc/features/tag-warning Display a warning when composing unlisted toots with something looking like a hashtag	7 years ago
David Yip	6b4f90e5fb	Merge pull request #342 from glitch-soc/merge-upstream Merge upstream	7 years ago
Iijima Yasushi	c8d971a5c1	Change mailer avatar url (#6309 ) * Change mailer avatar url * Use full_asset_url method	7 years ago
David Yip	75dac5d056	Merge new onboarding styles; delete refs to PNGs.	7 years ago
David Yip	0f703fe455	Eliminate stray conflict markers.	7 years ago
David Yip	03f157f6da	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	b9794f1a49	Bump version to 2.2.0rc1	7 years ago
SerCom_KC	d26ae4a147	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	7 years ago
Eugen Rochko	9c6dba3999	Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305 )	7 years ago
Eugen Rochko	adb0b4a59a	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	7 years ago
Eugen Rochko	896cadceed	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	7 years ago
Eugen Rochko	5f9c017c01	Make text e-mails consistent with HTML ones in UserMailer (#6291 ) * Make text e-mails consistent with HTML ones in UserMailer * Fix UserMailer specs	7 years ago
David Yip	d45ebe26dc	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	7 years ago
David Yip	f281097ea7	Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaks Do not discard statuses obtained via websocket when API request finishes	7 years ago
Thibaut Girka	12edfead8e	Do not discard statuses obtained via websocket when API request finishes This backports `0b888acfd4`	7 years ago
ThibG	1e6d392ff5	Do not throw away statuses obtained via websocket when API request finishes (#6302 )	7 years ago
Yamagishi Kazutoshi	49b76b3025	Change belongs_to_required_by_default to true (#5888 )	7 years ago
Yamagishi Kazutoshi	2df7c3a008	Add support Ruby v2.5.0 (#6097 )	7 years ago
ThibG	dc4054abe9	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.	7 years ago
Pierre Ozoux	4ae0ea3802	Fix "tzinfo-data is not present" docker error (#6300 ) when starting the container.	7 years ago
ThibG	30df8fc679	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.	7 years ago
Eugen Rochko	5daf5f2c57	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	7 years ago
Marcin Mikołajczak	a34f6ba630	i18n: Update Polish translation (#6297 )	7 years ago
Thibaut Girka	41c1e5533e	Display a warning when composing unlisted toots with something looking like a hashtag This is a backport of `b42cdedfc3` to the glitch flavour.	7 years ago
David Yip	83b911f883	Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master	7 years ago
David Yip	477fbec714	Merge pull request #332 from glitch-soc/merge-upstream Merge in home feed regeneration changes from upstream	7 years ago
David Yip	91f892fd6e	Merge pull request #333 from glitch-soc/win95-update Update win95 theme from cybrespace/mastodon	7 years ago
Eugen Rochko	92df0bba59	Fix regeneration marker not expiring (#6290 ) * Fix regeneration key not getting expired * Add rake task to remove old regeneration markers	7 years ago
Eugen Rochko	b0f2bff481	Replace tutorial modal with welcome e-mail (#6273 ) * Remove onboarding modal * Welcome e-mail * Send welcome e-mail after confirmation * Remove obsolete translations	7 years ago
David Yip	011d6011f9	Strip trailing whitespace on win95.scss	7 years ago
David Yip	fc20361bbe	Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update Conflicts: app/javascript/styles/win95.scss config/themes.yml	7 years ago
David Yip	14fffe6e88	Use absolute paths for new working/not-found SVGs This allows these component styles to be used in i.e. the win95 skin.	7 years ago
David Yip	2a201c2ec6	Port `9cfbbbce1f` to glitch frontend	7 years ago
David Yip	f4428a7ba8	Merge remote-tracking branch 'origin/master' into merge-upstream	7 years ago
David Yip	d0e525c463	Merge branch 'gs-master' into merge-upstream	7 years ago
David Yip	dfcee78446	Style fixes to make eslint happier, hopefully	7 years ago
Renato "Lond" Cerqueira	b2632dfad7	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	7 years ago
David Yip	b1155460ba	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	9cfbbbce1f	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	7 years ago
Jenkins	9d3388ab6e	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Renato "Lond" Cerqueira	4f86722a65	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	7 years ago
Jenkins	8c41fb4acc	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago

1 2 3 4 5 ...

5749 Commits (bf93764ca0454751e5cb8ca9ede94dd867ee0321) All Branches Search

5749 Commits (bf93764ca0454751e5cb8ca9ede94dd867ee0321)

All Branches