1. 23 Apr, 2017 20 commits
    • Matt Jankowski's avatar
    • 178inaba's avatar
      Add simple_format to simplified_format (#2198) · 1244630a
      178inaba authored
    • Effy Elden's avatar
    • Effy Elden's avatar
      Export environment variables from .env.vagrant before running rails commands... · cc83ee60
      Effy Elden authored
      Export environment variables from .env.vagrant before running rails commands in Vagrant provisioning (#2343)
    • ThibG's avatar
      Allow webfinger controller to reply to user@WEB_DOMAIN in addition to user@LOCAL_DOMAIN (#2351) · 89dc29af
      ThibG authored
      This provides a hotfix for outbound salmon requests to other Mastodon instances
      as they currently will try to resovle user@WEB_DOMAIN instead of user@LOCAL_DOMAIN
      (see #2012 and #20312).
      Furthermore, this should ease transition from users switching from
      LOCAL_DOMAIN = WEB_DOMAIN to another LOCAL_DOMAIN when WEB_DOMAIN does not change.
    • Ashley's avatar
      Halved padding for emoji (#2344) · 85e09518
      Ashley authored
    • Stephen Burgess's avatar
      fix(style): Fix regressions introduced by #2338 (#2345) · 663f090c
      Stephen Burgess authored
      Put Column Slim Back Button classnames in order so it is positioned right and top. Add icon button style back to privacy dropdown and upload buttons so they are positioned correctly and do not wiggle. Remove abstracted style from CSS. Add missed class for the upload form thumbnail. Add the missed styles for upload form thumnail. Alphabetize styles for column-back-button. Fix fontSize typo for media-spoiler-video-play-icon.
    • Joël Quenneville's avatar
      Test embedded_view related code in a helper (#2282) · 1cf9e14a
      Joël Quenneville authored
      The two methods `StreamEntriesHelper#stream_link_target` and
      `StreamEntriesHelper#acct` are based on checking whether we are running
      in an embedded view.
      This adds some test helper code to make the testing easier. We extracted
      some "magic strings" to constants to lower the coupling in the specs.
    • Joël Quenneville's avatar
      Add test coverage to CSS class generation (#2285) · 0c2fe22b
      Joël Quenneville authored
      The code that generates CSS is based on a lot of boolean conditions.
      The possible combinations of these grows exponentially as we add more
      Since most of the code is conditional on a single boolean, we tested the
      1. All `false`
      2. All `true`
      3. Each individual flag set to `true`
      The methods tested are:
      * `StreamEntriesHelper#style_classes`
      * `StreamEntriesHelper#microformats_classes`
      * `StreamEntriesHelper#microformats_h_class`
    • Koala Yeung's avatar
      Adding arabic string localization (rebased) (#1895) · 6f0b3b06
      Koala Yeung authored
      * Create ar.jsx
      * Preparing file for translation.
      * Create ar.yml
      * Preparing file for translation.
      * Create simple_form.ar.yml
      * Preparing file for translation.
      * Create devise.ar.yml
      * Preparing file for translation.
      * Create doorkeeper.ar.yml
      * Preparing file for translation.
      * Update index.jsx
      Preparing file for translation.
      * Update mastodon.jsx
      * Preparing file to translation.
      * Correction thanks to @Taekiro
      * Update settings_helper.rb
      Preparing file to translation.
      * Update application.rb
      * Preparing file to translation.
      * Update simple_form.ar.yml
      * Update doorkeeper.ar.yml
      * Update devise.ar.yml
      * Update ar.yml
      * Fix i18n-tasks unused issue (ar)
      Remove unused translation strings
      * Update application.rb
      * Update ar.jsx
      * Fix various issues with Arabic translation
      * Fix duplication caused in merge
      * Fix syntax error in devise.ar.yml
      * Fix import error Duplicated incorrect import in mastodon.jsx
      * Fix duplication error in locales/index.jsx
      * Update ar.yml
      * Update ar.jsx
      * Update ar.yml
      * Update ar.jsx
      * Fix ar translation
    • Ashley's avatar
      Tooltip for boosting depends on toot visibility (#1394) (#1754) · 9cd20a70
      Ashley authored
      * Made tooltip for boosting depend on visibility
      * Removed spaces that were added in merge conflict resolution
      * Try again :P
      * Added missing bracket
      * Changed 'toot' to 'status'
    • Yamagishi Kazutoshi's avatar
    • Evan Minto's avatar
      ActivityPub: Add basic, read-only support for Outboxes, Notes, and... · 66fd8e78
      Evan Minto authored
      ActivityPub: Add basic, read-only support for Outboxes, Notes, and Create/Announce Activities (#2197)
      * Clean up collapsible components
      * Expose user Outboxes and AS2 representations of statuses
      * Save work thus far.
      * Fix bad merge.
      * Save my work
      * Clean up pagination.
      * First test working.
      * Add tests.
      * Add Forbidden error template.
      * Revert yarn.lock changes.
      * Fix code style deviations and use localized instead of hardcoded English text.
    • Yamagishi Kazutoshi's avatar
    • Ash Furrow's avatar
      Admin UI for confirming users (#2245) · 723f25a9
      Ash Furrow authored
      * Shows confirmed status in list.
      * Adds ability to confirm users in admin UI.
      * Added new english translations.
      * Addresses feedback from #2245.
      * More feedback.
    • Eugen's avatar
      Add a confirmation modal: (#2279) · 59b1de0b
      Eugen authored
      - Deleting a toot
      - Muting, blocking someone
      - Clearing notifications
      Remove source map generation from development environment, as it is a huge
      performance sink hole with little gains
    • Akihiko Odaki's avatar
      Alter Japanese translations for CW and NSFW (#2305) · df46864b
      Akihiko Odaki authored
      The previous translation for NSFW, "不適切" means "impertinent". This change
      suggests "閲覧注意", which means the content requires precaution, instead.
      However, "閲覧注意" was also a translation for CW. CW is now translated as
      "警告", which simply means "warnings".
    • Stephen Burgess's avatar
      Replace inline styles with CSS classes (BEM) (#2338) · cca41ea5
      Stephen Burgess authored
      * fix(classnames): Status icon style classnames
      Take out inline css and put into classnames for the following components: account, avatar, icon button, status action bar, notification.
      * fix(status): Move styles from inline to classes for statuses
      Move styles to classnames in components.scss for the following components:
      display name
      media gallery
      status content
      video player
      * fix(classnames): Add classnames to rest of components
      Take out inline styles and apply them to classnames in the sass for the following components:
      column back button
      slim column back button
      collapsable column
      dropdown menu
      loading indicator
      status list
      * fix(classnames): Remove all non-dynamic inline styles
      Components affected:
      action bar
      character counter
      compose form
      emoji dropdown
      privacy dropdown
      reply indicator
      upload form
      account auth
      getting started
      column settings
      status checkbox
      action bar
      boost modal
      media modal
      video modal
      * fix(permalink): Do not lose classname
      * fix(tests): Add space back in display name
      * fix(status__wrapper): Remove duplicate css name
      Remove incorrect style attribute. Remove style attribute all together. Cursor defaults to "auto" when not specified as 'default'.
      * fix(nl): do not lose translations
    • Matt Jankowski's avatar
      Clean up flash display in views (#2336) · 532bec6e
      Matt Jankowski authored
      * Add flashes partial to DRY up admin/auth layouts
      * Further consolidate flash messages
    • Matt Jankowski's avatar
      Move force_ssl check to production config (#2165) · ee82d8a8
      Matt Jankowski authored
      The force_ssl method from controllers does not add all of the options that the
      sitewide configuration in a config block does. For example, HSTS enforcement is
      not added by the controller method, but is added by this style.
  2. 22 Apr, 2017 20 commits