about summary refs log tree commit diff
path: root/app/javascript
AgeCommit message (Collapse)Author
2019-02-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-10i18n: add Japanese translations (#10000)mayaeh
* Add Japanese translations. * Probably change to more general "統合" than "マージ" .
2019-02-06Fix IntersectionObserverArticle not hiding some out-of-view items (#9982)ThibG
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-06Fix CW unfolding not triggering re-layout in public hashtag pageThibaut Girka
2019-02-06Fix unfolding CWs on public hashtag pageThibaut Girka
Fixes #909
2019-02-05Rename from instance to server. (#9938)mayaeh
2019-02-05i18n: Update Polish translation 🇵 (#9974)marcin mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2019-02-05[UI] Fix whitespace being applied to div instead of p (#9968)trwnh
* fix large line breaks * fix ascii art posts
2019-02-04Fix not showing custom emojis in share page emoji picker (#9970)rinsuki
2019-02-04change "finish tutorial" text to "finish toot-orial" (#9905)mike castleman
2019-02-04Add featured hashtags to profiles (#9755)Eugen Rochko
* 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-03Remove redundant “options” from “Compose box options”Thibaut Girka
Thanks @ariasuni.
2019-02-03Minor description correctionsMarek Ľach
2019-02-02Allow multiple files upload through web UI, including drag & drop (#9856)tmm576
* 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-02Add WebP support (#9879)Acid Chicken (硫酸鶏)
* Add WebP support * Remove the changes to the tooltip refs: https://github.com/tootsuite/mastodon/pull/9879#pullrequestreview-199312528
2019-02-01Fix link color in high-contrast theme, add underlines (#9949)Eugen Rochko
Improve sorting of default themes in the dropdown
2019-02-01[Glitch] Replace unlock-alt icon with unlockThibaut Girka
Port 6513f6c953cdaad9118ea24a21f22fd2978bed28 to glitch-soc
2019-02-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
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-01Do not mark toots as sensitive if they don't have any media attachedThibaut Girka
2019-02-01Fix hashtag processing when sending tootsThibaut Girka
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-01Fix link color in high-contrast theme, add underlines (#9949)Eugen Rochko
Improve sorting of default themes in the dropdown
2019-02-01Refactor icons in web UI to use Icon component (#9951)Eugen Rochko
* 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-01-31Replace unlock-alt icon with unlock (#9952)Clar Charr
2019-01-27[Glitch] Fix initial value of volume slider in video player and handle ↵Thibaut Girka
volume changes Port a53dcaa29869e808707efcba541b02ee8d799e75 to glitch-soc
2019-01-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-27Fix initial value of volume slider in video player and handle volume changes ↵ThibG
(#9929) * Fix initial value of volume slider in video player and handle volume changes * Clean up dead/incorrect code
2019-01-27Implement missing hotkeys for notifications (#9927)ThibG
2019-01-25Fix Firefox scrollbar color regression in #9210 (#9908)trwnh
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
2019-01-25Apply style for .landing-page strong (#9892)Jeong Arm
2019-01-25Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-24Fix Firefox scrollbar color regression in #9210 (#9908)trwnh
In #9210 the track color was changed to transparent for no apparent reason. This PR restores the previous color selections implemented in #8653 while keeping the updated property name. Per https://github.com/tootsuite/mastodon/pull/9210#issuecomment-441788776 there is no particular reason for the color change in #9210.
2019-01-23Fix crash in Direct Messages column settingsThibaut Girka
Fixes #892
2019-01-21Apply style for .landing-page strong (#9892)Jeong Arm
2019-01-20Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-01-20i18n: Update Japanese translations (#9871)mayaeh
* Update Japanese translations. * Delete unused translation.
2019-01-20[Glitch] Fix public hashtag timeline width on mobile, fix scrollbar width ↵Thibaut Girka
compensation Port 3b3a4d8a1709b8f4a9ffe67d21707117c75f9fe8 to glitch-soc
2019-01-20[Glitch] Hide floating action button on search and getting started pagesThibaut Girka
Port 30af4ee65ff43c17d6f7b1b64d6bf1d8699f37c8 to glitch-soc
2019-01-20Allow event defaults on index for text data transfer (#9840)tmm576
2019-01-20[Glitch] Fix new hashtag page's items not being full-width on mobileThibaut Girka
Port b506ce119766bb3308f934e2d3de143b3ac6f5ad to glitch-soc
2019-01-20[Glitch] Add information about how to opt-in to the directory on the directoryThibaut Girka
Port SCSS changes from a492a9bcd355d4f0998990905177ac4f9699cc3c to glitch-soc
2019-01-20Fix slightly cropped font on settings page dropdowns when using system font ↵Mélanie Chauvel (ariasuni)
(#9839)
2019-01-20[Glitch] Improve the public hashtag pageThibaut Girka
Port 8b1990355974543542544e56d2046bc0c9c8716b to glitch-soc
2019-01-20[Glitch] Redesign public hashtag page to use a masonry layoutThibaut Girka
Port bc642ac24b49c14dca382e7aabbc16130293d2f4 to glitch flavour
2019-01-19Weblate translations (2019-01-19) (#9867)Eugen Rochko
* Translated using Weblate (Serbian) Currently translated at 85.0% (91 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (Serbian) Currently translated at 86.9% (93 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (Serbian) Currently translated at 93.6% (707 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Greek) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Korean) Currently translated at 100.0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Czech) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (French) Currently translated at 99.1% (748 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/fr/ * Translated using Weblate (Galician) Currently translated at 100,0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/gl/ * Translated using Weblate (Arabic) Currently translated at 98.9% (352 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Arabic) Currently translated at 93.5% (100 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (French) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/fr/ * Translated using Weblate (Arabic) Currently translated at 92.6% (699 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 94.7% (715 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Arabic) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/ * Translated using Weblate (Dutch) Currently translated at 99.5% (751 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Serbian) Currently translated at 93.5% (100 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (Serbian) Currently translated at 96.8% (61 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/ * Translated using Weblate (Serbian) Currently translated at 95.6% (722 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Arabic) Currently translated at 97.2% (104 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ar/ * Translated using Weblate (Latvian) Currently translated at 16.9% (60 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/lv/ * Translated using Weblate (Indonesian) Currently translated at 55.6% (198 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/id/ * Translated using Weblate (Polish) Currently translated at 96.8% (61 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/pl/ * Translated using Weblate (Dutch) Currently translated at 99.1% (106 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Asturian) Currently translated at 48.6% (52 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/ast/ * Translated using Weblate (Italian) Currently translated at 82.8% (625 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Slovak) Currently translated at 99.6% (752 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (German) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (German) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Occitan) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Catalan) Currently translated at 100,0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Catalan) Currently translated at 100.0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ca/ * Translated using Weblate (Slovak) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Catalan) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Occitan) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/ * Translated using Weblate (Dutch) Currently translated at 100,0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/nl/ * Translated using Weblate (Dutch) Currently translated at 100,0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/nl/ * Translated using Weblate (Czech) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * i18n-tasks normalize * yarn manage:translations * Fix pluralizations * Fix inconsistent interpolation
2019-01-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
No conflicts.
2019-01-18Fix new hashtag page's items not being full-width on mobile (#9852)Eugen Rochko
Fix #9845
2019-01-18Add information about how to opt-in to the directory on the directory (#9834)Eugen Rochko
Fix #9833
2019-01-18Weblate translations (2019-01-17) (#9844)Eugen Rochko
* Translated using Weblate (Welsh) Currently translated at 94.7% (337 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Czech) Currently translated at 99.9% (751 of 752 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Romanian) Currently translated at 99.2% (353 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ro/ * Translated using Weblate (Romanian) Currently translated at 11.8% (89 of 752 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ro/ * Translated using Weblate (German) Currently translated at 99.9% (751 of 752 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (German) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/de/ * Translated using Weblate (German) Currently translated at 99.9% (751 of 752 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/de/ * Translated using Weblate (Serbian) Currently translated at 96.8% (61 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Serbian) Currently translated at 74.8% (80 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * Translated using Weblate (Serbian) Currently translated at 98.4% (62 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sr/ нисам сигуран за ово "и не направите нову". слијед ријечи ми је мало чудан? * Translated using Weblate (Serbian) Currently translated at 75.7% (81 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ преподешавања за ПРЕСЕТ * Translated using Weblate (Catalan) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ca/ * Translated using Weblate (Serbian) Currently translated at 80.4% (86 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sr/ * i18n-tasks normalize * yarn manage:translations
2019-01-17Fix slightly cropped font on settings page dropdowns when using system font ↵Mélanie Chauvel (ariasuni)
(#9839)
2019-01-17Allow event defaults on index for text data transfer (#9840)tmm576
generated by cgit-pink (git 2.37.1) at 2024-11-22 18:58:52 +0000