about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-01-20Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2018-01-20Merge pull request #336 from ThibG/glitch-soc/features/tag-warningDavid Yip
Display a warning when composing unlisted toots with something looking like a hashtag
2018-01-20Merge pull request #342 from glitch-soc/merge-upstreamDavid Yip
Merge upstream
2018-01-20Change mailer avatar url (#6309)Iijima Yasushi
* Change mailer avatar url * Use full_asset_url method
2018-01-20Merge new onboarding styles; delete refs to PNGs.David Yip
2018-01-20Eliminate stray conflict markers.David Yip
2018-01-20Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/javascript/styles/mastodon/components.scss
2018-01-20Bump version to 2.2.0rc1Eugen Rochko
2018-01-21Update Simplified Chinese translations (#6306)SerCom_KC
* 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-20Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305)Eugen Rochko
2018-01-20Restore onboarding modal (#6303)Eugen Rochko
* Restore onboarding modal Revert 5ba8b3a396895ecec083c5258aaf9084d584a7c4 * Change greeting elephant graphic, fix up some design issues * Fix wrong link color in onboarding modal
2018-01-20Improve HTML e-mails based on Litmus tests (#6301)Eugen Rochko
* 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-20Make text e-mails consistent with HTML ones in UserMailer (#6291)Eugen Rochko
* Make text e-mails consistent with HTML ones in UserMailer * Fix UserMailer specs
2018-01-19Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss
2018-01-19Merge pull request #339 from ThibG/glitch-soc/features/timeline-tweaksDavid Yip
Do not discard statuses obtained via websocket when API request finishes
2018-01-19Do not discard statuses obtained via websocket when API request finishesThibaut Girka
This backports 0b888acfd4ffddd29f25c878373e9b9f5ec6c0ab
2018-01-19Do not throw away statuses obtained via websocket when API request finishes ↵ThibG
(#6302)
2018-01-19Change belongs_to_required_by_default to true (#5888)Yamagishi Kazutoshi
2018-01-19Add support Ruby v2.5.0 (#6097)Yamagishi Kazutoshi
2018-01-19Process mentions and reblogs even from resolved threads (#6299)ThibG
This may lead to out-of-order notifications, but this is better than not having notifications at all.
2018-01-19Fix "tzinfo-data is not present" docker error (#6300)Pierre Ozoux
when starting the container.
2018-01-19Retry delivering toots over ActivityPub for about 2 days (#6298)ThibG
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-19Replace drawer elephant graphic with a vector image (#6286)Eugen Rochko
* Replace drawer elephant graphic with a vector image * Replace wave graphic with SVG * Remove unused elephant graphic
2018-01-19i18n: Update Polish translation (#6297)Marcin Mikołajczak
2018-01-19Display a warning when composing unlisted toots with something looking like ↵Thibaut Girka
a hashtag This is a backport of b6af88192ff48372c5f6ed1321f21d99aaffcd3f to the glitch flavour.
2018-01-18Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2018-01-18Merge pull request #332 from glitch-soc/merge-upstreamDavid Yip
Merge in home feed regeneration changes from upstream
2018-01-18Merge pull request #333 from glitch-soc/win95-updateDavid Yip
Update win95 theme from cybrespace/mastodon
2018-01-18Fix regeneration marker not expiring (#6290)Eugen Rochko
* Fix regeneration key not getting expired * Add rake task to remove old regeneration markers
2018-01-18Replace tutorial modal with welcome e-mail (#6273)Eugen Rochko
* Remove onboarding modal * Welcome e-mail * Send welcome e-mail after confirmation * Remove obsolete translations
2018-01-18Strip trailing whitespace on win95.scssDavid Yip
2018-01-18Merge remote-tracking branch 'cybrespace/theme_win95' into win95-updateDavid Yip
Conflicts: app/javascript/styles/win95.scss config/themes.yml
2018-01-18Use absolute paths for new working/not-found SVGsDavid Yip
This allows these component styles to be used in i.e. the win95 skin.
2018-01-18Port 7badad7797b487b411a2ab34e0f7413741974bb4 to glitch frontendDavid Yip
2018-01-18Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-01-18Merge branch 'gs-master' into merge-upstreamDavid Yip
2018-01-18Style fixes to make eslint happier, hopefullyDavid Yip
2018-01-18When must_be_following_dm is on, only notify if recipient dm'ed user (#6283)Renato "Lond" Cerqueira
* 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-17Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
Conflicts: app/javascript/styles/mastodon/components.scss
2018-01-17Fix home regeneration (#6251)Eugen Rochko
* 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-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-18Weblate translations (#6284)Renato "Lond" Cerqueira
* 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-17Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-17implement web share target (#6278)りんすき
* web share target * fix * fix
2018-01-17Upgrade ESLint to version 4.x (#6276)Yamagishi Kazutoshi
2018-01-17Update Simplified Chinese translations (#6280)SerCom_KC
* 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-17Use better reblog icon and improve contrast in HTML e-mails (#6272)Eugen Rochko
2018-01-17Use be_within instead of eq for a to_f test match (#6275)Mike Burns
Floating point values are notoriously hard to pin down, so use the `be_within` matcher to verify the approximate value.
2018-01-17Korean translate (#6277)Jeong Arm
* Translate Korean * Translate Korean #6263
2018-01-17Change mailer image url (#6279)mayaeh
* Change image URL in mailer to full path * Add application_mailer.view_profile localization.
generated by cgit-pink (git 2.37.1) at 2024-12-28 05:22:52 +0000