about summary refs log tree commit diff
path: root/app
AgeCommit message (Collapse)Author
2017-05-06Optimize follower_accounts and following_accounts (#2820)alpaca-tc
2017-05-06Stream entry specs and refactor to use delegate (#2827)Matt Jankowski
* Add coverage for stream entry delegated methods * Use delegate with allow_nil to clean up stream entry
2017-05-06Added japanese version of terms of service and privacy policy (#2703)gentaro
* Added japanese version of terms of service and privacy policy * Fix typo * Add trasnlation for title. * Improve translation and update the date.
2017-05-05Move account header and avatar methods to a concern (#2825)Matt Jankowski
2017-05-05Fixes unknown mime type (#2822)alpaca-tc
2017-05-05Fixes propTypes warning introduced by #2774 (#2824)alpaca-tc
2017-05-05Misc spec coverage improvements (#2821)Matt Jankowski
* Dont use raise_error by itself (avoids warning) * Add coverage for AccountFilter * Improve coverage and refactor for Subscription#lease_seconds * Improve coverage and refactor for NotificationMailer * Simplify assignment of min/max threshold on subscription
2017-05-05use Twitter::Extractor for creating links (#2502)masarakki
2017-05-05Update Locale zh-HK (#2818)Koala Yeung
* locale: Add missing translation in zh-HK.yml * locale: fix consistancy in zh-HK.yml translation * locale: Improve zh-HK yml translations * Use "PuSH" in all "PubSubHubBub" occurances. * Simplify text on front page. * Improve doorkeeper authorization table translations. * Simplify setting form text for better layout. * Improve "Business Email" translation. * locale: Update zh-HK.json * Fix untranslated text. * Improve translations.
2017-05-05Run manage:translations (#2816)Yamagishi Kazutoshi
2017-05-05Add specs (and refactor) of FetchRemoteResourceService and SearchService (#2812)Matt Jankowski
* Coverage for fetch remote resource service * Refactor fetch remote resource service * Coverage for search service * Refactor search service
2017-05-05Add Japanese translate to home column when inactive (#2813)Yamagishi Kazutoshi
2017-05-05Update ar.json (#2815)ButterflyOfFire
Adding more arabic translated strings.
2017-05-05More robust PuSH subscription refreshes (#2799)Eugen Rochko
* Fix #2473 - Use sidekiq scheduler to refresh PuSH subscriptions instead of cron Fix an issue where / in domain would raise exception in TagManager#normalize_domain PuSH subscriptions refresh done in a round-robin way to avoid hammering a single server's hub in sequence. Correct handling of failures/retries through Sidekiq (see also #2613). Optimize Account#with_followers scope. Also, since subscriptions are now delegated to Sidekiq jobs, an uncaught exception will not stop the entire refreshing operation halfway through Fix #2702 - Correct user agent header on outgoing http requests * Add test for SubscribeService * Extract #expiring_accounts into method * Make mastodon:push:refresh no-op * Queues are now defined in sidekiq.yml * Queues are now in sidekiq.yml
2017-05-04ui: check spoiler_text against regex filter (#1635) (#2665)R Tucker
* ui: check spoiler_text against regex filter (#1635) When filtering by regex, also check the spoiler_text if present. * ui: concatenate spoiler and content in reducer Simplifies aa5b03c, clarifies intent of the field
2017-05-04Delete records in smaller transaction (#2802)alpaca-tc
2017-05-04When streaming API is disconnected, poll home/notifications (#2776)Eugen Rochko
* When streaming API is disconnected, poll home/notifications Display slightly different empty home timeline message if user is following others Cull notifications to 20 items when over 40 get added in real-time Run manage:translations * Optimize <HomeTimeline /> a little
2017-05-04Fix language selector on preferences page (#2794)AA4ch1
2017-05-04Improve style for form in site settings (#2796)Yamagishi Kazutoshi
2017-05-04Persian translation update (#2788)Masoud Abkenar
* Persian translation update * fix newline typo
2017-05-04about page : use slightly more space (#2791)Wonderfall
2017-05-04Replace best_in_place editor on admin settings page (#2789)Matt Jankowski
* Remove best_in_place * Replace best_in_place usage with rails helpers * Move admin/settings#index to #edit action * Remove click_to__edit from i18n
2017-05-04Use ws protocol in streaming API base URL (#2606)Akihiko Odaki
2017-05-04Decode IDNA in PreviewCard (#2781)Yamagishi Kazutoshi
2017-05-04Show emoji shortname by a tooltip (#2784)unarist
2017-05-04Likely fix #2458, fix #2031 - handle out-of-order deletes for statuses (#2734)Eugen Rochko
* Likely fix #2458, fix #2031 - handle out-of-order deletes for statuses If a delete arrives before the original status, cache that information for 6h, and if the original status arrives in that window, ignore it * Add test case
2017-05-04Fix #2725 (#2774)Eugen Rochko
2017-05-03Update fr.json (#2757)goofy-bz
ajout espace insécable derrière pouet - pour voir
2017-05-03i18n: updated Polish translation (#2768)m4sk1n
Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>
2017-05-03Correct Account model for rubocop (#2587)Tomohiro Suwa
* Correct Account model for rubocop * Undo these changes
2017-05-03Remove screenshot image (#2736)Matt Jankowski
2017-05-03Fix #2706 - Always respond with 200 to PuSH payloads (#2733)Eugen Rochko
Fix #2196 - Respond with 201 when Salmon accepted, 400 when unverified Fix #2629 - Correctly handle confirm_domain? for local accounts Unify rules for extracting author acct from XML, prefer <email>, fall back to <name> + <uri> (see also #2017, #2172)
2017-05-03Language improvements, replace whatlanguage with CLD (#2753)Matt Jankowski
* add failing en specs * add cld2 gem * Replace WhatLanguage with CLD
2017-05-03i18n: Update zh-CN [ Chinese (China) ] translations. (#2699)ヨイツの賢狼ホロ | 3rd style
* Update zh-CN translations. * Update doorkeeper.zh-CN.yml * Follow @Artoria2e5 's change advices. * forget mail for text format ...... * fix some changes * mail's html version ...... * https://github.com/tootsuite/mastodon/pull/2699#pullrequestreview-35982283 * a space..... * delete some unused keys
2017-05-03Add styles for small devices to .onboarding-modal (#2748)unarist
2017-05-03Show boosted user's avatar (#2518)kawax
* Show boosted user's avatar * add .status__avatar-boost * margin * apply to notifications too. * account__avatar-boost * Add inline prop to Avatar component * Add AvatarOverlay component * rename mixins.scss * move files for latest master * fixed for webpack
2017-05-03Fix width of .confirmation-modal on narrow screens (#2743)unarist
2017-05-03Use URI.join for generate asset URL (#2741)Yamagishi Kazutoshi
* Use URI.join for generate asset URL * to String
2017-05-03Replace sprockets/browserify with Webpack (#2617)Eugen Rochko
* Replace browserify with webpack * Add react-intl-translations-manager * Do not minify in development, add offline-plugin for ServiceWorker background cache updates * Adjust tests and dependencies * Fix production deployments * Fix tests * More optimizations * Improve travis cache for npm stuff * Re-run travis * Add back support for custom.scss as before * Remove offline-plugin and babili * Fix issue with Immutable.List().unshift(...values) not working as expected * Make travis load schema instead of running all migrations in sequence * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time
2017-05-02Auth sign out (#2511)Matt Jankowski
* Add a spec for signing out * Add spec showing that suspended user gets a 403 forbidden on sign out * Allow suspended account users to sign out
2017-05-02Add option to disable two factor auth in admin accounts panel. (#2584)Kaylee
* Add option to disable two factor auth in admin accounts panel. Closes #2578 * Add @mjankowski's suggestions. * Moves destroy actions behind User#disable_two_factor! * Adds spec coverage for Admin:TwoFactorAuthenticationsController and User#disable_two_factor!
2017-05-02Add admin area view partials for each record type (#2700)Matt Jankowski
2017-05-02Norwegian translation for email notifications (#2673)Audun Larsen
* Create confirmation_instructions.no.html.erb * Create confirmation_instructions.no.text.erb * Create password_change.no.html.erb * Create password_change.no.text.erb * Create reset_password_instructions.no.html.erb * Create reset_password_instructions.no.text.erb * Translates html welcome email * Translates welcome email * Translates html password changed email * Translates password changed email * Translates html reset password email * Translates reset password email * Fixes typo in translation * Fixes typo in translation
2017-05-02Darkens colour on stream entries meta. (#2616)Ash Furrow
2017-05-02Reset textarea height when press submit key (#2681)Yamagishi Kazutoshi
* Reset textarea height when press submit key * dry * DON'T NEED props
2017-05-02Fix to completely hide NSFW-tagged images (#2724)hakoai
2017-05-02Fix subscription expiration condition (#2715)Yamagishi Kazutoshi
* Fix subscription expiration condition * dry and add spec
2017-05-02Make it possible to check Subscription that has expired (#2712)Yamagishi Kazutoshi
2017-05-02Add Hebrew interface translation. (#2573)Ira
* follow the instructions for registering the language as stated on the Tootsuite's docs. * Added translation strings from latest master Adding &rlm; characters to many strings that are misdirected in the interface. A tiny grammar fix Updates of Hebrew strings to v1.3.1 Hebrew translation of the mailer templates. Fix strings and a missing comma. Just discovered two string keys were updated. this should lay Travis' mind to rest at last. Remove mentions before counting characters to decide RTL ratio Fixes for PR #2573 updated strings for latest master Undo RTL counting, moved out to another branch for future consideration...
2017-05-02fix(boost-icon): Align center for Firefox (#2690)Stephen Burgess