CloudToys/puyopuyotetr.is
1
0
Fork 0
Code
8,744 Commits 1 Branch 1 Tag 336 MiB
1bb23100b1
Commit Graph

2971 Commits

Author SHA1 Message Date
Thibaut Girka
e31fc2b458 [Glitch] Fix crash on public hashtag pages when streaming fails 
Port 041ff5fa9a to glitch-soc
 2019-02-17 14:28:25 +01:00
Thibaut Girka
91c9cb6022 [Glitch] Change buttons on timeline preview to open the interaction dialog 
Port 71e28ba399 to glitch-soc
 2019-02-17 12:39:44 +01:00
Thibaut Girka
9a47f2cbdf Port upstream's javascript to the error page 2019-02-17 12:27:01 +01:00
Thibaut Girka
369a475a70 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/serializers/rest/instance_serializer.rb
- app/views/layouts/error.html.haml
- public/oops.png
  Took our version (same as upstream but without the things that only
  make sense in an animation).

Additional changes:
- app/javascript/flavours/vanilla/theme.yml
  Include upstream's javascript in error pages.
 2019-02-17 12:26:55 +01:00
ThibG
041ff5fa9a Fix crash on public hashtag pages when streaming fails (#10061) 2019-02-16 14:53:27 +01:00
Eugen Rochko
ea7ad59af2
Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) 
Regression from #9581
 2019-02-16 11:56:09 +01:00
