about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-04-17Improved Japanese translation in ja.yml (#1981)Toshiyuki Takahashi
2017-04-17Fix tiny typo, and added link to terms and conditions in confirmation email ↵anon
for Japanese. (#1975) (#1975)
2017-04-17Fix tiny typo (#1956)Ingo Blechschmidt
2017-04-17Assign user locale on signup (#1982)saturday06
2017-04-17Improve streaming server with cluster (#1970)geta6
2017-04-17reduce unneed query when post without attachements. (#1907)Keiji, Yoshimi
* reduce unneed query when post without attachements. This commit reduce following query: ``` MediaAttachment Load (0.9ms) SELECT "media_attachments".* FROM "media_attachments" WHERE "media_attachments"."status _id" IS NULL AND 1=0 ORDER BY id asc ``` * fixed for more simple changes.
2017-04-17Fix minor typo in Japanese translation "保村" -> "保存" (#1968)Yamagishi Kazutoshi
2017-04-17Improved Japanese translation in devise.ja.yml (#1969)Toshiyuki Takahashi
2017-04-16Do not display "reset password" in admin UI for remote accounts (#1960)Eugen
2017-04-16Fix #1957 - WhatLanguage can return null. Fallback to 'en' (#1959)Eugen
2017-04-16Fix bug mentioned in #1565 (#1954)Eugen
2017-04-16Remove unused registrations: key from PT yml locale (#1952)Matt Jankowski
2017-04-16Fix #1870 - Strip control characters out of strings in AtomSerializer (#1876)Eugen
* Fix #1870 - Strip control characters out of strings in AtomSerializer * Adjust according to comment by @alpaca-tc
2017-04-16Add language detection (#1772)Eugen
* Add language detection via WhatLanguage and (de)serialization of it through Atom * Fix default language in ProcessFeedService * Re-add newline before 'react-rails' Gem to fix groupings Fixes Code Climate issue
2017-04-16Onboarding modal (#1883)Eugen
* Basic onboarding modal that's shown to users once * Lay out pages 2 through 5, add images, style modals (#1509) * Lay out pages 2 through 5 Added images and laid out pages 2 through 5 in the jsx file. SCSS will come, still working on just seeing if this works at all. * Fix jsx errors, add images to modal pages, style modal pages * Add animations to onboarding pager changes, improve wording and styling * Finishing touches on the onboarding * Add missing propTypes * Update wording
2017-04-16Update node.js and imagemagick (#1951)Wonderfall
* update Dockerfile: latest nodejs LTS * also update imagemagick
2017-04-16I18n health warnings (#1949)Matt Jankowski
* Rename admin.domain_block to admin.domain_blocks in prep for i18n improvement * Use implicit controller/action path for i18n in admin/domain_blocks * Add DomainBlock#accounts has_many * Avoid i18n health warning for `en` locale by using symbol scope with :count * Remove unused i18n key: plaintext_secret_html * Remove unused i18n key two_factor_auth.warning * Remove final will_paginate i18n keys * Remove unused key two_factor_auth.recovery_codes * Remove unused key: admin.reports.comment.none * Remove unused reports. i18n namespace (moved to admin.reports) * Ignore keys from locales which override activemodel and activerecord errors * Revert "Remove unused key: admin.reports.comment.none" This reverts commit 350ef2685fadc069e619bb6d1066190de195d942. * Update i18n key reference to match moved location * Add missing `en` keys to i18n * Tell i18n-tasks to ignore missing attributes that dont need overwriting * Add i18n-tasks unused to travis
2017-04-16Fix #1670 - Update OStatus2 gem (#1936)Eugen
2017-04-16Disable CodeClimate duplication checks (#1943)Eugen
2017-04-16Fix translation of 'reblogged' in eo.yml (#1942)oliverkeeble
2017-04-16Add missing keys to PT locale (#1941)Eduardo Elias
2017-04-16Check @recipient.user at the first (#1939)alpaca-tc
2017-04-16Fix #1813 - Alleviate extra requests when processing mentions (#1938)Eugen
The <link rel="mentioned" /> tag refers to accounts by href. So we were matching the DB by the url attribute, and falling back to HTTP look-up. However, GS and Mastodon use profile URLs as URIs, too, and the match for that was missing. This could potentially alleviate some extra network requests
2017-04-17Merge branch 'master' into fix/cache_blockingEffy Elden
2017-04-16Adds note for instance admins. (#1925)Ash Furrow
* Adds note for instance admins. * Addresses feedback from #1925.
2017-04-16Add README note about tagged releases (#1927)Eugen
2017-04-16Clean up check that account needs a webfinger update (#1932)Matt Jankowski
2017-04-16Remove trailing whitespace in terms.no.html (#1933)Matt Jankowski
2017-04-16Simplify the og:image and og:description code in stream_entries/show (#1934)Matt Jankowski
2017-04-16Use local vars in partials (#1935)Matt Jankowski
* Use local vars in accounts/header partial * Use local variable in 2fa recovery codes partial
2017-04-16fix regex filter (#1845)abcang
* fix regex filter * fixed br to linebreak and, stlip tags. * change to send raw content * changed to unescape in reducer
2017-04-16Remove .keep in models (#1892)tackeyy
2017-04-16Add presence validation to Import (#1928)alpaca-tc
``` *An* `ActiveRecord::StatementInvalid` *occurred while* `POST </settings/import>` *was processed by* `imports#create` Exception ---------------- PG::NotNullViolation: ERROR: null value in column "type" violates not-null constraint ```
2017-04-16Add the licence key in package.json (#1914)Alda Marteau-Hardi
2017-04-16Fix translation related to "mute" (#1926)mshrtkch
2017-04-16Add missing Japanese translations (#1923)Kazuhiro NISHIYAMA
And `i18n-tasks add-missing -l ja` changes some quotes.
2017-04-16Relax Ruby version requirement (#1901)Akihiko Odaki
2017-04-16Improve PT locale on simple_form (#1917)Eduardo Elias
* Improve PT locale on simple_form * Add missing keys to PT locale
2017-04-16Fixed NoMethodError in UnfollowService (#1918)alpaca-tc
2017-04-16Fix yaml issue in ja locale (#1916)Matt Jankowski
* Fix yaml parse issue in ja.yml locale * Fix issue in locales/ja.jsx
2017-04-16Syntax error in japanese localisation (#1920)Naouak
assets:precompile was failling because of this missing comma.
2017-04-16Add missing french translation. (#1906)Erwan Leboucher
* Add missing french translation. Causing this error: [React Intl] Missing message: "navigation_bar.mutes" for locale: "fr", * Update fr.jsx
2017-04-16Enlarge font size to avoid autozooming of iPhone. (#1911)Yuki Nakagawa
2017-04-16Improve Japanese translation (#1909)George Hattori
2017-04-16Add binstub for rspec from rspec-core (#1913)Matt Jankowski
2017-04-16Update Japanese Translate (#1903)新都心(Neet Shin)
* [Update ja.jsx] Add Muted, Video_error and sorted * [Update ja] Added Recovery code's translation * [Update ja] Added Two-fact/Recovery's translation * Update ja.jsx
2017-04-16Unite all mandatory rake tasks in mastodon:daily (#1887)Eugen
* Unite all mandatory rake tasks in mastodon:daily Add mastodon:media:remove_remote task Make mastodon:maintenance:add_static_avatars more resilient to exceptions * Fix typo in task description
2017-04-16lock capistrano to 3.8.0 (#1890)Alex Dunn
2017-04-16Make file attachment on MediaAttachment optional (#1865)Eugen
Create MediaAttachment but without actual file download when domain is blocked with reject_media set to true Clean up old media files when creating a new domain block with reject_media set to true Return remote_url in media attachments API if local file is not present Undo domain block action in admin UI Ability to enable reject_media from admin UI
2017-04-16cache blockings for reducing queries.Keiji Yoshimi