]> cat aescling's git repositories - mastodon.git/log
mastodon.git
7 years ago[Glitch] Add "copy link" item to status action bars
Thibaut Girka [Wed, 13 Feb 2019 06:29:57 +0000 (07:29 +0100)]
[Glitch] Add "copy link" item to status action bars

Port 3cfadd875cc91b3fb893681ed7c2ef86148b3f85 to glitch-soc

7 years ago[Glitch] Don't focus spoiler input when disabled spoiler
Thibaut Girka [Tue, 12 Feb 2019 20:16:02 +0000 (21:16 +0100)]
[Glitch] Don't focus spoiler input when disabled spoiler

Inspired by 0e513ff862faf7fa9e5b89d2ab7d22fd0ab540ff

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Tue, 12 Feb 2019 19:32:48 +0000 (20:32 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoMerge pull request #913 from ThibG/glitch-soc/merge-upstream
ThibG [Tue, 12 Feb 2019 19:29:55 +0000 (20:29 +0100)]
Merge pull request #913 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoBump active_model_serializers from 0.10.8 to 0.10.9 (#10018)
dependabot[bot] [Tue, 12 Feb 2019 14:17:26 +0000 (15:17 +0100)]
Bump active_model_serializers from 0.10.8 to 0.10.9 (#10018)

Bumps [active_model_serializers](https://github.com/rails-api/active_model_serializers) from 0.10.8 to 0.10.9.
- [Release notes](https://github.com/rails-api/active_model_serializers/releases)
- [Changelog](https://github.com/rails-api/active_model_serializers/blob/v0.10.9/CHANGELOG.md)
- [Commits](https://github.com/rails-api/active_model_serializers/compare/v0.10.8...v0.10.9)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoAdd support for IPv6 only MXes in Email validation (#10009)
Franck Zoccolo [Tue, 12 Feb 2019 13:48:04 +0000 (14:48 +0100)]
Add support for IPv6 only MXes in Email validation (#10009)

* Add support for IPv6 only MXes

* Fixed email validator tests

7 years agoBump rubocop from 0.63.1 to 0.64.0 (#10006)
dependabot[bot] [Tue, 12 Feb 2019 04:11:06 +0000 (05:11 +0100)]
Bump rubocop from 0.63.1 to 0.64.0 (#10006)

Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.63.1 to 0.64.0.
- [Release notes](https://github.com/rubocop-hq/rubocop/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.63.1...v0.64.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoMove sending account Delete to anyone but the account's followers to the pull̀ queue...
ThibG [Tue, 12 Feb 2019 04:10:43 +0000 (05:10 +0100)]
Move sending account Delete to anyone but the account's followers to the pull̀ queue (#10016)

7 years agoDon't focus spiler input when disabled spoiler (#10017)
Hinaloe [Tue, 12 Feb 2019 04:10:31 +0000 (13:10 +0900)]
Don't focus spiler input when disabled spoiler (#10017)

7 years agoFix timeline jumps (#10001)
ThibG [Mon, 11 Feb 2019 12:19:59 +0000 (13:19 +0100)]
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

7 years agoAdd available locales for lv, ms, sq (#10008)
Eugen Rochko [Mon, 11 Feb 2019 12:19:06 +0000 (13:19 +0100)]
Add available locales for lv, ms, sq (#10008)

7 years agoWeblate translations (2019-02-11) (#10007)
Eugen Rochko [Mon, 11 Feb 2019 06:41:35 +0000 (07:41 +0100)]
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

7 years agoAdd "copy link" item to status action bars (#9983)
Eugen Rochko [Mon, 11 Feb 2019 03:19:49 +0000 (04:19 +0100)]
Add "copy link" item to status action bars (#9983)

Fix #6848

7 years agoHandle deletion of filtered toots
Thibaut Girka [Sun, 10 Feb 2019 10:50:31 +0000 (11:50 +0100)]
Handle deletion of filtered toots

7 years agoMinor fix to timeline jump avoiding behavior
Thibaut Girka [Sat, 9 Feb 2019 21:32:09 +0000 (22:32 +0100)]
Minor fix to timeline jump avoiding behavior

7 years agoAdjust scroll when statuses above the current scroll position are deleted
Thibaut Girka [Sat, 9 Feb 2019 21:08:57 +0000 (22:08 +0100)]
Adjust scroll when statuses above the current scroll position are deleted

7 years agoAdjust scroll if previewCard appeared
Thibaut Girka [Sat, 9 Feb 2019 20:24:43 +0000 (21:24 +0100)]
Adjust scroll if previewCard appeared

7 years agoAvoid two-step rendering of statuses as much as possible
Thibaut Girka [Sat, 9 Feb 2019 19:54:11 +0000 (20:54 +0100)]
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.

7 years agoRefactor intersection observer article code
Thibaut Girka [Wed, 6 Feb 2019 19:04:39 +0000 (20:04 +0100)]
Refactor intersection observer article code

7 years agoCleanup redundant markup for hidden statuses
Thibaut Girka [Wed, 6 Feb 2019 18:48:28 +0000 (19:48 +0100)]
Cleanup redundant markup for hidden statuses

7 years agoHide items rendered out-of-frame (once they have been rendered at least once)
Thibaut Girka [Wed, 6 Feb 2019 17:59:28 +0000 (18:59 +0100)]
Hide items rendered out-of-frame (once they have been rendered at least once)

7 years ago[Glitch] Rename from instance to server.
Thibaut Girka [Sun, 10 Feb 2019 21:19:26 +0000 (22:19 +0100)]
[Glitch] Rename from instance to server.

Port 46e806cd2f14a5e45d66b4c23040855202818984 to glitch-soc

7 years ago[Glitch] Fix not showing custom emojis in share page emoji picker
Thibaut Girka [Sun, 10 Feb 2019 20:54:43 +0000 (21:54 +0100)]
[Glitch] Fix not showing custom emojis in share page emoji picker

Port e02a13f64e5c2c93fa73a67a4ce32a7d1df24760 to glitch-soc

7 years ago[Glitch] Add featured hashtags to profiles
Thibaut Girka [Sun, 10 Feb 2019 20:50:42 +0000 (21:50 +0100)]
[Glitch] Add featured hashtags to profiles

Port SCSS changes from 364f2ff9aa2b4bf601d68a12bce758aeb5530467

7 years ago[Glitch] Allow multiple files upload through web UI, including drag & drop
Thibaut Girka [Sun, 10 Feb 2019 20:35:04 +0000 (21:35 +0100)]
[Glitch] Allow multiple files upload through web UI, including drag & drop

Port 750c67660de753065ec160b4e389ba0dda2f81cc to glitch-soc

7 years ago[Glitch] Add missing rejection handling for Promises
Thibaut Girka [Sun, 10 Feb 2019 20:28:29 +0000 (21:28 +0100)]
[Glitch] Add missing rejection handling for Promises

Port missing parts from 2c51bc0ca5a4c3a4bb140b4b40dabdda859ebb94 to glitch-soc

7 years ago[Glitch] Add WebP support
Thibaut Girka [Sun, 10 Feb 2019 20:13:17 +0000 (21:13 +0100)]
[Glitch] Add WebP support

Port 5092d17f2936146fa26e5d8a9b9e391f77010f28  to glitch-soc

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 10 Feb 2019 19:57:51 +0000 (20:57 +0100)]
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.

7 years agoBump parallel_tests from 2.27.1 to 2.28.0 (#9985)
dependabot[bot] [Sun, 10 Feb 2019 17:17:34 +0000 (18:17 +0100)]
Bump parallel_tests from 2.27.1 to 2.28.0 (#9985)

Bumps [parallel_tests](https://github.com/grosser/parallel_tests) from 2.27.1 to 2.28.0.
- [Release notes](https://github.com/grosser/parallel_tests/releases)
- [Commits](https://github.com/grosser/parallel_tests/compare/v2.27.1...v2.28.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoi18n: add Japanese translations (#10000)
mayaeh [Sun, 10 Feb 2019 12:04:59 +0000 (21:04 +0900)]
i18n: add Japanese translations (#10000)

* Add Japanese translations.

* Probably change to more general "統合" than "マージ" .

7 years agoFix URL linkifier grabbing full-width spaces and quotations (#9997)
Eugen Rochko [Sat, 9 Feb 2019 19:13:11 +0000 (20:13 +0100)]
Fix URL linkifier grabbing full-width spaces and quotations (#9997)

Fix #9993
Fix #5654

7 years agoEnable "displaying application used to post" setting by default (#9994)
rinsuki [Sat, 9 Feb 2019 16:33:41 +0000 (01:33 +0900)]
Enable "displaying application used to post" setting by default (#9994)

related: https://github.com/tootsuite/mastodon/pull/9897#issuecomment-461093615

7 years ago Only URLs extract with pre-escaped text (#9991)
Hinaloe [Sat, 9 Feb 2019 02:39:38 +0000 (11:39 +0900)]
 Only URLs extract with pre-escaped text (#9991)

* [test] add japanese hashtag testcase

* Only URLs extract with pre-escaped text

( https://github.com/tootsuite/mastodon/issues/9989 )

7 years agoFix IntersectionObserverArticle not hiding some out-of-view items (#9982)
ThibG [Wed, 6 Feb 2019 22:36:43 +0000 (23:36 +0100)]
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.

7 years agoBump microformats from 4.0.7 to 4.1.0 (#9980)
dependabot[bot] [Wed, 6 Feb 2019 15:46:37 +0000 (16:46 +0100)]
Bump microformats from 4.0.7 to 4.1.0 (#9980)

Bumps [microformats](https://github.com/microformats/microformats-ruby) from 4.0.7 to 4.1.0.
- [Release notes](https://github.com/microformats/microformats-ruby/releases)
- [Commits](https://github.com/microformats/microformats-ruby/compare/v4.0.7...v4.1.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoFix CW unfolding not triggering re-layout in public hashtag page
Thibaut Girka [Wed, 6 Feb 2019 14:11:46 +0000 (15:11 +0100)]
Fix CW unfolding not triggering re-layout in public hashtag page

7 years agoFix unfolding CWs on public hashtag page
Thibaut Girka [Wed, 6 Feb 2019 13:13:15 +0000 (14:13 +0100)]
Fix unfolding CWs on public hashtag page

Fixes #909

7 years agoFix Tombstone.delete_all ArgumentError (#9978)
abcang [Wed, 6 Feb 2019 01:50:52 +0000 (10:50 +0900)]
Fix Tombstone.delete_all ArgumentError (#9978)

7 years agoRename from instance to server. (#9938)
mayaeh [Tue, 5 Feb 2019 18:11:24 +0000 (03:11 +0900)]
Rename from instance to server. (#9938)

7 years agoi18n: Update Polish translation 🇵 (#9974)
marcin mikołajczak [Tue, 5 Feb 2019 14:13:34 +0000 (15:13 +0100)]
i18n: Update Polish translation 🇵 (#9974)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years agoDo not use apk cache and upgrade (#9966)
J0WI [Tue, 5 Feb 2019 14:13:19 +0000 (15:13 +0100)]
Do not use apk cache and upgrade (#9966)

7 years agoReplace LibreSSL by OpenSSL (#9975)
J0WI [Tue, 5 Feb 2019 14:12:45 +0000 (15:12 +0100)]
Replace LibreSSL by OpenSSL (#9975)

7 years agoHide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)
ThibG [Tue, 5 Feb 2019 14:11:35 +0000 (15:11 +0100)]
Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)

Thanks @wryk for noticing this issue.

7 years agoFix it as tagged_request of accounts_controller is not addressable_uri (#9976)
Takeshi Umeda [Tue, 5 Feb 2019 14:11:11 +0000 (23:11 +0900)]
Fix it as tagged_request of accounts_controller is not addressable_uri (#9976)

7 years agoUpdate Dockerfile (#9965)
ashleyhull-versent [Tue, 5 Feb 2019 04:11:51 +0000 (15:11 +1100)]
Update Dockerfile (#9965)

7 years ago[UI] Fix whitespace being applied to div instead of p (#9968)
trwnh [Tue, 5 Feb 2019 03:46:18 +0000 (21:46 -0600)]
[UI] Fix whitespace being applied to div instead of p (#9968)

* fix large line breaks

* fix ascii art posts

7 years agoFix pinned statuses being shown in a featured hashtag (#9971)
Eugen Rochko [Mon, 4 Feb 2019 23:27:18 +0000 (00:27 +0100)]
Fix pinned statuses being shown in a featured hashtag (#9971)

7 years agoFix not showing custom emojis in share page emoji picker (#9970)
rinsuki [Mon, 4 Feb 2019 22:14:57 +0000 (07:14 +0900)]
Fix not showing custom emojis in share page emoji picker (#9970)

7 years agoFix authorized applications list page design (#9969)
rinsuki [Mon, 4 Feb 2019 21:25:42 +0000 (06:25 +0900)]
Fix authorized applications list page design (#9969)

7 years agoUse video filesize limit with gifv (#9924)
rinsuki [Mon, 4 Feb 2019 03:46:05 +0000 (12:46 +0900)]
Use video filesize limit with gifv (#9924)

7 years agochange "finish tutorial" text to "finish toot-orial" (#9905)
mike castleman [Mon, 4 Feb 2019 03:45:29 +0000 (01:45 -0200)]
change "finish tutorial" text to "finish toot-orial" (#9905)

7 years agoAdd featured hashtags to profiles (#9755)
Eugen Rochko [Mon, 4 Feb 2019 03:25:59 +0000 (04:25 +0100)]
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

7 years agoAdd option to overwrite imported data (#9962)
Eugen Rochko [Sun, 3 Feb 2019 02:59:51 +0000 (03:59 +0100)]
Add option to overwrite imported data (#9962)

* Add option to overwrite imported data

Fix #7465

* Add import for domain blocks

7 years agoBump capybara from 3.12.0 to 3.13.2 (#9935)
dependabot[bot] [Sun, 3 Feb 2019 02:40:40 +0000 (03:40 +0100)]
Bump capybara from 3.12.0 to 3.13.2 (#9935)

Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.12.0 to 3.13.2.
- [Release notes](https://github.com/teamcapybara/capybara/releases)
- [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md)
- [Commits](https://github.com/teamcapybara/capybara/compare/3.12.0...3.13.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoBump httplog from 1.2.0 to 1.2.1 (#9942)
dependabot[bot] [Sun, 3 Feb 2019 02:40:22 +0000 (03:40 +0100)]
Bump httplog from 1.2.0 to 1.2.1 (#9942)

Bumps [httplog](https://github.com/trusche/httplog) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/trusche/httplog/releases)
- [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md)
- [Commits](https://github.com/trusche/httplog/compare/v1.2.0...v1.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoRemove redundant “options” from “Compose box options”
Thibaut Girka [Sat, 2 Feb 2019 23:34:52 +0000 (00:34 +0100)]
Remove redundant “options” from “Compose box options”

Thanks @ariasuni.

7 years agoMinor description corrections
Marek Ľach [Sat, 2 Feb 2019 12:43:51 +0000 (13:43 +0100)]
Minor description corrections

7 years agoAllow multiple files upload through web UI, including drag & drop (#9856)
tmm576 [Sat, 2 Feb 2019 19:22:05 +0000 (14:22 -0500)]
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

7 years agoRe-enable ignored translations that is needed (#7842)
Jeong Arm [Sat, 2 Feb 2019 18:37:16 +0000 (03:37 +0900)]
Re-enable ignored translations that is needed (#7842)

Some of strings should be translated.

7 years agoMake displaying application used to toot opt-in (#9897)
ThibG [Sat, 2 Feb 2019 18:18:15 +0000 (19:18 +0100)]
Make displaying application used to toot opt-in (#9897)

* Make storing and displaying application used to toot opt-in

* Revert to storing application info, and display it to the author via API

7 years agoCreate Redisable#redis (#9633)
ysksn [Sat, 2 Feb 2019 18:11:38 +0000 (03:11 +0900)]
Create Redisable#redis (#9633)

* Create Redisable

* Use #redis instead of Redis.current

7 years agoAllow most kinds of characters in URL query (fixes #8408) (#8447)
Jakub Mendyk [Sat, 2 Feb 2019 18:01:18 +0000 (19:01 +0100)]
Allow most kinds of characters in URL query (fixes #8408) (#8447)

* Allow unicode characters in URL query strings

Fixes #8408

* Alternative approach to unicode support in urls

Adds PoC/idea to approch this problem.

7 years agoAdd WebP support (#9879)
Acid Chicken (硫酸鶏) [Sat, 2 Feb 2019 11:25:04 +0000 (20:25 +0900)]
Add WebP support (#9879)

* Add WebP support

* Remove the changes to the tooltip

refs: https://github.com/tootsuite/mastodon/pull/9879#pullrequestreview-199312528

7 years agoUpgrade new Web Share Target API (#9963)
gol-cha [Sat, 2 Feb 2019 00:26:49 +0000 (09:26 +0900)]
Upgrade new Web Share Target API (#9963)

* Update manifest.json for new Web Share Target API.

* fix code formatting

7 years agoMerge pull request #904 from ThibG/glitch-soc/merge-upstream
ThibG [Fri, 1 Feb 2019 17:24:36 +0000 (18:24 +0100)]
Merge pull request #904 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoFix link color in high-contrast theme, add underlines (#9949)
Eugen Rochko [Thu, 31 Jan 2019 23:15:38 +0000 (00:15 +0100)]
Fix link color in high-contrast theme, add underlines (#9949)

Improve sorting of default themes in the dropdown

7 years ago[Glitch] Replace unlock-alt icon with unlock
Thibaut Girka [Fri, 1 Feb 2019 15:15:44 +0000 (16:15 +0100)]
[Glitch] Replace unlock-alt icon with unlock

Port 6513f6c953cdaad9118ea24a21f22fd2978bed28 to glitch-soc

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Fri, 1 Feb 2019 15:12:20 +0000 (16:12 +0100)]
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

7 years agoDo not mark toots as sensitive if they don't have any media attached
Thibaut Girka [Fri, 1 Feb 2019 11:45:53 +0000 (12:45 +0100)]
Do not mark toots as sensitive if they don't have any media attached

7 years agoFix hashtag processing when sending toots
Thibaut Girka [Fri, 1 Feb 2019 10:41:34 +0000 (11:41 +0100)]
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.

7 years agoMore corrections for the Slovak translation (#9959)
Marek Ľach [Fri, 1 Feb 2019 00:18:40 +0000 (01:18 +0100)]
More corrections for the Slovak translation (#9959)

7 years agoFix link color in high-contrast theme, add underlines (#9949)
Eugen Rochko [Thu, 31 Jan 2019 23:15:38 +0000 (00:15 +0100)]
Fix link color in high-contrast theme, add underlines (#9949)

Improve sorting of default themes in the dropdown

7 years agoRefactor icons in web UI to use Icon component (#9951)
Eugen Rochko [Thu, 31 Jan 2019 23:14:05 +0000 (00:14 +0100)]
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

7 years agoUpdate the Slovak translation (#9958)
Marek Ľach [Thu, 31 Jan 2019 23:13:47 +0000 (00:13 +0100)]
Update the Slovak translation (#9958)

7 years agoDistinguish error messaging for mystyped URLs and deleted accounts (#9957)
Marek Ľach [Thu, 31 Jan 2019 23:07:08 +0000 (00:07 +0100)]
Distinguish error messaging for mystyped URLs and deleted accounts (#9957)

7 years agoReplace unlock-alt icon with unlock (#9952)
Clar Charr [Thu, 31 Jan 2019 12:45:15 +0000 (07:45 -0500)]
Replace unlock-alt icon with unlock (#9952)

7 years agoBump rails-i18n from 5.1.2 to 5.1.3 (#9943)
dependabot[bot] [Tue, 29 Jan 2019 19:22:59 +0000 (04:22 +0900)]
Bump rails-i18n from 5.1.2 to 5.1.3 (#9943)

Bumps [rails-i18n](https://github.com/svenfuchs/rails-i18n) from 5.1.2 to 5.1.3.
- [Release notes](https://github.com/svenfuchs/rails-i18n/releases)
- [Changelog](https://github.com/svenfuchs/rails-i18n/blob/master/CHANGELOG.md)
- [Commits](https://github.com/svenfuchs/rails-i18n/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
7 years agoi18n: Update Polish translation 🇵🇱 (#9945)
marcin mikołajczak [Tue, 29 Jan 2019 19:21:15 +0000 (20:21 +0100)]
i18n: Update Polish translation 🇵🇱 (#9945)

* Update Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* normalize

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* inconsistentInterpolations--

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
7 years agoBumps copyright year in README.md to 2019 (#9939)
Sam Schlinkert [Mon, 28 Jan 2019 21:57:42 +0000 (16:57 -0500)]
Bumps copyright year in README.md to 2019 (#9939)

This is so incredibly small, but assuming this is a needed change. Might want to check year in other files.

7 years agoMerge pull request #901 from ThibG/glitch-soc/merge-upstream
ThibG [Mon, 28 Jan 2019 20:40:38 +0000 (21:40 +0100)]
Merge pull request #901 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Mon, 28 Jan 2019 20:14:47 +0000 (21:14 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- README.md: kept our version

7 years agoBump version to 2.7.1 (#9932)
Eugen Rochko [Mon, 28 Jan 2019 03:24:12 +0000 (04:24 +0100)]
Bump version to 2.7.1 (#9932)

7 years agoFix slow fallback of CopyAccountStats migration setting stats to 0 (#9930)
Eugen Rochko [Mon, 28 Jan 2019 03:18:35 +0000 (04:18 +0100)]
Fix slow fallback of CopyAccountStats migration setting stats to 0 (#9930)

7 years agoAdd note that contributors may request reimbursement through OpenCollective (#9933)
Eugen Rochko [Mon, 28 Jan 2019 03:17:11 +0000 (04:17 +0100)]
Add note that contributors may request reimbursement through OpenCollective (#9933)

7 years agoFix SUPERUSER postgres command (#9877)
Stanislas [Sun, 27 Jan 2019 22:56:07 +0000 (23:56 +0100)]
Fix SUPERUSER postgres command (#9877)

7 years agoMerge pull request #900 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 27 Jan 2019 21:24:29 +0000 (22:24 +0100)]
Merge pull request #900 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years ago[Glitch] Fix initial value of volume slider in video player and handle volume changes
Thibaut Girka [Sun, 27 Jan 2019 21:02:59 +0000 (22:02 +0100)]
[Glitch] Fix initial value of volume slider in video player and handle volume changes

Port a53dcaa29869e808707efcba541b02ee8d799e75 to glitch-soc

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 27 Jan 2019 20:57:55 +0000 (21:57 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoFix initial value of volume slider in video player and handle volume changes (#9929)
ThibG [Sun, 27 Jan 2019 20:18:15 +0000 (21:18 +0100)]
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

7 years agoImplement missing hotkeys for notifications (#9927)
ThibG [Sun, 27 Jan 2019 16:54:54 +0000 (17:54 +0100)]
Implement missing hotkeys for notifications (#9927)

7 years agoMerge pull request #899 from ThibG/glitch-soc/merge-upstream
ThibG [Sun, 27 Jan 2019 13:23:24 +0000 (14:23 +0100)]
Merge pull request #899 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sun, 27 Jan 2019 12:57:25 +0000 (13:57 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoRevert to storing application info, and display it to the author via API
Thibaut Girka [Mon, 21 Jan 2019 21:40:26 +0000 (22:40 +0100)]
Revert to storing application info, and display it to the author via API

7 years agoMake storing and displaying application used to toot opt-in
Thibaut Girka [Mon, 21 Jan 2019 18:36:33 +0000 (19:36 +0100)]
Make storing and displaying application used to toot opt-in

7 years agoPrevent posting toots with media attachments from someone else (#9921)
ThibG [Sat, 26 Jan 2019 22:59:39 +0000 (23:59 +0100)]
Prevent posting toots with media attachments from someone else (#9921)

7 years agoMerge pull request #897 from ThibG/glitch-soc/merge-upstream
ThibG [Sat, 26 Jan 2019 17:47:48 +0000 (18:47 +0100)]
Merge pull request #897 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoMerge branch 'master' into glitch-soc/merge-upstream
Thibaut Girka [Sat, 26 Jan 2019 17:32:49 +0000 (18:32 +0100)]
Merge branch 'master' into glitch-soc/merge-upstream

7 years agoMerge pull request #896 from ThibG/glitch-soc/merge-upstream
ThibG [Fri, 25 Jan 2019 21:42:21 +0000 (22:42 +0100)]
Merge pull request #896 from ThibG/glitch-soc/merge-upstream

Merge upstream changes

7 years agoFix SSO authentication not working due to missing agreement boolean (#9915)
Eugen Rochko [Fri, 25 Jan 2019 11:36:54 +0000 (12:36 +0100)]
Fix SSO authentication not working due to missing agreement boolean (#9915)

Fix #9906

7 years agoFix Firefox scrollbar color regression in #9210 (#9908)
trwnh [Thu, 24 Jan 2019 12:32:23 +0000 (06:32 -0600)]
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.