about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2018-05-10Merge pull request #472 from ThibG/glitch-soc/mergeThibG
Merge upstream changes
2018-05-10Add bot badge to account headers in the WebUIThibaut Girka
2018-05-10Adapt account fields rendering code in the WebUI to match upstreamThibaut Girka
2018-05-10Update glitch-soc style to match new bio fields markupThibaut Girka
2018-05-10Ignore tootsuite-specific theme-related translation stringsThibaut Girka
2018-05-10Merge branch 'master' into glitch-soc/masterThibaut Girka
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
2018-05-09Disable simplecov on CircleCI (#7416)Yamagishi Kazutoshi
* Disable simplecov on CircleCI * Remove --format progress
2018-05-09Support gzip encoding on Request (#7425)Yamagishi Kazutoshi
2018-05-09Show card modal on public pages (#7428)Yamagishi Kazutoshi
2018-05-09🌍: 🇵🇱⬆️ (#7427)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2018-05-09Add tests for admin/roles_controller (#7421)Shuhei Kitagawa
2018-05-09Add tests for admin/invites_controller (#7412)Shuhei Kitagawa
2018-05-09Correct rotate of image using EXIF (#7422)Yamagishi Kazutoshi
2018-05-09Rescue Mastodon::LengthValidationError in FetchLinkCardService (#7424)Yamagishi Kazutoshi
2018-05-08Merge remote-tracking branch 'glitchsoc/master' into gs-masterDavid Yip
2018-05-08Multiple Issue templates (#7402)Yamagishi Kazutoshi
* Multiple Issue templates * Update bug_report.md
2018-05-08Show media modal on public timeline (#7413)Yamagishi Kazutoshi
2018-05-08Take the first recognized actor_type. (#7410)Surinna Curtis
2018-05-08Do not crash in getStatusIds when there is a gap in the timeline (fixes ↵ThibG
#7400) (#7415) Fixes a crash occurring when the “gap” disconnection indicator is to be displayed in a filtered timeline.
2018-05-08Fix hashtags not being federated on mentions (fixes #6900) (#7406)ThibG
2018-05-07Merge pull request #468 from ThibG/glitch-soc/features/reports-improvementsbeatrix
Various improvements to the reports modal
2018-05-07Merge pull request #467 from ThibG/glitch-soc/fixes/fix-boost-colorbeatrix
Fix color of disabled boost buttons (fixes #466)
2018-05-07Hide media in report modal regardless of whether they are marked sensitiveThibaut Girka
The rationale behind this is that if the user wants to report violent media, they might not want to see it repeatedly. The “sensitive” property is still kept, displaying different messages for hidden media depending on whether they are marked as sensitive.
2018-05-07[Glitch] Allow report modal to be up to 80% of viewport heightThibaut Girka
Port bddb330a8a08b7459c299fb56ae8770c3ac69af5 to glitch-soc
2018-05-07[Glitch] Also display replies in report modalThibaut Girka
Port c88e12fca622c46a361a5c751a529e77aa5bf2ba to glitch-soc
2018-05-07If an OStatus message contains nsfw hashtag, mark it as sensitive (#7398)Eugen Rochko
* If an OStatus message contains nsfw hashtag, mark it as sensitive Undo parts of #7048 * Put nsfw hashtag on OStatus messages if they have any media * Fix code style issues
2018-05-07Fix color of disabled boost buttons (fixes #466)Thibaut Girka
2018-05-07Bot nameplates (#7391)Eugen Rochko
* Store actor type in database * Add bot nameplate to web UI, add setting to preferences, API, AP Fix #7365 * Fix code style issues
2018-05-07Support explicitly supplying language code for status via REST API (#7389)Eugen Rochko
2018-05-07Use plaintext value for field value tooltips in web UI (#7388)Eugen Rochko
Fix #7383
2018-05-07Fix distribute_add_activity and distribute_remove_activity (#7393)abcang
2018-05-07Improve OpenStack v3 compatibility (#7392)Hugo Gameiro
* Update paperclip.rb * Update .env.production.sample * Update paperclip.rb
2018-05-07Add Corsican localization (#7390)Eugen Rochko
* Added Corsican localization * Declaring Corsican localization * Fixed activerecord locale * Added a missing translation and switched to French-style apostrophes * Fixed a (predictable) mistake made while bulk-replacing apostrophes * More fixing * i18n-tasks normalize
2018-05-06Merge pull request #465 from ThibG/glitch-soc/rollback-scroll-changesDavid Yip
Glitch soc/rollback scroll changes
2018-05-06Merge pull request #464 from ThibG/glitch-soc/fixes/high-contrast-colorsDavid Yip
Fix glitch high-contrast skin text colors
2018-05-06Fixes/rollback scroll changes (#7387)ThibG
* Revert "Do not re-position scroll when loading more (inserting items from below) (#7344)" This reverts commit 8c601b54ccf530bd193b4500fee439aa4e9162d0. * Revert "Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)" This reverts commit 58852695c8ec490239ed3812f82971f8c1e6c172.
2018-05-06Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it"Thibaut Girka
This reverts commit 553cc2824040ba0b745644eb4633840129ffc13b.
2018-05-06Revert "[Glitch] Do not re-position scroll when loading more (inserting ↵Thibaut Girka
items from below)" This reverts commit 32974a58dcf5a8db39a9c0378f923a40d787cad3.
2018-05-06Fix glitch high-contrast skin text colorsThibaut Girka
Port from 3c5006ec7fa98ec53df619b0e6e52b3bbdb6f046
2018-05-06Various improvements to the report UI (#7342)ThibG
* Also display replies in report modal * Allow report modal to be up to 80% of viewport height * Use narrow no-break space where needed in the French translation
2018-05-06Merge pull request #462 from ThibG/glitch-soc/features/dropdowns-accessibilitybeatrix
Improve accessibility of toot dropdown menu
2018-05-06Merge pull request #461 from ThibG/glitch-soc/fixes/emoji-picker-placementbeatrix
[Glitch] Place emoji picker top if it is closer to the bottom of the viewport
2018-05-06Merge pull request #460 from ↵beatrix
ThibG/glitch-soc/features/do-not-scroll-when-mouse-over Prevent timeline from moving when cursor is hovering over it
2018-05-06Merge pull request #459 from ThibG/glitch-soc/features/text-color-variablesbeatrix
Add text color variables + minor SCSS fixes + high contrast skin
2018-05-06Merge pull request #458 from ↵beatrix
monsterpit-daggertooth/glitch-fix-escape-metachars-in-mutes Escape regex metachars in keyword mutes
2018-05-06Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-itemsbeatrix
Support upstream bio items / custom account fields
2018-05-06Weblate translations (2018-05-06) (#7381)Yamagishi Kazutoshi
* Translated using Weblate (Dutch) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Catalan) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Greek) Currently translated at 28.2% (177 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Occitan) Currently translated at 100.0% (62 of 62 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/oc/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 98.2% (615 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Occitan) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Occitan) Currently translated at 97.9% (613 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Galician) Currently translated at 100.0% (626 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (627 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Greek) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 28.5% (179 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 28.5% (179 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.0% (182 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.0% (182 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.2% (183 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.3% (184 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.5% (185 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.7% (186 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Greek) Currently translated at 29.7% (186 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Slovak) Currently translated at 95.3% (597 of 626 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 95.2% (597 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 97.6% (612 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Chinese (Hong Kong)) Currently translated at 99.3% (623 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/zh_Hant_HK/ * Translated using Weblate (Polish) Currently translated at 99.8% (626 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/pl/ * 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 (Arabic) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 83.7% (525 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Spanish) Currently translated at 99.8% (626 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/es/ * Translated using Weblate (Italian) Currently translated at 54.7% (343 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Italian) Currently translated at 78.9% (495 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Esperanto) Currently translated at 100.0% (294 of 294 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eo/ * Translated using Weblate (Japanese) Currently translated at 99.8% (626 of 627 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * i18n-tasks normalize && i18n-tasks remove-unused && yarn manage:translations
2018-05-06Bump version to 2.4.0rc1 (#7283)Eugen Rochko
2018-05-06Enable custom emojis in profiles (notes, field values, display names) (#7374)Eugen Rochko
Follow-up to #6124
2018-05-06Fix color of status icons in glitch-soc high contrast skinThibaut Girka
generated by cgit-pink (git 2.37.1) at 2024-11-24 06:51:38 +0000