169b9d4428
Fix hashtags select styling in default and high contrast themes ( #10029 )
2019-02-13 18:34:58 +01:00
98d1a1f117
Disable box shadows for featured hashtags in light theme ( #10034 )
...
Fixes #9990
2019-02-13 18:33:03 +01:00
435a367c10
Merge pull request #914 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-13 16:19:15 +01:00
614ea184bb
[Glitch] Add "copy link" item to status action bars
...
Port 3cfadd875c
2019-02-13 07:29:57 +01:00
c6e7b97baa
Fix color of static page links in high contrast theme ( #10028 )
2019-02-13 05:30:49 +01:00
3d374ed18b
Bump bootsnap from 1.3.2 to 1.4.0 ( #10022 )
...
Bumps [bootsnap](https://github.com/Shopify/bootsnap ) from 1.3.2 to 1.4.0.
- [Release notes](https://github.com/Shopify/bootsnap/releases )
- [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md )
- [Commits](https://github.com/Shopify/bootsnap/compare/v1.3.2...v1.4.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-13 02:55:06 +01:00
5977e6af32
Bump faker from 1.9.1 to 1.9.2 ( #10020 )
...
Bumps [faker](https://github.com/stympy/faker ) from 1.9.1 to 1.9.2.
- [Release notes](https://github.com/stympy/faker/releases )
- [Changelog](https://github.com/stympy/faker/blob/master/CHANGELOG.md )
- [Commits](https://github.com/stympy/faker/compare/v1.9.1...v1.9.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-13 02:54:48 +01:00
3a2e44b62c
Bump pkg-config from 1.3.2 to 1.3.3 ( #10023 )
...
Bumps [pkg-config](https://github.com/ruby-gnome2/pkg-config ) from 1.3.2 to 1.3.3.
- [Release notes](https://github.com/ruby-gnome2/pkg-config/releases )
- [Changelog](https://github.com/ruby-gnome2/pkg-config/blob/master/NEWS )
- [Commits](https://github.com/ruby-gnome2/pkg-config/compare/1.3.2...1.3.3 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-13 02:54:27 +01:00
fbe527ccfc
Bump sidekiq-unique-jobs from 6.0.8 to 6.0.9 ( #10019 )
...
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs ) from 6.0.8 to 6.0.9.
- [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases )
- [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md )
- [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.8...v6.0.9 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-13 02:45:01 +01:00
67215692fc
Save IP address used for sign-up, not only sign-in ( #10026 )
...
Fixes #9995
2019-02-12 22:24:14 +01:00
e230b176fb
[Glitch] Don't focus spoiler input when disabled spoiler
...
Inspired by 0e513ff862
2019-02-12 21:16:02 +01:00
0e34e91661
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-12 20:32:48 +01:00
a3ba28eb17
Merge pull request #913 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-12 20:29:55 +01:00
2f80a348c9
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>
2019-02-12 15:17:26 +01:00
4f0322dcae
Add support for IPv6 only MXes in Email validation ( #10009 )
...
* Add support for IPv6 only MXes
* Fixed email validator tests
2019-02-12 14:48:04 +01:00
241661e009
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>
2019-02-12 05:11:06 +01:00
99c4b5b75a
Move sending account Delete to anyone but the account's followers to the pull̀ queue ( #10016 )
2019-02-12 05:10:43 +01:00
0e513ff862
Don't focus spiler input when disabled spoiler ( #10017 )
2019-02-12 05:10:31 +01:00
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
c0a564feaa
Add available locales for lv, ms, sq ( #10008 )
2019-02-11 13:19:06 +01:00
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
3cfadd875c
Add "copy link" item to status action bars ( #9983 )
...
Fix #6848
2019-02-11 12:19:49 +09:00
b89e003c4d
Handle deletion of filtered toots
2019-02-10 22:54:25 +01:00
7c0728c776
Minor fix to timeline jump avoiding behavior
2019-02-10 22:54:25 +01:00
dfe1d548a5
Adjust scroll when statuses above the current scroll position are deleted
2019-02-10 22:54:25 +01:00
0b91322762
Adjust scroll if previewCard appeared
2019-02-10 22:54:25 +01:00
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
68f3d003d6
Refactor intersection observer article code
2019-02-10 22:54:25 +01:00
e49e54a5ff
Cleanup redundant markup for hidden statuses
2019-02-10 22:54:25 +01:00
405ef5ad37
Hide items rendered out-of-frame (once they have been rendered at least once)
2019-02-10 22:54:25 +01:00
b47a53f902
[Glitch] Rename from instance to server.
...
Port 46e806cd2f
2019-02-10 22:19:26 +01:00
14a1bb703a
[Glitch] Fix not showing custom emojis in share page emoji picker
...
Port e02a13f64e
2019-02-10 21:54:43 +01:00
b7fbcb21b3
[Glitch] Add featured hashtags to profiles
...
Port SCSS changes from 364f2ff9aa
2019-02-10 21:50:42 +01:00
7ed2aeb6e9
[Glitch] Allow multiple files upload through web UI, including drag & drop
...
Port 750c67660d
2019-02-10 21:44:14 +01:00
a963ea67dd
[Glitch] Add missing rejection handling for Promises
...
Port missing parts from 2c51bc0ca5
2019-02-10 21:44:14 +01:00
6b2eefc7bf
[Glitch] Add WebP support
...
Port 5092d17f29
2019-02-10 21:13:17 +01:00
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
3031b8a8f2
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>
2019-02-10 18:17:34 +01:00
fb90ec894e
i18n: add Japanese translations ( #10000 )
...
* Add Japanese translations.
* Probably change to more general "統合" than "マージ" .
2019-02-10 21:04:59 +09:00
016ad37bc8
Fix URL linkifier grabbing full-width spaces and quotations ( #9997 )
...
Fix #9993
Fix #5654
2019-02-09 20:13:11 +01:00
a666d1e7ed
Enable "displaying application used to post" setting by default ( #9994 )
...
related: https://github.com/tootsuite/mastodon/pull/9897#issuecomment-461093615
2019-02-09 17:33:41 +01:00
157d3af46c
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 )
2019-02-09 03:39:38 +01:00
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
e28fe2ef26
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>
2019-02-06 16:46:37 +01:00
1a70fca168
Fix CW unfolding not triggering re-layout in public hashtag page
2019-02-06 15:32:48 +01:00
3ce34ce7a2
Fix unfolding CWs on public hashtag page
...
Fixes #909
2019-02-06 14:37:57 +01:00
e186bd2fb0
Fix Tombstone.delete_all ArgumentError ( #9978 )
2019-02-06 02:50:52 +01:00
46e806cd2f
Rename from instance to server. ( #9938 )
2019-02-05 19:11:24 +01:00
3eb17a3bea
i18n: Update Polish translation 🇵 ( #9974 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2019-02-05 15:13:34 +01:00
26c1aba658
Do not use apk cache and upgrade ( #9966 )
2019-02-05 15:13:19 +01:00
Eugen Rochko