Thibaut Girka
b8f8a3ea58
Update glitch-soc style to match new bio fields markup
7 years ago
Thibaut Girka
5b46a6002f
Ignore tootsuite-specific theme-related translation strings
7 years ago
Thibaut Girka
af504e62ff
Merge branch 'master' into glitch-soc/master
...
Conflicts:
app/models/account.rb
app/views/accounts/_header.html.haml
7 years ago
Yamagishi Kazutoshi
e60292c616
Disable simplecov on CircleCI ( #7416 )
...
* Disable simplecov on CircleCI
* Remove --format progress
7 years ago
Yamagishi Kazutoshi
1b42ea9f2c
Support gzip encoding on Request ( #7425 )
7 years ago
Yamagishi Kazutoshi
d006271514
Show card modal on public pages ( #7428 )
7 years ago
Marcin Mikołajczak
cbb7f33083
🌍 : 🇵🇱 ⬆️ ( #7427 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years ago
Shuhei Kitagawa
fcac2f1b60
Add tests for admin/roles_controller ( #7421 )
7 years ago
Shuhei Kitagawa
db644968ce
Add tests for admin/invites_controller ( #7412 )
7 years ago
Yamagishi Kazutoshi
e59fb1b969
Correct rotate of image using EXIF ( #7422 )
7 years ago
Yamagishi Kazutoshi
6092325a48
Rescue Mastodon::LengthValidationError in FetchLinkCardService ( #7424 )
7 years ago
David Yip
106a0d5c70
Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
Yamagishi Kazutoshi
4fea89fe4a
Multiple Issue templates ( #7402 )
...
* Multiple Issue templates
* Update bug_report.md
7 years ago
Yamagishi Kazutoshi
c1427f90f6
Show media modal on public timeline ( #7413 )
7 years ago
Surinna Curtis
a2b84b644b
Take the first recognized actor_type. ( #7410 )
7 years ago
ThibG
8ccc863ae8
Do not crash in getStatusIds when there is a gap in the timeline ( fixes #7400 ) ( #7415 )
...
Fixes a crash occurring when the “gap” disconnection indicator is to be
displayed in a filtered timeline.
7 years ago
ThibG
10be4c496c
Fix hashtags not being federated on mentions ( fixes #6900 ) ( #7406 )
7 years ago
beatrix
e774936358
Merge pull request #468 from ThibG/glitch-soc/features/reports-improvements
...
Various improvements to the reports modal
7 years ago
beatrix
bac3fc9706
Merge pull request #467 from ThibG/glitch-soc/fixes/fix-boost-color
...
Fix color of disabled boost buttons (fixes #466 )
7 years ago
Thibaut Girka
3333cce41e
Hide media in report modal regardless of whether they are marked sensitive
...
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.
7 years ago
Thibaut Girka
49181d497f
[Glitch] Allow report modal to be up to 80% of viewport height
...
Port bddb330a8a08b7459c299fb56ae8770c3ac69af5 to glitch-soc
7 years ago
Thibaut Girka
d5e0e665df
[Glitch] Also display replies in report modal
...
Port c88e12fca622c46a361a5c751a529e77aa5bf2ba to glitch-soc
7 years ago
Eugen Rochko
244a270a80
If an OStatus message contains nsfw hashtag, mark it as sensitive ( #7398 )
...
* 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
7 years ago
Thibaut Girka
557db7ae6d
Fix color of disabled boost buttons ( fixes #466 )
7 years ago
Eugen Rochko
7ff3c849d1
Bot nameplates ( #7391 )
...
* Store actor type in database
* Add bot nameplate to web UI, add setting to preferences, API, AP
Fix #7365
* Fix code style issues
7 years ago
Eugen Rochko
b890e5830c
Support explicitly supplying language code for status via REST API ( #7389 )
7 years ago
Eugen Rochko
8b63d39427
Use plaintext value for field value tooltips in web UI ( #7388 )
...
Fix #7383
7 years ago
abcang
b9c17c6580
Fix distribute_add_activity and distribute_remove_activity ( #7393 )
7 years ago
Hugo Gameiro
27cfb13b83
Improve OpenStack v3 compatibility ( #7392 )
...
* Update paperclip.rb
* Update .env.production.sample
* Update paperclip.rb
7 years ago
Eugen Rochko
93553c17c8
Add Corsican localization ( #7390 )
...
* 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
7 years ago
David Yip
d01cb2c8e3
Merge pull request #465 from ThibG/glitch-soc/rollback-scroll-changes
...
Glitch soc/rollback scroll changes
7 years ago
David Yip
3a7bebf8c4
Merge pull request #464 from ThibG/glitch-soc/fixes/high-contrast-colors
...
Fix glitch high-contrast skin text colors
7 years ago
ThibG
796fe4c361
Fixes/rollback scroll changes ( #7387 )
...
* Revert "Do not re-position scroll when loading more (inserting items from below) (#7344 )"
This reverts commit 554653a423
.
* Revert "Prevent timeline from moving when cursor is hovering over it (fixes #7278 ) (#7327 )"
This reverts commit 9188537f5f
.
7 years ago
Thibaut Girka
04a8aef9d2
Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it"
...
This reverts commit 1c75c7901f
.
7 years ago
Thibaut Girka
82421dc2e2
Revert "[Glitch] Do not re-position scroll when loading more (inserting items from below)"
...
This reverts commit ca62d8bcc6
.
7 years ago
Thibaut Girka
1bc1d8e676
Fix glitch high-contrast skin text colors
...
Port from e0c3d950d1
7 years ago
ThibG
520f3a28fc
Various improvements to the report UI ( #7342 )
...
* 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
7 years ago
beatrix
f5f840cdb3
Merge pull request #462 from ThibG/glitch-soc/features/dropdowns-accessibility
...
Improve accessibility of toot dropdown menu
7 years ago
beatrix
923e79ea00
Merge pull request #461 from ThibG/glitch-soc/fixes/emoji-picker-placement
...
[Glitch] Place emoji picker top if it is closer to the bottom of the viewport
7 years ago
beatrix
1cd9812d52
Merge pull request #460 from ThibG/glitch-soc/features/do-not-scroll-when-mouse-over
...
Prevent timeline from moving when cursor is hovering over it
7 years ago
beatrix
c21fe3e7a0
Merge pull request #459 from ThibG/glitch-soc/features/text-color-variables
...
Add text color variables + minor SCSS fixes + high contrast skin
7 years ago
beatrix
a3884450fc
Merge pull request #458 from monsterpit-daggertooth/glitch-fix-escape-metachars-in-mutes
...
Escape regex metachars in keyword mutes
7 years ago
beatrix
3f7348c436
Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items
...
Support upstream bio items / custom account fields
7 years ago
Yamagishi Kazutoshi
a14525d3df
Weblate translations (2018-05-06) ( #7381 )
...
* 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
7 years ago
Eugen Rochko
0dcb01855c
Bump version to 2.4.0rc1 ( #7283 )
7 years ago
Eugen Rochko
4055ce490c
Enable custom emojis in profiles (notes, field values, display names) ( #7374 )
...
Follow-up to #6124
7 years ago
Thibaut Girka
2b5821b86b
Fix color of status icons in glitch-soc high contrast skin
7 years ago
ThibG
78ac856e5b
Merge pull request #457 from m4sk1n/glitch-light
...
Add a light theme by @Sylvhem
7 years ago
Shuhei Kitagawa
8c8a850f8a
Add resend confirmation for admin ( #7378 )
...
* Add confirmations_controller#resend
* Add tests for confirmations_controller#resend
* Add translations
7 years ago
Yamagishi Kazutoshi
9d64bcdac7
Port travis_retry for CI ( #7379 )
...
* Port travis_retry for CI
* Add license
7 years ago