dabbbe1e71
[Glitch] Fix occasional crash in detailed toot view
...
Port f9a338b473
2019-02-15 17:34:15 +01:00
04d7200ba4
[Glitch] Add "copy link" item to status action bars
...
Port 12cb694634
2019-02-13 07:29:57 +01:00
53cc85871d
[Glitch] Don't focus spoiler input when disabled spoiler
...
Inspired by 6866739387
2019-02-12 21:16:02 +01:00
de60ff3809
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-12 20:32:48 +01:00
1767bb542c
Merge pull request #913 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-02-12 20:29:55 +01:00
6866739387
Don't focus spiler input when disabled spoiler ( #10017 )
2019-02-12 05:10:31 +01:00
98642fef2a
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
87a5991846
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
12cb694634
Add "copy link" item to status action bars ( #9983 )
...
Fix #6848
2019-02-11 12:19:49 +09:00
d486152092
Handle deletion of filtered toots
2019-02-10 22:54:25 +01:00
eb6dfe4d8b
Minor fix to timeline jump avoiding behavior
2019-02-10 22:54:25 +01:00
7b23d3c657
Adjust scroll when statuses above the current scroll position are deleted
2019-02-10 22:54:25 +01:00
f24bd9d629
Adjust scroll if previewCard appeared
2019-02-10 22:54:25 +01:00
3d5ef5c497
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
b05cda87f8
Refactor intersection observer article code
2019-02-10 22:54:25 +01:00
18a540da9f
Cleanup redundant markup for hidden statuses
2019-02-10 22:54:25 +01:00
f2b7ab4523
Hide items rendered out-of-frame (once they have been rendered at least once)
2019-02-10 22:54:25 +01:00
d96df46a63
[Glitch] Rename from instance to server.
...
Port f308fb56ab
2019-02-10 22:19:26 +01:00
75187f908a
[Glitch] Fix not showing custom emojis in share page emoji picker
...
Port b037f6cec5
2019-02-10 21:54:43 +01:00
b3fc70d13e
[Glitch] Add featured hashtags to profiles
...
Port SCSS changes from d2d4d38f22
2019-02-10 21:50:42 +01:00
07f0cf8573
[Glitch] Allow multiple files upload through web UI, including drag & drop
...
Port 640966f3fc
2019-02-10 21:44:14 +01:00
5946d76d0a
[Glitch] Add missing rejection handling for Promises
...
Port missing parts from d88504ec84
2019-02-10 21:44:14 +01:00
538bae9f53
[Glitch] Add WebP support
...
Port bcf34e31bd
2019-02-10 21:13:17 +01:00
1c37ad108c
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
5e94fb5386
i18n: add Japanese translations ( #10000 )
...
* Add Japanese translations.
* Probably change to more general "統合" than "マージ" .
2019-02-10 21:04:59 +09:00
d66346eb0c
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
a9078c18eb
Fix CW unfolding not triggering re-layout in public hashtag page
2019-02-06 15:32:48 +01:00
d55233da9a
Fix unfolding CWs on public hashtag page
...
Fixes #909
2019-02-06 14:37:57 +01:00
f308fb56ab
Rename from instance to server. ( #9938 )
2019-02-05 19:11:24 +01:00
72f55c7cdf
i18n: Update Polish translation 🇵 ( #9974 )
...
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2019-02-05 15:13:34 +01:00
9ce59ef31d
[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
b037f6cec5
Fix not showing custom emojis in share page emoji picker ( #9970 )
2019-02-04 23:14:57 +01:00
be6c12fbea
change "finish tutorial" text to "finish toot-orial" ( #9905 )
2019-02-04 04:45:29 +01:00
d2d4d38f22
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
dcf363a623
Remove redundant “options” from “Compose box options”
...
Thanks @ariasuni.
2019-02-03 01:02:39 +01:00
43b2f021eb
Minor description corrections
2019-02-03 00:30:34 +01:00
640966f3fc
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
bcf34e31bd
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
252a765368
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
fba0f7dae7
[Glitch] Replace unlock-alt icon with unlock
...
Port 4fb1d8129d
2019-02-01 16:15:44 +01:00
aaf98669a5
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
b0e7af725a
Do not mark toots as sensitive if they don't have any media attached
2019-02-01 15:55:28 +01:00
afdf789d06
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
9cef8f1eb7
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
77dc5cc132
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
4fb1d8129d
Replace unlock-alt icon with unlock ( #9952 )
2019-01-31 13:45:15 +01:00
00fc362103
[Glitch] Fix initial value of volume slider in video player and handle volume changes
...
Port b5feaa4d54
2019-01-27 22:02:59 +01:00
333d3a2990
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-27 21:57:55 +01:00
b5feaa4d54
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
09f7773e26
Implement missing hotkeys for notifications ( #9927 )
2019-01-27 17:54:54 +01:00
Thibaut Girka