about summary refs log tree commit diff
path: root/app/javascript
AgeCommit message (Collapse)Author
2017-11-17Merge pull request #219 from glitch-soc/no-spinDavid Yip
Remove 'spin' theme
2017-11-17Throw layout, isWide, navbarUnder back into mapStateToProps.David Yip
This gets wide view, auto layout, and navbar-under-mobile working again.
2017-11-16Removes spin themekibigo!
2017-11-16Themed prefetchingkibigo!
2017-11-16Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-17Display moderator badge (green), admin badge changed to red (#5728)Eugen Rochko
2017-11-16Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
2017-11-15Merge pull request #212 from aschmitz/feat/mute-reblogsbeatrix
Allow hiding reblogs on a per-follow basis
2017-11-15reusable-streaming (#5709)masarakki
2017-11-15Optional notification muting (#5087)Surinna Curtis
* Add a hide_notifications column to mutes * Add muting_notifications? and a notifications argument to mute! * block notifications in notify_service from hard muted accounts * Add specs for how mute! interacts with muting_notifications? * specs testing that hide_notifications in mutes actually hides notifications * Add support for muting notifications in MuteService * API support for muting notifications (and specs) * Less gross passing of notifications flag * Break out a separate mute modal with a hide-notifications checkbox. * Convert profile header mute to use mute modal * Satisfy eslint. * specs for MuteService notifications params * add trailing newlines to files for Pork :) * Put the label for the hide notifications checkbox in a label element. * Add a /api/v1/mutes/details route that just returns the array of mutes. * Define a serializer for /api/v1/mutes/details * Add more specs for the /api/v1/mutes/details endpoint * Expose whether a mute hides notifications in the api/v1/relationships endpoint * Show whether muted users' notifications are muted in account lists * Allow modifying the hide_notifications of a mute with the /api/v1/accounts/:id/mute endpoint * make the hide/unhide notifications buttons work * satisfy eslint * In probably dead code, replace a dispatch of muteAccount that was skipping the modal with launching the mute modal. * fix a missing import * add an explanatory comment to AccountInteractions * Refactor handling of default params for muting to make code cleaner * minor code style fixes oops * Fixed a typo that was breaking the account mute API endpoint * Apply white-space: nowrap to account relationships icons * Fix code style issues * Remove superfluous blank line * Rename /api/v1/mutes/details -> /api/v2/mutes * Don't serialize "account" in MuteSerializer Doing so is somewhat unnecessary since it's always the current user's account. * Fix wrong variable name in api/v2/mutes * Use Toggle in place of checkbox in the mute modal. * Make the Toggle in the mute modal look better * Code style changes in specs and removed an extra space * Code review suggestions from akihikodaki Also fixed a syntax error in tests for AccountInteractions. * Make AddHideNotificationsToMute Concurrent It's not clear how much this will benefit instances in practice, as the number of mutes tends to be pretty small, but this should prevent any blocking migrations nonetheless. * Fix up migration things * Remove /api/v2/mutes
2017-11-14Updating Chinese (Simplified) translations (#5643)SerCom_KC
* i18n: (zh-CN) Bug fix for note-counter. * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add support.array key for better wording * Revert "i18n: (zh-CN) Add support.array key for better wording" This reverts commit 27bf9a946e886213e827cd985d4f62419db57534. Looks like this commit can't get pass the checks, revert it for now. * i18n: (zh-CN) Change `客户端` to `应用` * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Add missing translations (#5635) * i18n: (zh-CN) Change `两步验证` to `双重认证` * i18n: (zh-CN) Improve translations
2017-11-14i18n: Update Polish translation (#5699)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-14Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.Lain Iwakura
2017-11-14Code style fixes.Lain Iwakura
2017-11-14Handle character limit in initial state in frontend.Lain Iwakura
2017-11-14Updates and fixes to win95 themeAndrew
2017-11-14l10n: PT-BR translation updated (#5681)Anna e só
* Improved e-mail messages; delted repeated words * pt-BR.json translations updated * Revert "pt-BR.json translations updated" This reverts commit 108c460531196fed6e6d14f93e8d8d047c835ffd. * Updated pt-BR.json * pt-BR.yml updated
2017-11-12Fix #5632 - Reset column loading status after fetch fail (#5659)Eugen Rochko
2017-11-11Don't update follower counts on reblog toggleaschmitz
2017-11-09Fix focused background color of direct toots (#5642)Lynx Kotoura
2017-11-09"Show reblogs" per-follower UI/database changesaschmitz
TODO: * Tests (particularly for FollowRequests). * Anything to respect the setting when putting reblogs in timelines.
2017-11-09Show confirmation dialog on leaving WebUI while composing (#5616)unarist
* Show confirmation dialog on leaving WebUI while composing Currently, Back button and Back hotkey can cause leaving from WebUI, as well as browser's back button. Users may hit those buttons accidentally, and their composing text will be lost. So this prevents it by showing confirmation dialog from `onbeforeunload` event. * Fix message and comments
2017-11-07Eliminate space around emoji (#5474)nullkal
* Eliminate space around emoji * More improve emoji style * Make more compatible with Twemoji * Make scss-lint happy * Make not modify normal emoji's behavior * Decrease status__action-bar's margin-top to 5px * Make the test be passed * Revert "Make the test be passed" This reverts commit 54a8c60e5907ef20a5ceb5ab2c86a933e06f3ece. * Revert "Make not modify normal emoji's behavior" This reverts commit 6a5bdf0c11df16ebd190cb3ab9d2e8f1349f435a.
2017-11-07Twidere mention workaround (#5552)ThibG
* Work around Twidere and Tootdon bug Tootdon and Twidere construct @user@domain handles from mentions in toots based solely on the mention text and account URI's domain without performing any webfinger call or retrieving account info from the Mastodon server. As a result, when a remote user has WEB_DOMAIN ≠ LOCAL_DOMAIN, Twidere and Tootdon will construct the mention as @user@WEB_DOMAIN. Now, this will usually resolve to the correct account (since the recommended configuration is to have WEB_DOMAIN perform webfinger redirections to LOCAL_DOMAIN) when processing mentions, but won't do so when displaying them (as it does not go through the whole account resolution at that time). This change rewrites mentions to the resolved account, so that displaying the mentions will work. * Use lookbehind instead of non-capturing group in MENTION_RE Indeed, substitutions with the previous regexp would erroneously eat any preceding whitespace, which would lead to concatenated mentions in the previous commit. Note that users will “lose” up to one character space per mention for their toots, as that regexp is also used to remove the domain-part of mentioned users for character counting purposes, and it also erroneously removed the preceding character if it was a space.
2017-11-07Add ability to disable login and mark accounts as memorial (#5615)Eugen Rochko
Fix #5597
2017-11-07fix: slang to adequate word (#5453)voidSatisfaction
2017-11-07Avoid emojifying on invisible text (#5558)MIYAGI Hikaru
2017-11-07Make fullscreen video in detailed status plays in fullscreen (Partly Fix ↵nullkal
#5160) (#5611) * Make fullscreen video in detailed status plays in fullscreen (Fix #5160) * Directly assign the initial state
2017-11-06Mastodon GO! -> v0.1.1kibigo!
2017-11-05Autocollapse boosts optionkibigo!
2017-11-05don't display any descendants of .invisible (#5567)MIYAGI Hikaru
* don't display any descendants of .invisible * reduce the scope of selector * remove some rules for image * lint
2017-11-04Merge pull request #204 from glitch-soc/with-mastodon-gobeatrix
Introducing: Mastodon GO!
2017-11-04Introducing: Mastodon GO!kibigo!
2017-11-03l10n Occitan (#5586)Quenty31
* Update OC: time format Correction for time format according to: https://opinion.jornalet.com/conselh-linguistic-de-jornalet/blog/2379/la-notacion-oraria-en-occitan Harmonisation words in menu and confirmation windows * Update for unlisted custum emoji + #5577 * correction subjonctiu It's either siasque or siague * Corrections Any : qual que, in two words, else it means "some". And "siasque" with S even if I don't pronounce it at all. * Update oc.json
2017-11-01refactor(features/ui): Avoid useless renders in WrappedSwitch (#5580)Sorin Davidoi
2017-11-01Replace react-router-scroll to react-router-scroll-4 (#5568)Yamagishi Kazutoshi
2017-11-01Refactor initial state: auto_play_gif (#5576)Nolan Lawson
2017-10-31Refactor initial state: "me" (#5563)Nolan Lawson
* Refactor initial state: "me" * remove "me" from reducers/meta.js
2017-10-30Updating Chinese (Simplified) translations (#5508)SerCom_KC
* i18n: (zh-CN) fix punctuations and spaces Spaces are fixed according to https://github.com/sparanoid/chinese-copywriting-guidelines * i18n: (zh-CN) fix punctuation * i18n: (zh-CN) Adapt official translation of Discourse Privacy Policy from GitHub, with minor fixes https://github.com/discourse/discourse/blob/master/config/locales/server.zh_CN.yml#L2677 * i18n: (zh-CN) Update missing translations * i18n: (zh-CN) Fixing errors * i18n: (zh-CN) Fix indent error * i18n: (zh-CN) Fix language tag * i18n: (zh-CN) Remove quotes * i18n: (zh-CN) Update translation (#5485) * i18n: (zh-CN) Remove whitespaces, x -> × * i18n: (zh-CN) Rewording on time distance * i18n: (zh-CN) Overall improvements * i18n: (zh-CN) i18n-tasks normalization * i18n: (zh-CN) Add missing translation
2017-10-30Avoid modifying emoji data inline (#5548)Nolan Lawson
2017-10-30Add margin to account for Edge disappearing scrollbar (#5522)Nolan Lawson
* Add margin to account for Edge disappearing scrollbar * Fix 16px margin for DMs and horizontal line
2017-10-30Reactor unfollow_modal, boost_modal, delete_modal (#5505)Nolan Lawson
2017-10-27Separate Follow/Unfollow and back buttons (#5496)Herbert Kagumba
2017-10-27Avoid unnecessary Motion components in icon_button.js (#5544)Nolan Lawson
2017-10-27Directly use <Motion/> if not reducing motion (#5546)Nolan Lawson
2017-10-28Refactor initial state: reduce_motion and auto_play_gif (#5501)Nolan Lawson
2017-10-27Merge branch 'master' into gs-masterDavid Yip
2017-10-27Feature: Unlisted custom emojis (#5485)nullkal
2017-10-26Theme: Windows 95Andrew
2017-10-26Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip