namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
6568 commits 8 branches 15 tags 274 MiB
Commit graph

6568 commits

This branch
This branch
All branches
Author SHA1 Message Date
beatrix
2eb924c00c
Merge pull request #467 from ThibG/glitch-soc/fixes/fix-boost-color 
Fix color of disabled boost buttons (fixes #466)
 2018-05-07 09:21:32 -04:00
Thibaut Girka
658ac4396c 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.
 2018-05-07 15:00:55 +02:00
Thibaut Girka
6b94237810 [Glitch] Allow report modal to be up to 80% of viewport height 
Port bddb330a8a08b7459c299fb56ae8770c3ac69af5 to glitch-soc
 2018-05-07 14:59:22 +02:00
Thibaut Girka
7972464e71 [Glitch] Also display replies in report modal 
Port c88e12fca622c46a361a5c751a529e77aa5bf2ba to glitch-soc
 2018-05-07 14:55:16 +02:00
Eugen Rochko
6208ea5a53
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
 2018-05-07 14:49:13 +02:00
Thibaut Girka
ffdb85f859 Fix color of disabled boost buttons (fixes #466) 2018-05-07 13:37:29 +02:00
Eugen Rochko
42cd363542
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
 2018-05-07 09:31:07 +02:00
Eugen Rochko
0f0cc3f2eb
Support explicitly supplying language code for status via REST API (#7389) 2018-05-07 09:30:53 +02:00
Eugen Rochko
d185f3ddaf
Use plaintext value for field value tooltips in web UI (#7388) 
Fix #7383
 2018-05-07 09:30:38 +02:00
abcang
db012b57c2 Fix distribute_add_activity and distribute_remove_activity (#7393) 2018-05-07 09:30:18 +02:00
Hugo Gameiro
ea4e243303 Improve OpenStack v3 compatibility (#7392) 
* Update paperclip.rb

* Update .env.production.sample

* Update paperclip.rb
 2018-05-07 02:28:28 +02:00
Eugen Rochko
95595ccd21
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
 2018-05-07 01:34:19 +02:00
David Yip
2e25da4da0
Merge pull request #465 from ThibG/glitch-soc/rollback-scroll-changes 
Glitch soc/rollback scroll changes
 2018-05-06 17:39:07 -05:00
David Yip
a0629c5696
Merge pull request #464 from ThibG/glitch-soc/fixes/high-contrast-colors 
Fix glitch high-contrast skin text colors
 2018-05-06 17:38:58 -05:00
ThibG
e06fbc4fcf Fixes/rollback scroll changes (#7387) 
* Revert "Do not re-position scroll when loading more (inserting items from below) (#7344)"

This reverts commit 8c601b54cc.

* Revert "Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327)"

This reverts commit 58852695c8.
 2018-05-06 22:26:39 +02:00
Thibaut Girka
de7feea30e Revert "[Glitch] Prevent timeline from moving when cursor is hovering over it" 
This reverts commit 553cc28240.
 2018-05-06 21:50:33 +02:00
Thibaut Girka
4133f70902 Revert "[Glitch] Do not re-position scroll when loading more (inserting items from below)" 
This reverts commit 32974a58dc.
 2018-05-06 21:50:26 +02:00
Thibaut Girka
1adca9b040 Fix glitch high-contrast skin text colors 
Port from 3c5006ec7f
 2018-05-06 21:00:35 +02:00
ThibG
5c7bed6bbc 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
 2018-05-06 20:38:17 +02:00
beatrix
331190e5fb
Merge pull request #462 from ThibG/glitch-soc/features/dropdowns-accessibility 
Improve accessibility of toot dropdown menu
 2018-05-06 12:12:20 -04:00
beatrix
92f192e9b1
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
 2018-05-06 11:33:09 -04:00
beatrix
4480cd745f
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
 2018-05-06 11:32:56 -04:00
beatrix
06770656eb
Merge pull request #459 from ThibG/glitch-soc/features/text-color-variables 
Add text color variables + minor SCSS fixes + high contrast skin
 2018-05-06 11:32:42 -04:00
beatrix
e56639258a
Merge pull request #458 from monsterpit-daggertooth/glitch-fix-escape-metachars-in-mutes 
Escape regex metachars in keyword mutes
 2018-05-06 11:32:22 -04:00
beatrix
35a1a3171f
Merge pull request #449 from ThibG/glitch-soc/features/upstream-account-items 
Support upstream bio items / custom account fields
 2018-05-06 11:32:05 -04:00
Yamagishi Kazutoshi
e571de29bf
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
 2018-05-06 20:19:56 +09:00
Eugen Rochko
50ed1e83ac
Bump version to 2.4.0rc1 (#7283) 2018-05-06 11:50:00 +02:00
Eugen Rochko
61a9018607
Enable custom emojis in profiles (notes, field values, display names) (#7374) 
Follow-up to #6124
 2018-05-06 11:48:51 +02:00
Thibaut Girka
65349bc155 Fix color of status icons in glitch-soc high contrast skin 2018-05-06 11:31:05 +02:00
ThibG
af4fb72993
Merge pull request #457 from m4sk1n/glitch-light 
Add a light theme by @Sylvhem
 2018-05-06 11:21:26 +02:00
Shuhei Kitagawa
bd10a7e480 Add resend confirmation for admin (#7378) 
* Add confirmations_controller#resend

* Add tests for confirmations_controller#resend

* Add translations
 2018-05-06 10:59:03 +02:00
Yamagishi Kazutoshi
8c35d163a5 Port travis_retry for CI (#7379) 
* Port travis_retry for CI

* Add license
 2018-05-06 10:55:50 +02:00
Eugen Rochko
39efc6d533
Add hint about 7 day cooldown for archive takeout (#7375) 2018-05-06 10:53:10 +02:00
Eugen Rochko
b611dbac79
Add contact e-mail hint to 2FA login form (#7376) 2018-05-06 10:52:36 +02:00
Eugen Rochko
2f63d52b92
Fallback to old on-the-fly URI for follows/blocks if no stored URI (#7371) 
Fix #7367
 2018-05-05 23:07:51 +02:00
Eugen Rochko
c7d1a2e400
Improve admin UI for accounts (#7360) 
* Improve design of account statuses admin UI (consistent with reports)

* Make account moderation notes look consistent with report notes

* i18n-tasks remove-unused

* Fix code style issues

* Fix tests
 2018-05-05 23:06:29 +02:00
Eugen Rochko
660db468c0
Do not count search route as compose being mounted in web UI (#7372) 
Fix #7144
 2018-05-05 23:05:43 +02:00
Thibaut Girka
2d065ceaf6 minor fix 2018-05-05 22:38:15 +02:00
Thibaut Girka
f7a076eded [Glitch] Add high-contrast theme 2018-05-05 22:33:02 +02:00
Thibaut Girka
caebf69e77 Move attachment-lists out of lists.scss 2018-05-05 22:33:02 +02:00
Thibaut Girka
bd3b9bf7b9 [Glitch] Fix text color in "show more" link inside boost confirmation modal 
Port ba917e15f6 to glitch-soc
 2018-05-05 22:33:02 +02:00
Thibaut Girka
983328376b Fix link colors in report modal 2018-05-05 22:33:02 +02:00
Thibaut Girka
b3a236637e [Glitch] Add color variables of texts for better accesibility 
Port 74dae9458d and related to glitch-soc
 2018-05-05 22:33:02 +02:00
Eugen Rochko
8da4bf0f90
4 profile fields max, store only 255 characters per name/value (#7348) 
Fix #7303
 2018-05-05 21:11:19 +02:00
Reto Kromer
80b23a6a85 uniform email rather than e-mail (#7373) 2018-05-05 21:03:21 +02:00
Eugen Rochko
c947e2e4c5
Fix handling of malformed ActivityPub payloads when URIs are nil (#7370) 
* Fix handling of malformed ActivityPub payloads when URIs are nil

* Gracefully handle JSON-LD canonicalization failures
 2018-05-05 18:22:34 +02:00
Thibaut Girka
390cfdef2e [Glitch] Update SCSS of admin and setting pages 
Port the SCSS changes from cb74c0cfe4 to glitch-soc
 2018-05-05 17:58:01 +02:00
Thibaut Girka
9edc5cafe4 [Glitch] Improve styling of closed registrations message 
Port SCSS changes from 5acd5315f2 to glitch-soc
 2018-05-05 17:43:09 +02:00
Thibaut Girka
32974a58dc [Glitch] Do not re-position scroll when loading more (inserting items from below) 
Port 8c601b54cc to glitch-soc
 2018-05-05 17:18:55 +02:00
Thibaut Girka
553cc28240 [Glitch] Prevent timeline from moving when cursor is hovering over it 
Port 58852695c8 to glitch-soc
 2018-05-05 17:18:25 +02:00