fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 11:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
6487 commits 129 branches 266 tags 981 MiB
Commit graph

1849 commits

Author SHA1 Message Date
Thibaut Girka 2f01935cba Adapt account fields rendering code in the WebUI to match upstream 2018-05-10 00:03:34 +02:00
Thibaut Girka 30bb530c70 Update glitch-soc style to match new bio fields markup 2018-05-10 00:03:34 +02:00
Thibaut Girka 1c9c0167b7 Merge branch 'master' into glitch-soc/master 
Conflicts:
	app/models/account.rb
	app/views/accounts/_header.html.haml
 2018-05-10 00:03:28 +02:00
Yamagishi Kazutoshi 16fee0335f Show card modal on public pages (#7428) 2018-05-09 16:22:52 +02:00
Yamagishi Kazutoshi 6832110af4 Correct rotate of image using EXIF (#7422) 2018-05-09 08:41:07 +02:00
Yamagishi Kazutoshi e0b1e17bd0 Show media modal on public timeline (#7413) 2018-05-08 13:33:09 +02:00
ThibG b1938d7853 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.
 2018-05-08 13:28:55 +02:00
beatrix 919e2098cb
Merge pull request #468 from ThibG/glitch-soc/features/reports-improvements 
Various improvements to the reports modal
 2018-05-07 09:45:13 -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 bddb330a8a to glitch-soc
 2018-05-07 14:59:22 +02:00
Thibaut Girka 7972464e71 [Glitch] Also display replies in report modal 
Port c88e12fca6 to glitch-soc
 2018-05-07 14:55:16 +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 d185f3ddaf
Use plaintext value for field value tooltips in web UI (#7388) 
Fix #7383
 2018-05-07 09:30:38 +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
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 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 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
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
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
Thibaut Girka cee157fc19 Improve accessibility of toot dropdown menu 
* Prevent Enter keypresses from triggering dropdown display toggle twice
* Give focus to first/selected item of dropdown menus
* Implement keyboard navigation in generic dropdown menus

Partial port from ef7d64c801 to glitch-soc
 2018-05-05 17:11:48 +02:00
Thibaut Girka bfa5bdde2c [Glitch] Place emoji picker top if it is closer to the bottom of the viewport 
Port ad5d3134e4 to glitch-soc
 2018-05-05 16:58:20 +02:00
Eugen Rochko 2ef9d65052
Improve rendering of bio fields (#7353) 
Fix #7335
 2018-05-05 00:55:09 +02:00
Akihiko Odaki 66359ec522 Fix gap insertion for timeline disconnection (#7363) 2018-05-05 00:54:56 +02:00
ThibG ef7d64c801 Dropdowns accessibility (#7318) 
* Mark currently selected privacy setting in privacy dropdown

* Prevent Enter keypresses from triggering dropdown display toggle twice

* Give focus to first/selected item of dropdown menus

* Implement keyboard navigation in privacy dropdown

* Implement keyboard navigation in generic dropdown menus
 2018-05-04 22:13:26 +02:00
Marcin Mikołajczak 4c2b522a60 Add a light theme 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-05-04 20:25:58 +02:00
Marcin Mikołajczak a7a61889d7 “Enable” high contrast theme 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-05-04 17:50:11 +02:00
David Yip c511b0f72a
Merge remote-tracking branch 'glitchsoc/master' into gs-master 2018-05-04 03:47:35 -05:00
David Yip da70208b45
Merge remote-tracking branch 'origin/master' into merge-upstream 2018-05-04 03:23:57 -05:00