]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoRename cache key to exclude_account_ids_for:id, adjust formatting
Eugen Rochko [Mon, 17 Apr 2017 23:14:02 +0000 (01:14 +0200)]
Rename cache key to exclude_account_ids_for:id, adjust formatting

8 years agoMerge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix...
Eugen Rochko [Mon, 17 Apr 2017 23:09:57 +0000 (01:09 +0200)]
Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking

8 years agoAdd forgotten AtomSerializer spec (#2047)
Eugen [Mon, 17 Apr 2017 23:07:46 +0000 (01:07 +0200)]
Add forgotten AtomSerializer spec (#2047)

8 years agoIgnore /vendor/bundle (#1880)
Marcin Cieślak [Mon, 17 Apr 2017 23:02:50 +0000 (01:02 +0200)]
Ignore /vendor/bundle (#1880)

8 years agoAdd FR locales to the onboarding modal (#1976)
Damien Erambert [Mon, 17 Apr 2017 23:02:02 +0000 (16:02 -0700)]
Add FR locales to the onboarding modal (#1976)

* Add FR locale for the onboarding modal component

* Slightly increase the max-width and max-height of the onboarding modal

This is done so it doesn't break with locales whose strings would be
too long

* Update FR locales for onboarding upon PR comments

8 years agoAdd simplified Chinese js translation (#2044)
Mingye Wang [Mon, 17 Apr 2017 23:01:32 +0000 (19:01 -0400)]
Add simplified Chinese js translation (#2044)

This single-file commit, heavily based on the zh-hk version as of
ec9999c, fixes the missing js locale. Intentional, significant
departures from current zh-cn yml localizations have been marked with
rationales given.

8 years agoInstance helper to replace site title helper (#2038)
Matt Jankowski [Mon, 17 Apr 2017 22:16:32 +0000 (18:16 -0400)]
Instance helper to replace site title helper (#2038)

* Move site title helper to instance helper (name change only)

* Remove newline in <title> tag

* Add site_hostname helper method to wrap up local_domain value

* Use site_hostname helper in places that need local_domain value

8 years agoUpdated, improved and fixed Dutch language strings (#2030)
jeroenpraat [Mon, 17 Apr 2017 22:16:03 +0000 (00:16 +0200)]
Updated, improved and fixed Dutch language strings (#2030)

* Fixed some words

* Improved and more consistent

* Fixes and a bit less 'je'

* Improved and more consistent

* Another round of improvements and consistency

* More improvements and less 'je'

* Update

* Updated with admin strings

* More improvements and additions - not complete yet, but most is there

* This is what we call in Dutch 'the English disease' :-)

* fix comma

* admin.reportsi

* not needed

* hopefully now fixed

8 years agoUse .presence instead of ternary on site description for og: content (#2033)
Matt Jankowski [Mon, 17 Apr 2017 21:19:45 +0000 (17:19 -0400)]
Use .presence instead of ternary on site description for og: content (#2033)

8 years agooptimized logo (#2020)
Sam Hewitt [Mon, 17 Apr 2017 19:49:51 +0000 (15:49 -0400)]
optimized logo (#2020)

- adjusted elements to fit the pixel grid for better scaling
- optimized the PNG asset and the SVG asset

8 years agoREADME tidy up (#2026)
Matt Jankowski [Mon, 17 Apr 2017 19:28:31 +0000 (15:28 -0400)]
README tidy up (#2026)

* Remove docker guide and put it in docs repo

* Move tasks to docs repo

* Move requirements to contributing doc

* Move advice about tagged releases to docs repo

* Move local domain and host config to docs repo

* Link to related tech

8 years agoFix import pt_br locale in mastodon.jsx (#2011)
Andrey Blinov [Mon, 17 Apr 2017 19:01:42 +0000 (22:01 +0300)]
Fix import pt_br locale in mastodon.jsx (#2011)

8 years agoReturn early from submit if no text. (#1962)
Zac Anger [Mon, 17 Apr 2017 18:30:38 +0000 (12:30 -0600)]
Return early from submit if no text. (#1962)

8 years agoFrench i18n-tasks missing fr (#2018)
spf [Mon, 17 Apr 2017 18:27:11 +0000 (20:27 +0200)]
French i18n-tasks missing fr (#2018)

8 years agoRemove i18n_spec file (#2014)
Matt Jankowski [Mon, 17 Apr 2017 18:02:29 +0000 (14:02 -0400)]
Remove i18n_spec file (#2014)

These were being skipped with `xit`, but we also just added the `unused` task to
the CI server, and it will be caught there. That seems good enough for this,
instead of requiring a full keys check on every local spec suite run.

8 years agoMedia controller specs (#2022)
Matt Jankowski [Mon, 17 Apr 2017 18:02:00 +0000 (14:02 -0400)]
Media controller specs (#2022)

* Add spec for media controller

* Add MediaAttachment.attached scope

* Simplify methods in media controller

8 years agoFix #1972, fix #1870 - Fix special characters in XML, add tests (#1988)
Eugen [Mon, 17 Apr 2017 17:58:54 +0000 (19:58 +0200)]
Fix #1972, fix #1870 - Fix special characters in XML, add tests (#1988)

Also improve efficiency of the mastodon:maintenance:add_static_avatars task

8 years agoFix #1897 - Return reblogged: false on unreblog (was wrongly named variable) (#1989)
Eugen [Mon, 17 Apr 2017 17:58:38 +0000 (19:58 +0200)]
Fix #1897 - Return reblogged: false on unreblog (was wrongly named variable) (#1989)

8 years agoImprove handling of HTTP_ACCEPT for webfinger (#2008)
Matt Jankowski [Mon, 17 Apr 2017 17:58:03 +0000 (13:58 -0400)]
Improve handling of HTTP_ACCEPT for webfinger (#2008)

This change includes:

- Improve the spec coverage for incoming request to the webfinger action
- For requests without an accept header (ie, what a browser might look like),
  return a JSON response.
- For requests with an explicit format of xml or json, return that format.
- For requests using an accept header, return that format.

Also adds failing spec showing webfinger does not return xml, which covers the
issue described in: https://github.com/tootsuite/mastodon/issues/1983

8 years agoFix nil query_username (#2013)
Tomohiro Suwa [Mon, 17 Apr 2017 17:57:02 +0000 (02:57 +0900)]
Fix nil query_username (#2013)

8 years agoRequired foreign keys (#2003)
alpaca-tc [Mon, 17 Apr 2017 13:54:33 +0000 (22:54 +0900)]
Required foreign keys (#2003)

* Add `required: true` option to foreign column

* Fixes NoMethodError

```
> Favourite.new.valid?
NoMethodError: undefined method `reblog?' for nil:NilClass
```

8 years agoUpdate Japanese translation (#1993)
IWAI, Masaharu [Mon, 17 Apr 2017 13:15:24 +0000 (22:15 +0900)]
Update Japanese translation (#1993)

Sync text for toot form

8 years agoUpdate fr.jsx "clear" (Nettoyer peut-être ambigu) (#1987)
Christophe Gesché [Mon, 17 Apr 2017 13:15:14 +0000 (15:15 +0200)]
Update fr.jsx "clear" (Nettoyer peut-être ambigu) (#1987)

Un utiliser mal expérimenté pourrait comprendre "retirer les erreurs".
Ici il s'agit d'une suppression pure et simple, pas une épuration/nettoyage.

clear would be translated "remove" instead of "cleaning" Cleaning can be unterstood "keep but clean"

8 years agoMake contents of boost confirmation dialog scroll (#1710)
tom [Mon, 17 Apr 2017 10:27:19 +0000 (06:27 -0400)]
Make contents of boost confirmation dialog scroll (#1710)

This is necessary for boosting long posts on small screens - see this post for video: https://slime.global/@masklayer/102308

8 years agoOpen sidekiq and pghero admin pages in new browser tabs (#1596)
Brad Urani [Mon, 17 Apr 2017 10:26:45 +0000 (03:26 -0700)]
Open sidekiq and pghero admin pages in new browser tabs (#1596)

* Open sidekiq and pghero admin pages in new tabs

* Add missing comma

8 years agoAdd documentation of SMTP_DOMAIN (#1738)
Ian Kelling [Mon, 17 Apr 2017 08:42:29 +0000 (01:42 -0700)]
Add documentation of SMTP_DOMAIN (#1738)

Without setting it, exim will reject the mail with a message like:
rejected EHLO from [10.20.0.1]: syntactically invalid argument(s): {}

8 years agoAllow using an SMTP server without authentication (#1597)
Miguel Jacq [Mon, 17 Apr 2017 08:41:19 +0000 (18:41 +1000)]
Allow using an SMTP server without authentication (#1597)

* Allow using an SMTP server without authentication (e.g Postfix relay on the same host) by setting SMTP_LOGIN and SMTP_AUTH_METHOD to 'none'

* Add note in .env.production.sample about SMTP settings for servers where no auth is required

* Assume that SMTP_LOGIN and SMTP_PASSWORD will be blank if we set SMTP_AUTH_METHOD to none

8 years agoNFS for shared folder requires a private_network (#1263)
happycoloredbanana [Mon, 17 Apr 2017 08:40:14 +0000 (11:40 +0300)]
NFS for shared folder requires a private_network (#1263)

8 years agoAdd mask-icon.svg (#1572) (#1585)
Dale Price [Mon, 17 Apr 2017 08:39:54 +0000 (03:39 -0500)]
Add mask-icon.svg (#1572) (#1585)

* Add mask-icon (#1572)

* use updated svg logo for mask-icon

8 years agoAdded missing `rake secret` command (#1894)
Expenses [Mon, 17 Apr 2017 08:38:59 +0000 (20:38 +1200)]
Added missing `rake secret` command (#1894)

8 years agoAdd Brazilian Portuguese and fix European Portuguese (#1966)
Hugo Gameiro [Mon, 17 Apr 2017 08:38:27 +0000 (09:38 +0100)]
Add Brazilian Portuguese and fix European Portuguese (#1966)

* update portuguese translation

added the missing fields and improved the translation

* pt translations fix

* improve last translation commit

* fix damn quotes

* add pt_br to index.jsx

* add pt-BR to import index.jsx

* add pt-BR to mastodon.jsx

* add pt-BR to settings_helper.rb

* add pt-BR to application.rb

* order alphabetically pt.jsx

* create pt-BR.jsx

* Create devise.pt-BR.yml

* language improvements to devise.pt.yml

* created doorkeeper.pt-BR.yml

* fixes to doorkeeper.pt.yml

* create pt-BR.yml

* improvements to pt.yml

* Create simple_form.pt-BR.yml

* Improvements to simple_form.pt.yml

* improvements to pt.yml

8 years agoCreate hr.jsx (#1945)
May Kittens Devour Your Soul [Mon, 17 Apr 2017 08:38:13 +0000 (10:38 +0200)]
Create hr.jsx (#1945)

* Create hr.jsx

Start of Croatian translation

* Update settings_helper.rb

* Update application.rb

* Update application.rb

* Update index.jsx

8 years agoOptimize user setting page for mobile browser (#1924)
Yuki Nakagawa [Mon, 17 Apr 2017 08:37:00 +0000 (17:37 +0900)]
Optimize user setting page for mobile browser (#1924)

* Remove overflow because it blocks scrolling on mobile safari.

* Add “-webkit-overflow-scrolling: touch;” to enable smooth scroll on mobile safari and other webkit browsers.

* Use radio buttons in user setting page.

Because select tags with long text are not fit in the width of mobile devices.

* Add flex property to fit labels to devise width.

* Change font size of select.

It causes auto zooming on mobile safari.

8 years agoRubocop instructions (#1973)
Matt Jankowski [Mon, 17 Apr 2017 08:35:42 +0000 (04:35 -0400)]
Rubocop instructions (#1973)

* Rubocop link for Sublime Text

* Fix rubocop links

* Link to gh issues page from contributing doc

8 years agoAdd human locales for zh-tw (#1984)
Yamagishi Kazutoshi [Mon, 17 Apr 2017 08:35:06 +0000 (17:35 +0900)]
Add human locales for zh-tw (#1984)

8 years agoAdd function color remaining text (#1980)
usagi-f [Mon, 17 Apr 2017 08:34:33 +0000 (17:34 +0900)]
Add function color remaining text (#1980)

8 years agoImproved Japanese translation in ja.yml (#1981)
Toshiyuki Takahashi [Mon, 17 Apr 2017 08:32:41 +0000 (17:32 +0900)]
Improved Japanese translation in ja.yml (#1981)

8 years agoFix tiny typo, and added link to terms and conditions in confirmation email for Japan...
anon [Mon, 17 Apr 2017 08:32:09 +0000 (17:32 +0900)]
Fix tiny typo, and added link to terms and conditions in confirmation email for Japanese. (#1975) (#1975)

8 years agoFix tiny typo (#1956)
Ingo Blechschmidt [Mon, 17 Apr 2017 08:29:49 +0000 (10:29 +0200)]
Fix tiny typo (#1956)

8 years agoAssign user locale on signup (#1982)
saturday06 [Mon, 17 Apr 2017 08:29:08 +0000 (17:29 +0900)]
Assign user locale on signup (#1982)

8 years agoImprove streaming server with cluster (#1970)
geta6 [Mon, 17 Apr 2017 02:32:30 +0000 (11:32 +0900)]
Improve streaming server with cluster (#1970)

8 years agoreduce unneed query when post without attachements. (#1907)
Keiji, Yoshimi [Mon, 17 Apr 2017 02:23:13 +0000 (11:23 +0900)]
reduce unneed query when post without attachements. (#1907)

* 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.

8 years agoFix minor typo in Japanese translation "保村" -> "保存" (#1968)
Yamagishi Kazutoshi [Mon, 17 Apr 2017 02:22:14 +0000 (11:22 +0900)]
Fix minor typo in Japanese translation "保村" -> "保存" (#1968)

8 years agoImproved Japanese translation in devise.ja.yml (#1969)
Toshiyuki Takahashi [Mon, 17 Apr 2017 02:22:09 +0000 (11:22 +0900)]
Improved Japanese translation in devise.ja.yml (#1969)

8 years agoDo not display "reset password" in admin UI for remote accounts (#1960)
Eugen [Sun, 16 Apr 2017 21:15:58 +0000 (23:15 +0200)]
Do not display "reset password" in admin UI for remote accounts (#1960)

8 years agoFix #1957 - WhatLanguage can return null. Fallback to 'en' (#1959)
Eugen [Sun, 16 Apr 2017 21:12:19 +0000 (23:12 +0200)]
Fix #1957 - WhatLanguage can return null. Fallback to 'en' (#1959)

8 years agoFix bug mentioned in #1565 (#1954)
Eugen [Sun, 16 Apr 2017 19:02:54 +0000 (21:02 +0200)]
Fix bug mentioned in #1565 (#1954)

8 years agoRemove unused registrations: key from PT yml locale (#1952)
Matt Jankowski [Sun, 16 Apr 2017 18:53:16 +0000 (14:53 -0400)]
Remove unused registrations: key from PT yml locale (#1952)

8 years agoFix #1870 - Strip control characters out of strings in AtomSerializer (#1876)
Eugen [Sun, 16 Apr 2017 18:32:27 +0000 (20:32 +0200)]
Fix #1870 - Strip control characters out of strings in AtomSerializer (#1876)

* Fix #1870 - Strip control characters out of strings in AtomSerializer

* Adjust according to comment by @alpaca-tc

8 years agoAdd language detection (#1772)
Eugen [Sun, 16 Apr 2017 18:32:17 +0000 (20:32 +0200)]
Add language detection (#1772)

* 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

8 years agoOnboarding modal (#1883)
Eugen [Sun, 16 Apr 2017 18:32:00 +0000 (20:32 +0200)]
Onboarding modal (#1883)

* 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

8 years agoUpdate node.js and imagemagick (#1951)
Wonderfall [Sun, 16 Apr 2017 18:28:25 +0000 (20:28 +0200)]
Update node.js and imagemagick (#1951)

* update Dockerfile: latest nodejs LTS

* also update imagemagick

8 years agoI18n health warnings (#1949)
Matt Jankowski [Sun, 16 Apr 2017 17:37:01 +0000 (13:37 -0400)]
I18n health warnings (#1949)

* 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

8 years agoFix #1670 - Update OStatus2 gem (#1936)
Eugen [Sun, 16 Apr 2017 17:32:47 +0000 (19:32 +0200)]
Fix #1670 - Update OStatus2 gem (#1936)

8 years agoDisable CodeClimate duplication checks (#1943)
Eugen [Sun, 16 Apr 2017 16:26:46 +0000 (18:26 +0200)]
Disable CodeClimate duplication checks (#1943)

8 years agoFix translation of 'reblogged' in eo.yml (#1942)
oliverkeeble [Sun, 16 Apr 2017 16:11:07 +0000 (17:11 +0100)]
Fix translation of 'reblogged' in eo.yml (#1942)

8 years agoAdd missing keys to PT locale (#1941)
Eduardo Elias [Sun, 16 Apr 2017 16:04:19 +0000 (17:04 +0100)]
Add missing keys to PT locale (#1941)

8 years agoCheck @recipient.user at the first (#1939)
alpaca-tc [Sun, 16 Apr 2017 16:04:05 +0000 (01:04 +0900)]
Check @recipient.user at the first (#1939)

8 years agoFix #1813 - Alleviate extra requests when processing mentions (#1938)
Eugen [Sun, 16 Apr 2017 16:01:48 +0000 (18:01 +0200)]
Fix #1813 - Alleviate extra requests when processing mentions (#1938)

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

8 years agoMerge branch 'master' into fix/cache_blocking
Effy Elden [Sun, 16 Apr 2017 15:41:33 +0000 (01:41 +1000)]
Merge branch 'master' into fix/cache_blocking

8 years agoAdds note for instance admins. (#1925)
Ash Furrow [Sun, 16 Apr 2017 14:59:53 +0000 (10:59 -0400)]
Adds note for instance admins. (#1925)

* Adds note for instance admins.

* Addresses feedback from #1925.

8 years agoAdd README note about tagged releases (#1927)
Eugen [Sun, 16 Apr 2017 14:42:46 +0000 (16:42 +0200)]
Add README note about tagged releases (#1927)

8 years agoClean up check that account needs a webfinger update (#1932)
Matt Jankowski [Sun, 16 Apr 2017 14:38:29 +0000 (10:38 -0400)]
Clean up check that account needs a webfinger update (#1932)

8 years agoRemove trailing whitespace in terms.no.html (#1933)
Matt Jankowski [Sun, 16 Apr 2017 14:38:13 +0000 (10:38 -0400)]
Remove trailing whitespace in terms.no.html (#1933)

8 years agoSimplify the og:image and og:description code in stream_entries/show (#1934)
Matt Jankowski [Sun, 16 Apr 2017 14:38:02 +0000 (10:38 -0400)]
Simplify the og:image and og:description code in stream_entries/show (#1934)

8 years agoUse local vars in partials (#1935)
Matt Jankowski [Sun, 16 Apr 2017 14:37:49 +0000 (10:37 -0400)]
Use local vars in partials (#1935)

* Use local vars in accounts/header partial

* Use local variable in 2fa recovery codes partial

8 years agofix regex filter (#1845)
abcang [Sun, 16 Apr 2017 14:33:38 +0000 (23:33 +0900)]
fix regex filter (#1845)

* fix regex filter

* fixed br to linebreak and, stlip tags.

* change to send raw content

* changed to unescape in reducer

8 years agoRemove .keep in models (#1892)
tackeyy [Sun, 16 Apr 2017 14:28:52 +0000 (23:28 +0900)]
Remove .keep in models (#1892)

8 years agoAdd presence validation to Import (#1928)
alpaca-tc [Sun, 16 Apr 2017 14:28:26 +0000 (23:28 +0900)]
Add presence validation to Import (#1928)

```
*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
```

8 years agoAdd the licence key in package.json (#1914)
Alda Marteau-Hardi [Sun, 16 Apr 2017 14:08:11 +0000 (16:08 +0200)]
Add the licence key in package.json (#1914)

8 years agoFix translation related to "mute" (#1926)
mshrtkch [Sun, 16 Apr 2017 14:07:58 +0000 (23:07 +0900)]
Fix translation related to "mute" (#1926)

8 years agoAdd missing Japanese translations (#1923)
Kazuhiro NISHIYAMA [Sun, 16 Apr 2017 14:07:45 +0000 (23:07 +0900)]
Add missing Japanese translations (#1923)

And `i18n-tasks add-missing -l ja` changes some quotes.

8 years agoRelax Ruby version requirement (#1901)
Akihiko Odaki [Sun, 16 Apr 2017 12:57:30 +0000 (21:57 +0900)]
Relax Ruby version requirement (#1901)

8 years agoImprove PT locale on simple_form (#1917)
Eduardo Elias [Sun, 16 Apr 2017 12:56:04 +0000 (13:56 +0100)]
Improve PT locale on simple_form (#1917)

* Improve PT locale on simple_form

* Add missing keys to PT locale

8 years agoFixed NoMethodError in UnfollowService (#1918)
alpaca-tc [Sun, 16 Apr 2017 12:55:43 +0000 (21:55 +0900)]
Fixed NoMethodError in UnfollowService (#1918)

8 years agoFix yaml issue in ja locale (#1916)
Matt Jankowski [Sun, 16 Apr 2017 12:55:04 +0000 (08:55 -0400)]
Fix yaml issue in ja locale (#1916)

* Fix yaml parse issue in ja.yml locale

* Fix issue in locales/ja.jsx

8 years agoSyntax error in japanese localisation (#1920)
Naouak [Sun, 16 Apr 2017 12:54:09 +0000 (14:54 +0200)]
Syntax error in japanese localisation (#1920)

assets:precompile was failling because of this missing comma.

8 years agoAdd missing french translation. (#1906)
Erwan Leboucher [Sun, 16 Apr 2017 12:15:03 +0000 (14:15 +0200)]
Add missing french translation. (#1906)

* Add missing french translation.

Causing this error:
[React Intl] Missing message: "navigation_bar.mutes" for locale: "fr",

* Update fr.jsx

8 years agoEnlarge font size to avoid autozooming of iPhone. (#1911)
Yuki Nakagawa [Sun, 16 Apr 2017 12:05:16 +0000 (21:05 +0900)]
Enlarge font size to avoid autozooming of iPhone. (#1911)

8 years agoImprove Japanese translation (#1909)
George Hattori [Sun, 16 Apr 2017 11:44:57 +0000 (20:44 +0900)]
Improve Japanese translation (#1909)

8 years agoAdd binstub for rspec from rspec-core (#1913)
Matt Jankowski [Sun, 16 Apr 2017 11:42:45 +0000 (07:42 -0400)]
Add binstub for rspec from rspec-core (#1913)

8 years agoUpdate Japanese Translate (#1903)
新都心(Neet Shin) [Sun, 16 Apr 2017 11:42:16 +0000 (17:12 +0530)]
Update Japanese Translate (#1903)

* [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

8 years agoUnite all mandatory rake tasks in mastodon:daily (#1887)
Eugen [Sun, 16 Apr 2017 10:53:58 +0000 (12:53 +0200)]
Unite all mandatory rake tasks in mastodon:daily (#1887)

* 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

8 years agolock capistrano to 3.8.0 (#1890)
Alex Dunn [Sun, 16 Apr 2017 10:52:18 +0000 (03:52 -0700)]
lock capistrano to 3.8.0 (#1890)

8 years agoMake file attachment on MediaAttachment optional (#1865)
Eugen [Sun, 16 Apr 2017 10:51:30 +0000 (12:51 +0200)]
Make file attachment on MediaAttachment optional (#1865)

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

8 years agocache blockings for reducing queries.
Keiji Yoshimi [Sat, 15 Apr 2017 14:59:39 +0000 (23:59 +0900)]
cache blockings for reducing queries.

8 years agoFix up recovery codes design a little (#1866)
Eugen [Sun, 16 Apr 2017 02:32:57 +0000 (04:32 +0200)]
Fix up recovery codes design a little (#1866)

8 years agoRemove unused gem: coffee-rails (#1885)
luigi [Sun, 16 Apr 2017 02:02:29 +0000 (04:02 +0200)]
Remove unused gem: coffee-rails (#1885)

8 years agoLeave out the "Expires" header from S3 uploads (#1886)
Joachim Viide [Sun, 16 Apr 2017 02:01:58 +0000 (05:01 +0300)]
Leave out the "Expires" header from S3 uploads (#1886)

8 years agocapistrano: allow overriding repo_url and branch (#1889)
Alex Dunn [Sun, 16 Apr 2017 02:01:27 +0000 (19:01 -0700)]
capistrano: allow overriding repo_url and branch (#1889)

8 years agoView spec fix (#1888)
Matt Jankowski [Sun, 16 Apr 2017 01:40:33 +0000 (21:40 -0400)]
View spec fix (#1888)

* Add option to disable verify partial doubles

* Add show_landing_strip? helper method

* Use show_landing_strip? helper in accounts and stream entries views

* Fix naming in view specs

8 years agoFix #1852 - Ensure feeds have valid <title> tags (#1875)
Eugen [Sun, 16 Apr 2017 00:40:36 +0000 (02:40 +0200)]
Fix #1852 - Ensure feeds have valid <title> tags (#1875)

8 years agoShow error message if video cannot be loaded (#1879)
Isabelle Knott [Sat, 15 Apr 2017 23:12:47 +0000 (19:12 -0400)]
Show error message if video cannot be loaded (#1879)

8 years agoRemoved Heroku in-process spawning. (#1873)
Ash Furrow [Sat, 15 Apr 2017 21:02:13 +0000 (17:02 -0400)]
Removed Heroku in-process spawning. (#1873)

8 years agoIndicate when a toot is part of a chain with a "reply all" icon (#1869)
Eugen [Sat, 15 Apr 2017 20:48:41 +0000 (22:48 +0200)]
Indicate when a toot is part of a chain with a "reply all" icon (#1869)

8 years agoFix cross-origin integrity (#1871)
Eugen [Sat, 15 Apr 2017 20:48:30 +0000 (22:48 +0200)]
Fix cross-origin integrity (#1871)

See <https://glitch.social/users/bea/updates/434>

8 years agoEnglish localization for mention notification was missing (#1867)
Eugen [Sat, 15 Apr 2017 20:48:17 +0000 (22:48 +0200)]
English localization for mention notification was missing (#1867)

8 years agoCheck for a custom css file to help customization of instances (#1368)
Naouak [Sat, 15 Apr 2017 20:47:48 +0000 (22:47 +0200)]
Check for a custom css file to help customization of instances (#1368)

* User can create a custom.scss to customize their instance without modifying gitted files.

* Add documentation for customization.

* Forgot the helper file

* Fix Style to pass codeclimate

* Requests from maintainer.

8 years agoMake the rake mastodon:users:clear task properly clear out unconfirmed users (#1777)
Eugen [Sat, 15 Apr 2017 19:55:28 +0000 (21:55 +0200)]
Make the rake mastodon:users:clear task properly clear out unconfirmed users (#1777)

Before it cleared out user records only (e-mail, password) without
freeing up the associated username (account record). Furthermore, since
these records have no dependent records (due to no user activity)
they can be deleted quickly with delete_all instead of destroy

8 years agoActiveRecord::NotFound is not defined (#1864)
alpaca-tc [Sat, 15 Apr 2017 19:17:59 +0000 (04:17 +0900)]
ActiveRecord::NotFound is not defined (#1864)