Eugen Rochko
80388a3ffe
Change error graphic to hover-to-play (#10055) 
Fix #6060
 2019-02-15 23:33:25 +01:00
Eugen Rochko
71e28ba399
Change buttons on timeline preview to open the interaction dialog (#10054) 
Fix #9922
 2019-02-15 19:43:09 +01:00
Eugen Rochko
59fa38a4f6 Fix style regressions on landing page (#10030) 2019-02-15 18:22:06 +01:00
Thibaut Girka
a151c5566a [Glitch] Fix hashtags select styling in default and high contrast skins 
Port 169b9d4428 to glitch-soc
 2019-02-15 18:21:00 +01:00
Eugen Rochko
4dcb04b888 Fix color of static page links in high contrast theme (#10028) 2019-02-15 18:10:26 +01:00
Thibaut Girka
06cc04fd23 Merge branch 'master' into glitch-soc/merge-upstream 2019-02-15 18:02:45 +01:00
Thibaut Girka
2769b54466 [Glitch] Fix occasional crash in detailed toot view 
Port f9a338b473 to glitch-soc
 2019-02-15 17:34:15 +01:00
Eugen Rochko
b01f26ffbd
Change conversations to always show names of other participants (#10047) 
Fix #9190
 2019-02-15 16:08:48 +01:00
rinsuki
f9a338b473 Fix breaks when opening a reply tree in WebUI (#10046) 
fix #10045
 2019-02-14 17:03:01 +01:00
Eugen Rochko
aa83219875
Fix hashtag column not subscribing to stream on mount (#10040) 
Fix #9895
 2019-02-14 15:46:42 +01:00
Ben Lubar
309043b158 Improve image description user experience (#10036) 
* Add image descriptions to searchable post content.

* Allow multi-line image descriptions.

* Request image descriptions in the same query as posts when creating the search index.

(see https://github.com/tootsuite/mastodon/pull/10036#discussion_r256551624)
 2019-02-14 01:04:43 +01:00
ThibG
188f1c7c89 Add list title editing (#9748) 
* Add list title editing

Port changes made by ash for glitch-soc

* Code style fixes
 2019-02-13 18:52:02 +01:00
Eugen Rochko
114cdc36aa
Fix style regressions on landing page (#10030) 2019-02-13 18:36:40 +01:00
Eugen Rochko
169b9d4428
Fix hashtags select styling in default and high contrast themes (#10029) 2019-02-13 18:34:58 +01:00
ThibG
98d1a1f117 Disable box shadows for featured hashtags in light theme (#10034) 
Fixes #9990
 2019-02-13 18:33:03 +01:00
Thibaut Girka
614ea184bb [Glitch] Add "copy link" item to status action bars 
Port 3cfadd875c to glitch-soc
 2019-02-13 07:29:57 +01:00
Eugen Rochko
c6e7b97baa
Fix color of static page links in high contrast theme (#10028) 2019-02-13 05:30:49 +01:00
Thibaut Girka
e230b176fb [Glitch] Don't focus spoiler input when disabled spoiler 
Inspired by 0e513ff862
 2019-02-12 21:16:02 +01:00
Thibaut Girka
0e34e91661 Merge branch 'master' into glitch-soc/merge-upstream 2019-02-12 20:32:48 +01:00
ThibG
a3ba28eb17
Merge pull request #913 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-02-12 20:29:55 +01:00
Hinaloe
0e513ff862 Don't focus spiler input when disabled spoiler (#10017) 2019-02-12 05:10:31 +01:00
ThibG
aee93bfc9c Fix timeline jumps (#10001) 
* Avoid two-step rendering of statuses as much as possible

Cache width shared by Video player, MediaGallery and Cards at the
ScrollableList level, pass it down through StatusList and Notifications.

* Adjust scroll when new preview cards appear

* Adjust scroll when statuses above the current scroll position are deleted
 2019-02-11 13:19:59 +01:00
Eugen Rochko
a3e10f44c6
Weblate translations (2019-02-11) (#10007) 
* Translated using Weblate (Galician)

Currently translated at 100.0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/

* Translated using Weblate (Basque)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/

* Translated using Weblate (Basque)

Currently translated at 100.0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/

* Translated using Weblate (Arabic)

Currently translated at 94.8% (716 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Basque)

Currently translated at 100.0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (German)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/

* Translated using Weblate (Slovenian)

Currently translated at 21.7% (164 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/

* Translated using Weblate (Corsican)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/

* Translated using Weblate (Welsh)

Currently translated at 86.9% (93 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/

* Translated using Weblate (Welsh)

Currently translated at 94.6% (714 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (Welsh)

Currently translated at 100.0% (63 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cy/

* Translated using Weblate (Slovak)

Currently translated at 99.7% (753 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Czech)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Added translation using Weblate (Irish)

* Translated using Weblate (Irish)

Currently translated at 0.1% (1 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ga/

* Translated using Weblate (Telugu)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/

* Translated using Weblate (Indonesian)

Currently translated at 38.4% (290 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/id/

* Translated using Weblate (Welsh)

Currently translated at 94.6% (714 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (Czech)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (Korean)

Currently translated at 100.0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/

* Translated using Weblate (Welsh)

Currently translated at 93.5% (100 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/

* Translated using Weblate (Welsh)

Currently translated at 98.0% (349 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/

* Translated using Weblate (Serbian)

Currently translated at 95.8% (723 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (63 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Czech)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Greek)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Occitan)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/

* Translated using Weblate (Welsh)

Currently translated at 98.0% (740 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/

* Translated using Weblate (Italian)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/

* Translated using Weblate (Italian)

Currently translated at 84.0% (634 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/

* Translated using Weblate (Slovenian)

Currently translated at 29.0% (219 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/

* Translated using Weblate (Slovak)

Currently translated at 99.7% (753 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (63 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/

* Translated using Weblate (Slovenian)

Currently translated at 34.4% (260 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/

* Translated using Weblate (Latvian)

Currently translated at 40.7% (145 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/lv/

* Translated using Weblate (Japanese)

Currently translated at 91.0% (687 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/

* Translated using Weblate (Serbian)

Currently translated at 95.8% (723 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Slovak)

Currently translated at 99.7% (753 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Latvian)

Currently translated at 48.3% (172 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/lv/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Slovak)

Currently translated at 99.7% (753 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Translated using Weblate (Czech)

Currently translated at 100.0% (98 of 98 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Czech)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Greek)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Czech)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (Czech)

Currently translated at 100.0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/

* Translated using Weblate (Czech)

Currently translated at 100.0% (63 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/

* Translated using Weblate (Czech)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (Czech)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

Rename "instance" to "server"

* Translated using Weblate (Czech)

Currently translated at 100.0% (63 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/

rename from "instance" to "server"

* Translated using Weblate (Czech)

Currently translated at 100.0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/

* Translated using Weblate (Czech)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

rename from "instance" to "server"

* Translated using Weblate (Czech)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* Translated using Weblate (Czech)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

rename from "instance" to "server"

* Translated using Weblate (Slovak)

Currently translated at 100.0% (63 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/

* Translated using Weblate (Slovak)

Currently translated at 99.7% (753 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Korean)

Currently translated at 100.0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/

* Added translation using Weblate (Lithuanian)

* Translated using Weblate (Japanese)

Currently translated at 99.2% (353 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/

* Translated using Weblate (Lithuanian)

Currently translated at 20.1% (152 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/lt/

* Added translation using Weblate (Albanian)

* Translated using Weblate (Slovak)

Currently translated at 99.7% (753 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/

* Added translation using Weblate (Albanian)

* Added translation using Weblate (Albanian)

* Added translation using Weblate (Albanian)

* Added translation using Weblate (Albanian)

* Added translation using Weblate (Albanian)

* Translated using Weblate (Albanian)

Currently translated at 100.0% (63 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sq/

* Translated using Weblate (Albanian)

Currently translated at 100.0% (2 of 2 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sq/

* Translated using Weblate (Albanian)

Currently translated at 100.0% (98 of 98 strings)

Translation: Mastodon/Doorkeeper
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sq/

* Translated using Weblate (Albanian)

Currently translated at 64.5% (487 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sq/

* Translated using Weblate (Slovak)

Currently translated at 99.7% (753 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Slovenian)

Currently translated at 40.0% (302 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/

* Translated using Weblate (Slovenian)

Currently translated at 74.8% (80 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/

* Translated using Weblate (Slovenian)

Currently translated at 45.2% (161 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/

* i18n-tasks normalize

* yarn manage:translations

* Fix inconsistent interpolations and unused keys

* Fix missing plural forms
 2019-02-11 07:41:35 +01:00
Eugen Rochko
3cfadd875c Add "copy link" item to status action bars (#9983) 
Fix #6848
 2019-02-11 12:19:49 +09:00
Thibaut Girka
b89e003c4d Handle deletion of filtered toots 2019-02-10 22:54:25 +01:00
Thibaut Girka
7c0728c776 Minor fix to timeline jump avoiding behavior 2019-02-10 22:54:25 +01:00
Thibaut Girka
dfe1d548a5 Adjust scroll when statuses above the current scroll position are deleted 2019-02-10 22:54:25 +01:00
Thibaut Girka
0b91322762 Adjust scroll if previewCard appeared 2019-02-10 22:54:25 +01:00
Thibaut Girka
049c9a3b97 Avoid two-step rendering of statuses as much as possible 
Cache width shared by Video player, MediaGallery and Cards at the
ScrollableList level, pass it down through StatusList and Notifications.
 2019-02-10 22:54:25 +01:00
Thibaut Girka
68f3d003d6 Refactor intersection observer article code 2019-02-10 22:54:25 +01:00
Thibaut Girka
e49e54a5ff Cleanup redundant markup for hidden statuses 2019-02-10 22:54:25 +01:00
Thibaut Girka
405ef5ad37 Hide items rendered out-of-frame (once they have been rendered at least once) 2019-02-10 22:54:25 +01:00
Thibaut Girka
b47a53f902 [Glitch] Rename from instance to server. 
Port 46e806cd2f to glitch-soc
 2019-02-10 22:19:26 +01:00
Thibaut Girka
14a1bb703a [Glitch] Fix not showing custom emojis in share page emoji picker 
Port e02a13f64e to glitch-soc
 2019-02-10 21:54:43 +01:00
Thibaut Girka
b7fbcb21b3 [Glitch] Add featured hashtags to profiles 
Port SCSS changes from 364f2ff9aa
 2019-02-10 21:50:42 +01:00
Thibaut Girka
7ed2aeb6e9 [Glitch] Allow multiple files upload through web UI, including drag & drop 
Port 750c67660d to glitch-soc
 2019-02-10 21:44:14 +01:00
Thibaut Girka
a963ea67dd [Glitch] Add missing rejection handling for Promises 
Port missing parts from 2c51bc0ca5 to glitch-soc
 2019-02-10 21:44:14 +01:00
Thibaut Girka
6b2eefc7bf [Glitch] Add WebP support 
Port 5092d17f29  to glitch-soc
 2019-02-10 21:13:17 +01:00
Thibaut Girka
bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/oauth/authorized_applications_controller.rb
  Two changes too close to each other
- app/controllers/settings/sessions_controller.rb
- app/lib/user_settings_decorator.rb
  Two changes too close to each other
- app/models/media_attachment.rb
  New changes too close to glitch-soc only changes.
- app/models/user.rb
  Two changes too close to each other.
- app/services/remove_status_service.rb
  Kept direct timeline code which had been removed upstream.
- app/views/settings/preferences/show.html.haml
  Two changes too close to each other.
- config/locales/en.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/ja.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/pl.yml
  Introduction of a new string too close to glitch-soc-only's “flavour”
- config/locales/simple_form.en.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/locales/simple_form.pl.yml
  Introduction of a new string too close to glitch-soc-only's “skin”
- config/settings.yml
  Reverted upstream's decision of enabling posting application by default.
 2019-02-10 21:10:09 +01:00
mayaeh
fb90ec894e i18n: add Japanese translations (#10000) 
* Add Japanese translations.

* Probably change to more general "統合" than "マージ" .
 2019-02-10 21:04:59 +09:00
ThibG
d09ce6d81b Fix IntersectionObserverArticle not hiding some out-of-view items (#9982) 
IntersectionObserverArticle is made to save on RAM by avoiding fully rendering
items that are far out of view. However, it did not work for items spawned
outside the intersection observer.
 2019-02-06 23:36:43 +01:00
Thibaut Girka
1a70fca168 Fix CW unfolding not triggering re-layout in public hashtag page 2019-02-06 15:32:48 +01:00
Thibaut Girka
3ce34ce7a2 Fix unfolding CWs on public hashtag page 
Fixes #909
 2019-02-06 14:37:57 +01:00
mayaeh
46e806cd2f Rename from instance to server. (#9938) 2019-02-05 19:11:24 +01:00
marcin mikołajczak
3eb17a3bea i18n: Update Polish translation 🇵 (#9974) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2019-02-05 15:13:34 +01:00
trwnh
76d41475a8 [UI] Fix whitespace being applied to div instead of p (#9968) 
* fix large line breaks

* fix ascii art posts
 2019-02-05 04:46:18 +01:00
rinsuki
e02a13f64e Fix not showing custom emojis in share page emoji picker (#9970) 2019-02-04 23:14:57 +01:00
mike castleman
f86413fce2 change "finish tutorial" text to "finish toot-orial" (#9905) 2019-02-04 04:45:29 +01:00
Eugen Rochko
364f2ff9aa
Add featured hashtags to profiles (#9755) 
* Add hashtag filter to profiles

GET /@:username/tagged/:hashtag
GET /api/v1/accounts/:id/statuses?tagged=:hashtag

* Display featured hashtags on public profile

* Use separate model for featured tags

* Update featured hashtag counters on-write

* Limit featured tags to 10
 2019-02-04 04:25:59 +01:00
Thibaut Girka
c9d261753a Remove redundant “options” from “Compose box options” 
Thanks @ariasuni.
 2019-02-03 01:02:39 +01:00
Marek Ľach
a0a8203a0b Minor description corrections 2019-02-03 00:30:34 +01:00
tmm576
750c67660d Allow multiple files upload through web UI, including drag & drop (#9856) 
* Allow drag and drop uploads of multiple files to compose

* Calculate aggregate upload progress for single action

* Allow multiple uploads to compose through traditional input, consolidate update file limit logic, provide file limit feedback
 2019-02-02 20:22:05 +01:00
Acid Chicken (硫酸鶏)
5092d17f29 Add WebP support (#9879) 
* Add WebP support

* Remove the changes to the tooltip

refs: https://github.com/tootsuite/mastodon/pull/9879#pullrequestreview-199312528
 2019-02-02 12:25:04 +01:00
Eugen Rochko
663593b508 Fix link color in high-contrast theme, add underlines (#9949) 
Improve sorting of default themes in the dropdown
 2019-02-01 16:23:13 +01:00
Thibaut Girka
2e93f87c9f [Glitch] Replace unlock-alt icon with unlock 
Port 6513f6c953 to glitch-soc
 2019-02-01 16:15:44 +01:00
Thibaut Girka
e87bd6d94a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- README.md
  Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
  Two changes too close to each other, took both changes
 2019-02-01 16:12:20 +01:00
Thibaut Girka
f611da4899 Do not mark toots as sensitive if they don't have any media attached 2019-02-01 15:55:28 +01:00
Thibaut Girka
762e4fdf55 Fix hashtag processing when sending toots 
This fixes crashes in pleroma when writing toots with a content warning,
since pleroma inserts a “nsfw” hashtag that isn't part of the toot's text.
 2019-02-01 12:37:28 +01:00
Eugen Rochko
ad8c71c985
Fix link color in high-contrast theme, add underlines (#9949) 
Improve sorting of default themes in the dropdown
 2019-02-01 00:15:38 +01:00
Eugen Rochko
1f95190202
Refactor icons in web UI to use Icon component (#9951) 
* Refactor uses of icons to an Icon component in web UI

* Refactor options passed to the Icon component

* Make tests work with absolute component paths
 2019-02-01 00:14:05 +01:00
Clar Charr
6513f6c953 Replace unlock-alt icon with unlock (#9952) 2019-01-31 13:45:15 +01:00
Thibaut Girka
f35d790480 [Glitch] Fix initial value of volume slider in video player and handle volume changes 
Port a53dcaa298 to glitch-soc
 2019-01-27 22:02:59 +01:00
Thibaut Girka
72bab194ad Merge branch 'master' into glitch-soc/merge-upstream 2019-01-27 21:57:55 +01:00
ThibG
a53dcaa298 Fix initial value of volume slider in video player and handle volume changes (#9929) 
* Fix initial value of volume slider in video player and handle volume changes

* Clean up dead/incorrect code
 2019-01-27 21:18:15 +01:00
ThibG
ec5bd8b8bb Implement missing hotkeys for notifications (#9927) 2019-01-27 17:54:54 +01:00
trwnh
8ef0498f1c Fix Firefox scrollbar color regression in #9210 (#9908) 
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
 2019-01-25 11:48:27 +01:00
Jeong Arm
77394156dd Apply style for .landing-page strong (#9892) 2019-01-25 11:48:02 +01:00
Thibaut Girka
04e2c67389 Merge branch 'master' into glitch-soc/merge-upstream 2019-01-25 11:37:49 +01:00
trwnh
c87863bdd1 Fix Firefox scrollbar color regression in #9210 (#9908) 
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
 2019-01-24 13:32:23 +01:00
Thibaut Girka
c30da25c5f Fix crash in Direct Messages column settings 
Fixes #892
 2019-01-23 18:29:18 +01:00
Jeong Arm
d50e824168 Apply style for .landing-page strong (#9892) 2019-01-21 20:03:44 +01:00
Thibaut Girka
9dfbcf941e Merge branch 'master' into glitch-soc/merge-upstream 2019-01-20 16:49:23 +01:00
mayaeh
c80b89c2a8 i18n: Update Japanese translations (#9871) 
* Update Japanese translations.

* Delete unused translation.
 2019-01-20 12:37:38 +01:00
Thibaut Girka
5145c81620 [Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width compensation 
Port 3b3a4d8a17 to glitch-soc
 2019-01-20 11:56:21 +01:00
Thibaut Girka
e9060b04d4 [Glitch] Hide floating action button on search and getting started pages 
Port 30af4ee65f to glitch-soc
 2019-01-20 11:54:38 +01:00
tmm576
9b5810b3e9 Allow event defaults on index for text data transfer (#9840) 2019-01-20 11:53:22 +01:00
Thibaut Girka
a93cb340bd [Glitch] Fix new hashtag page's items not being full-width on mobile 
Port b506ce1197 to glitch-soc
 2019-01-20 11:52:06 +01:00
Thibaut Girka
8001a9b97b [Glitch] Add information about how to opt-in to the directory on the directory 
Port SCSS changes from a492a9bcd3 to glitch-soc
 2019-01-20 11:50:19 +01:00
Mélanie Chauvel (ariasuni)
6dbb10c4b7 Fix slightly cropped font on settings page dropdowns when using system font (#9839) 2019-01-20 11:49:27 +01:00
Thibaut Girka
02295257b3 [Glitch] Improve the public hashtag page 
Port 8b19903559 to glitch-soc
 2019-01-20 11:47:17 +01:00
Thibaut Girka
3e8b623975 [Glitch] Redesign public hashtag page to use a masonry layout 
Port bc642ac24b to glitch flavour
 2019-01-20 11:38:09 +01:00
Eugen Rochko
c3f57188ae
Weblate translations (2019-01-19) (#9867) 
* Translated using Weblate (Serbian)

Currently translated at 85.0% (91 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* Translated using Weblate (Serbian)

Currently translated at 86.9% (93 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* Translated using Weblate (Serbian)

Currently translated at 93.6% (707 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/

* Translated using Weblate (Greek)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/

* Translated using Weblate (Korean)

Currently translated at 100.0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/

* Translated using Weblate (Czech)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (French)

Currently translated at 99.1% (748 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/

* Translated using Weblate (Galician)

Currently translated at 100,0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/

* Translated using Weblate (Arabic)

Currently translated at 98.9% (352 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Arabic)

Currently translated at 93.5% (100 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (French)

Currently translated at 100.0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/

* Translated using Weblate (Arabic)

Currently translated at 92.6% (699 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Arabic)

Currently translated at 94.7% (715 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/

* Translated using Weblate (Arabic)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (Dutch)

Currently translated at 99.5% (751 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Serbian)

Currently translated at 93.5% (100 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* Translated using Weblate (Serbian)

Currently translated at 96.8% (61 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/

* Translated using Weblate (Serbian)

Currently translated at 95.6% (722 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/

* Translated using Weblate (Arabic)

Currently translated at 97.2% (104 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/

* Translated using Weblate (Latvian)

Currently translated at 16.9% (60 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/lv/

* Translated using Weblate (Indonesian)

Currently translated at 55.6% (198 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/

* Translated using Weblate (Polish)

Currently translated at 96.8% (61 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/

* Translated using Weblate (Dutch)

Currently translated at 99.1% (106 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Asturian)

Currently translated at 48.6% (52 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ast/

* Translated using Weblate (Italian)

Currently translated at 82.8% (625 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/

* Translated using Weblate (Slovak)

Currently translated at 99.6% (752 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (German)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/

* Translated using Weblate (German)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/

* Translated using Weblate (Occitan)

Currently translated at 99.7% (753 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Catalan)

Currently translated at 100,0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (63 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/

* Translated using Weblate (Catalan)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/

* Translated using Weblate (Slovak)

Currently translated at 99.7% (753 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/

* Translated using Weblate (Occitan)

Currently translated at 99.9% (754 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Dutch)

Currently translated at 100.0% (755 of 755 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/

* Translated using Weblate (Czech)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/

* i18n-tasks normalize

* yarn manage:translations

* Fix pluralizations

* Fix inconsistent interpolation
 2019-01-19 23:43:06 +01:00
Thibaut Girka
5e0cf92fd1 Merge branch 'master' into glitch-soc/merge-upstream 
No conflicts.
 2019-01-19 18:28:37 +01:00
Eugen Rochko
b506ce1197
Fix new hashtag page's items not being full-width on mobile (#9852) 
Fix #9845
 2019-01-18 20:58:11 +01:00
Eugen Rochko
a492a9bcd3
Add information about how to opt-in to the directory on the directory (#9834) 
Fix #9833
 2019-01-18 10:25:44 +01:00
Eugen Rochko
90ff2e7608
Weblate translations (2019-01-17) (#9844) 
* Translated using Weblate (Welsh)

Currently translated at 94.7% (337 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/

* Translated using Weblate (Czech)

Currently translated at 99.9% (751 of 752 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/

* Translated using Weblate (Romanian)

Currently translated at 99.2% (353 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/

* Translated using Weblate (Romanian)

Currently translated at 11.8% (89 of 752 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ro/

* Translated using Weblate (German)

Currently translated at 99.9% (751 of 752 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/

* Translated using Weblate (German)

Currently translated at 100.0% (107 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/

* Translated using Weblate (German)

Currently translated at 99.9% (751 of 752 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/

* Translated using Weblate (Serbian)

Currently translated at 96.8% (61 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Serbian)

Currently translated at 74.8% (80 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* Translated using Weblate (Serbian)

Currently translated at 98.4% (62 of 63 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/

нисам сигуран за ово "и не направите нову". слијед ријечи ми је мало чудан?

* Translated using Weblate (Serbian)

Currently translated at 75.7% (81 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

преподешавања за ПРЕСЕТ

* Translated using Weblate (Catalan)

Currently translated at 100.0% (356 of 356 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/

* Translated using Weblate (Serbian)

Currently translated at 80.4% (86 of 107 strings)

Translation: Mastodon/Preferences
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/

* i18n-tasks normalize

* yarn manage:translations
 2019-01-18 00:48:09 +01:00
Mélanie Chauvel (ariasuni)
b8894c429a Fix slightly cropped font on settings page dropdowns when using system font (#9839) 2019-01-17 23:28:30 +01:00
tmm576
4cd0a10793 Allow event defaults on index for text data transfer (#9840) 2019-01-17 23:27:51 +01:00
Eugen Rochko
8b19903559
Improve the public hashtag page (#9831) 
- Fix height not updating when clicking show more on public hashtag page
- Add header to the public hashtag page
- Change text size and margins on the public hashtag page
 2019-01-17 14:06:08 +01:00
tmm576
30af4ee65f Hide floating action button on search and getting started pages (#9826) 2019-01-17 09:22:12 +01:00
ThibG
3b3a4d8a17 Fix public hashtag timeline width on mobile, fix scrollbar width compensation (#9824) 
* Fix hashtag timeline width being potentially larger than window width

* Add automatic computation of scrollbar width
 2019-01-16 20:36:10 +01:00
Eugen Rochko
bc642ac24b
Redesign public hashtag page to use a masonry layout (#9822) 2019-01-16 19:47:46 +01:00
Thibaut Girka
5684cd090c [Glitch] make draggingOver state off correctly 
Port d6433b3931 to glitch-soc
 2019-01-16 14:50:17 +01:00
Thibaut Girka
92830029ca [Glitch] Make hashtag search results link to the hashtag URL 
Port 6cfb357940 to glitch-soc
 2019-01-16 14:25:58 +01:00