]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoRemove react-sizeme (#5143)
Nolan Lawson [Fri, 29 Sep 2017 20:46:43 +0000 (13:46 -0700)]
Remove react-sizeme (#5143)

* Remove react-sizeme

* Fix aspect ratio in "sensitive" mode

8 years agoUpdated German translation (#5151)
Jakob Kramer [Fri, 29 Sep 2017 19:11:28 +0000 (21:11 +0200)]
Updated German translation (#5151)

Translate "about" page, several settings pages, data export/import,
sessions overview, authorized followers page, account deletion page.

More consistent use of words:
- A toot is a Beitrag.
- An account is a Konto.

Some small improvements.

8 years agoBetter Japanese translations (#5142)
Yanaken [Fri, 29 Sep 2017 04:27:31 +0000 (13:27 +0900)]
Better Japanese translations (#5142)

8 years agoReplace self-rolled statsd instrumention with localshred/nsa (#5118)
Eugen Rochko [Fri, 29 Sep 2017 01:16:44 +0000 (03:16 +0200)]
Replace self-rolled statsd instrumention with localshred/nsa (#5118)

8 years agoAfter 7 days of repeated delivery failures, give up on inbox (#5131)
Eugen Rochko [Fri, 29 Sep 2017 01:16:20 +0000 (03:16 +0200)]
After 7 days of repeated delivery failures, give up on inbox (#5131)

- A successful delivery cancels it out
- An incoming delivery from account of the inbox cancels it out

8 years agoRemove dependency on db during assets:precompile (#5138)
Eugen Rochko [Fri, 29 Sep 2017 01:03:03 +0000 (03:03 +0200)]
Remove dependency on db during assets:precompile (#5138)

8 years agoIncrease attachment descriptions to 420 characters (#5139)
Eugen Rochko [Fri, 29 Sep 2017 00:30:00 +0000 (02:30 +0200)]
Increase attachment descriptions to 420 characters (#5139)

Blaze it

8 years agoChange max redirects followed to 2 (#5136)
Eugen Rochko [Thu, 28 Sep 2017 21:20:08 +0000 (23:20 +0200)]
Change max redirects followed to 2 (#5136)

I see no reason to allow more than that. Usually a redirect is
HTTP->HTTPS, then maybe URL structure changed, but more than that
is highly unlikely to be a legitimate use case.

8 years agoUpdate German translation (#5133)
Jakob Kramer [Thu, 28 Sep 2017 18:45:09 +0000 (20:45 +0200)]
Update German translation (#5133)

Create activerecord.de.yml (50%)
Update devise.de.yml
Update doorkeeper.de.yml (100%)
Update simple_form.de.yml (100%)

8 years agoImprove performance of modal and swipe animations (#5135)
Nolan Lawson [Thu, 28 Sep 2017 18:43:18 +0000 (11:43 -0700)]
Improve performance of modal and swipe animations (#5135)

* Improve performance of modal and swipe animations

* Fix eslint issues

8 years agoOC 500 error (#5110)
JeanGauthier [Thu, 28 Sep 2017 18:22:34 +0000 (20:22 +0200)]
OC 500 error (#5110)

8 years agoIf HTTP signature is wrong and webfinger cache is stale, retry with resolve (#5129)
Eugen Rochko [Thu, 28 Sep 2017 15:50:14 +0000 (17:50 +0200)]
If HTTP signature is wrong and webfinger cache is stale, retry with resolve (#5129)

If the signature could not be verified and the webfinger of the account
was last retrieved longer than the cache period, try re-resolving the
account and then attempting to verify the signature again

8 years agoUpdated German translation (#5132)
Jakob Kramer [Thu, 28 Sep 2017 15:38:39 +0000 (17:38 +0200)]
Updated German translation (#5132)

8 years agoAdd ability to specify alternative text for media attachments (#5123)
Eugen Rochko [Thu, 28 Sep 2017 13:31:31 +0000 (15:31 +0200)]
Add ability to specify alternative text for media attachments (#5123)

* Fix #117 - Add ability to specify alternative text for media attachments

- POST /api/v1/media accepts `description` straight away
- PUT /api/v1/media/:id to update `description` (only for unattached ones)
- Serialized as `name` of Document object in ActivityPub
- Uploads form adjusted for better performance and description input

* Add tests

* Change undo button blend mode to difference

8 years agoFlush body when POST requests (#5128)
abcang [Thu, 28 Sep 2017 13:04:32 +0000 (22:04 +0900)]
Flush body when POST requests (#5128)

8 years agoUpdate Yarn to version 1.1.0 (#5125)
Yamagishi Kazutoshi [Thu, 28 Sep 2017 02:51:36 +0000 (11:51 +0900)]
Update Yarn to version 1.1.0 (#5125)

* Update Yarn to version 1.1.0

* remove hard-coding

8 years agoRemove web UI warnings about OStatus privacy (#5102)
Eugen Rochko [Wed, 27 Sep 2017 22:26:33 +0000 (00:26 +0200)]
Remove web UI warnings about OStatus privacy (#5102)

* Remove web UI warnings about OStatus privacy

* yarn run manage:translations

8 years agoWhen OAuth password verification fails, return 401 instead of redirect (#5111)
Eugen Rochko [Wed, 27 Sep 2017 21:42:49 +0000 (23:42 +0200)]
When OAuth password verification fails, return 401 instead of redirect (#5111)

Call to warden.authenticate! in resource_owner_from_credentials would
make the request redirect to sign-in path, which is a bad response for
apps. Now bad credentials just return nil, which leads to HTTP 401
from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into
this way.

8 years agoUpgrade Webpacker to version 3.0.1 (#5122)
Yamagishi Kazutoshi [Wed, 27 Sep 2017 12:41:54 +0000 (21:41 +0900)]
Upgrade Webpacker to version 3.0.1 (#5122)

8 years agoFix empty query sent to postgres for custom emojis (#5121)
Eugen Rochko [Wed, 27 Sep 2017 02:14:03 +0000 (04:14 +0200)]
Fix empty query sent to postgres for custom emojis (#5121)

8 years agoUpdate brakeman to 3.0 and bundler-audit to 0.6 (#5117)
Eugen Rochko [Wed, 27 Sep 2017 01:13:09 +0000 (03:13 +0200)]
Update brakeman to 3.0 and bundler-audit to 0.6 (#5117)

8 years agoRefactor 500 file generation for future extension (#5105)
nullkal [Tue, 26 Sep 2017 09:55:33 +0000 (18:55 +0900)]
Refactor 500 file generation for future extension (#5105)

8 years agoi18n: Update Polish translation (#5106)
m4sk1n [Tue, 26 Sep 2017 05:19:25 +0000 (07:19 +0200)]
i18n: Update Polish translation (#5106)

* i18n: Update Polish translation

* i18n: Update Polish translation

8 years agoFollow-up to #4582 and #5027, removing dead code (#5101)
Eugen Rochko [Mon, 25 Sep 2017 23:06:27 +0000 (01:06 +0200)]
Follow-up to #4582 and #5027, removing dead code (#5101)

8 years agoFix #5059 - Stop processing payload if it's from local account (#5100)
Eugen Rochko [Mon, 25 Sep 2017 23:06:13 +0000 (01:06 +0200)]
Fix #5059 - Stop processing payload if it's from local account (#5100)

8 years agoSend streaming API delete to people mentioned in status (#5103)
Eugen Rochko [Mon, 25 Sep 2017 22:29:29 +0000 (00:29 +0200)]
Send streaming API delete to people mentioned in status (#5103)

- Previously they wouldn't receive it unless they were author's
  followers
- Skip unpush from public/hashtag timelines if status wasn't
  public in the first place

8 years agoNew error page graphic. Other error page improvements (#5099)
Eugen Rochko [Mon, 25 Sep 2017 21:05:54 +0000 (23:05 +0200)]
New error page graphic. Other error page improvements (#5099)

- 500.html generated with admin-set default locale if set
- Error page `<title>` includes Mastodon site title
- 500 title changed to "This page is not
  correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>)
- 500 content appended with "on our end" to make clear it's
  not user's fault

8 years agoFix size of single media in media-gallery (#5098)
Lynx Kotoura [Mon, 25 Sep 2017 18:26:50 +0000 (03:26 +0900)]
Fix size of single media in media-gallery (#5098)

8 years agoFix emojify() by generating a mapping to existing Twemoji files (#5080)
Eugen Rochko [Mon, 25 Sep 2017 16:36:33 +0000 (18:36 +0200)]
Fix emojify() by generating a mapping to existing Twemoji files (#5080)

A new rake task emojis:generate downloads a full list of valid
unicode sequences from unicode.org and checks it against existing
Twemoji files, finally generating a map from each sequence to the
existing file (e.g. when there's multiple ways an emoji can be
expressed). The map is dumped into app/javascript/mastodon/emoji_map.json

That file is loaded by emojione_light.js (now a misnomer) which
decorates it further with shortcodes taken from emoji-mart's index.

8 years agoAdd missing validations in ActivityPub::Activity::Create (#5096)
Akihiko Odaki [Mon, 25 Sep 2017 16:33:11 +0000 (01:33 +0900)]
Add missing validations in ActivityPub::Activity::Create (#5096)

8 years agoIncrease max height of preview card image (#5092)
unarist [Mon, 25 Sep 2017 15:10:49 +0000 (00:10 +0900)]
Increase max height of preview card image (#5092)

We added horizontal layout to preview card for wide image. However, max height of the thumbnail is still limited to 120px and it makes nearly square images to too small for that layout.

This PR increases max height as well as max width.

8 years agoRefresh manifest before generate 500.html (#5090)
Yamagishi Kazutoshi [Mon, 25 Sep 2017 14:58:12 +0000 (23:58 +0900)]
Refresh manifest before generate 500.html (#5090)

8 years agoGenerate 500.html with assets:precompile, remove loading from Google Fonts (#5067)
Eugen Rochko [Mon, 25 Sep 2017 02:04:04 +0000 (04:04 +0200)]
Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)

8 years agoAdd strong_migrations gem to warn when creating unsafe migrations (#5078)
Eugen Rochko [Mon, 25 Sep 2017 00:11:14 +0000 (02:11 +0200)]
Add strong_migrations gem to warn when creating unsafe migrations (#5078)

8 years agoFix streaming API double-JSON-encoding status IDs for deletes (#5069)
Eugen Rochko [Sun, 24 Sep 2017 13:31:03 +0000 (15:31 +0200)]
Fix streaming API double-JSON-encoding status IDs for deletes (#5069)

8 years agoOC update: different emoji picker (#5046) (#5077)
JeanGauthier [Sun, 24 Sep 2017 10:17:47 +0000 (12:17 +0200)]
OC update: different emoji picker (#5046) (#5077)

8 years agoThread toot notification mails by conversation (#5061)
ThibG [Sun, 24 Sep 2017 09:19:42 +0000 (11:19 +0200)]
Thread toot notification mails by conversation (#5061)

* Thread toot notification mails by conversation

* Make codeclimate happy and avoid potential mis-threading

8 years agoCompact status_ids in StatusRelationshipsPresenter (#5073)
Daigo 3 Dango [Sun, 24 Sep 2017 09:18:32 +0000 (23:18 -1000)]
Compact status_ids in StatusRelationshipsPresenter (#5073)

8 years agoFix media spoiler of DetailedStatus (#5071)
abcang [Sun, 24 Sep 2017 09:15:11 +0000 (18:15 +0900)]
Fix media spoiler of DetailedStatus (#5071)

8 years agoSuppress backtrace when failed to communicate with a remote instance (#5076)
Daigo 3 Dango [Sun, 24 Sep 2017 09:14:06 +0000 (23:14 -1000)]
Suppress backtrace when failed to communicate with a remote instance (#5076)

8 years agoIn detail status view, display attachment uncropped if there's only one (#5054)
Eugen Rochko [Sun, 24 Sep 2017 03:58:30 +0000 (05:58 +0200)]
In detail status view, display attachment uncropped if there's only one (#5054)

* In detail status view, display attachment uncropped if there's only one

* Make media spoiler the size of the media it hides, enable on static

8 years agoForgotten in #5039, change statuses_tags tag_id to bigint (#5070)
Eugen Rochko [Sun, 24 Sep 2017 03:58:07 +0000 (05:58 +0200)]
Forgotten in #5039, change statuses_tags tag_id to bigint (#5070)

8 years agoMake sure nil IDs to not get cast to empty string in REST API (#5068)
Eugen Rochko [Sun, 24 Sep 2017 02:09:32 +0000 (04:09 +0200)]
Make sure nil IDs to not get cast to empty string in REST API (#5068)

8 years agoChange mobile layout breakpoint from 1024px to 630px (#5063)
Eugen Rochko [Sat, 23 Sep 2017 23:25:07 +0000 (01:25 +0200)]
Change mobile layout breakpoint from 1024px to 630px (#5063)

630px = Drawer + 1 Column

8 years agoDropdown triangles a bit nicer, smoother scrolling on touch (#5062)
Eugen Rochko [Sat, 23 Sep 2017 22:40:10 +0000 (00:40 +0200)]
Dropdown triangles a bit nicer, smoother scrolling on touch (#5062)

8 years agoFix media gallery CSS (#5064)
Eugen Rochko [Sat, 23 Sep 2017 22:33:26 +0000 (00:33 +0200)]
Fix media gallery CSS (#5064)

8 years agoRequire at least 2 characters before showing autosuggestions (#5065)
Eugen Rochko [Sat, 23 Sep 2017 22:33:17 +0000 (00:33 +0200)]
Require at least 2 characters before showing autosuggestions (#5065)

8 years agojsx/zh-*: Fix "pin column" for Chinese (#5060)
Mingye Wang [Sat, 23 Sep 2017 20:47:15 +0000 (16:47 -0400)]
jsx/zh-*: Fix "pin column" for Chinese (#5060)

8 years agoi18n: Update Polish translation (#5058)
m4sk1n [Sat, 23 Sep 2017 20:14:39 +0000 (22:14 +0200)]
i18n: Update Polish translation (#5058)

8 years agoFix overflowing tabs in account__action-bar (#5056)
Lynx Kotoura [Sat, 23 Sep 2017 19:06:16 +0000 (04:06 +0900)]
Fix overflowing tabs in account__action-bar (#5056)

* Fix numbers in accounts columns

* Support edge compact-header

8 years agoAdd emoji autosuggest (#5053)
Eugen Rochko [Sat, 23 Sep 2017 12:47:32 +0000 (14:47 +0200)]
Add emoji autosuggest (#5053)

* Add emoji autosuggest

Some credit goes to glitch-soc/mastodon#149

* Remove server-side shortcode->unicode conversion

* Insert shortcode when suggestion is custom emoji

* Remove remnant of server-side emojis

* Update style of autosuggestions

* Fix wrong emoji filenames generated in autosuggest item

* Do not lazy load emoji picker, as that no longer works

* Fix custom emoji autosuggest

* Fix multiple "Custom" categories getting added to emoji index, only add once

8 years agoAdd custom emojis to the emoji picker (#5052)
Eugen Rochko [Sat, 23 Sep 2017 03:40:28 +0000 (05:40 +0200)]
Add custom emojis to the emoji picker (#5052)

8 years agoNew API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
Eugen Rochko [Fri, 22 Sep 2017 23:57:23 +0000 (01:57 +0200)]
New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)

8 years agoFix custom emojis not detected when used in content warning (#5049)
Eugen Rochko [Fri, 22 Sep 2017 23:50:17 +0000 (01:50 +0200)]
Fix custom emojis not detected when used in content warning (#5049)

8 years agoSwitch from EmojiOne to Twemoji, different emoji picker (#5046)
Eugen Rochko [Fri, 22 Sep 2017 23:41:00 +0000 (01:41 +0200)]
Switch from EmojiOne to Twemoji, different emoji picker (#5046)

* Switch from EmojiOne to Twemoji, different emoji picker

* Make emoji-mart use a local spritesheet

* Fix emojify test

* yarn manage:translations

8 years agoDo not filter statuses with unknown languages (#5045)
Akihiko Odaki [Fri, 22 Sep 2017 17:33:17 +0000 (02:33 +0900)]
Do not filter statuses with unknown languages (#5045)

8 years agoFix the migration error when deprecated_preview_cards has been deleted (#5043)
nullkal [Fri, 22 Sep 2017 17:32:57 +0000 (02:32 +0900)]
Fix the migration error when deprecated_preview_cards has been deleted (#5043)

* Fix the migration error when deprecated_preview_cards has deleted

* Re-run Travis CI

8 years agoFix PropTypes.oneOfType() warning (#5041)
Nolan Lawson [Fri, 22 Sep 2017 15:50:29 +0000 (08:50 -0700)]
Fix PropTypes.oneOfType() warning (#5041)

8 years agoHardcode IdToBigints migration columns (#5039)
aschmitz [Fri, 22 Sep 2017 11:20:04 +0000 (06:20 -0500)]
Hardcode IdToBigints migration columns (#5039)

This addresses a comment during review:
https://github.com/tootsuite/mastodon/pull/4801#discussion_r139337452

This means we'll need to make sure that all _id columns going forward
are bigints, but that should happen automatically in most cases.

8 years agoDocument REDIS_NAMESPACE (#5038)
Nolan Lawson [Fri, 22 Sep 2017 04:44:39 +0000 (21:44 -0700)]
Document REDIS_NAMESPACE (#5038)

8 years agoMake dropdowns render into portal, expand animation (#5018)
Eugen Rochko [Fri, 22 Sep 2017 02:59:17 +0000 (04:59 +0200)]
Make dropdowns render into portal, expand animation (#5018)

* Make dropdowns render into portal, expand animation

* Improve actions modal style

8 years agoUse passive listener in privacy_dropdown.js (#5037)
Nolan Lawson [Fri, 22 Sep 2017 02:59:01 +0000 (19:59 -0700)]
Use passive listener in privacy_dropdown.js (#5037)

8 years agoEliminate re-renders for intersection_observer_article.js (#5036)
Nolan Lawson [Fri, 22 Sep 2017 02:58:33 +0000 (19:58 -0700)]
Eliminate re-renders for intersection_observer_article.js (#5036)

8 years agofix : mobile style of /about/more (#5034)
syui [Thu, 21 Sep 2017 12:30:21 +0000 (21:30 +0900)]
fix : mobile style of /about/more (#5034)

8 years agoFix shortname problem in emojify() (regression from #5016) (#5032)
MIYAGI Hikaru [Thu, 21 Sep 2017 01:47:16 +0000 (01:47 +0000)]
Fix shortname problem in emojify() (regression from #5016) (#5032)

When colon appears end of line, skiped all character containing unicode emojis. Fixed.
https://github.com/tootsuite/mastodon/pull/5016#issuecomment-331012008

8 years agoReduce wasted renders for column_loading.js (#5021)
Nolan Lawson [Wed, 20 Sep 2017 17:58:44 +0000 (10:58 -0700)]
Reduce wasted renders for column_loading.js (#5021)

* Reduce wasted renders for column_loading.js

* Use defaultProps

8 years agoFix theme translations alphabetically (#5031)
Lynx Kotoura [Wed, 20 Sep 2017 17:41:35 +0000 (02:41 +0900)]
Fix theme translations alphabetically (#5031)

8 years agoDisable private status federation over OStatus (#5027)
Eugen Rochko [Wed, 20 Sep 2017 17:08:20 +0000 (19:08 +0200)]
Disable private status federation over OStatus (#5027)

8 years agoUse file extensions in addition to MIME types for file picker (#5029)
unarist [Wed, 20 Sep 2017 17:07:23 +0000 (02:07 +0900)]
Use file extensions in addition to MIME types for file picker (#5029)

Currently we're using a list of MIME types for `accept` attribute on `input[type="file"]` for filter options of file picker, and actual file extensions will be infered by browsers. However, infered extensions may not include our expected items. For example, "image/jpeg" seems to be infered to
only ".jfif" extension in Firefox.

To ensure common file extensions are in the list, this PR adds file extensions in addition to MIME types. Also having items in both format is encouraged by HTML5 spec.

https://www.w3.org/TR/html5/forms.html#file-upload-state-(type=file)

8 years agoBetter Japanese translations (#5030)
Lynx Kotoura [Wed, 20 Sep 2017 16:56:28 +0000 (01:56 +0900)]
Better Japanese translations (#5030)

8 years agoAdd Japanese translations for multiple themes, custom emoji (#5026)
mayaeh [Wed, 20 Sep 2017 14:09:57 +0000 (23:09 +0900)]
Add Japanese translations for multiple themes, custom emoji (#5026)

* Add Japanese translations for multiple themes

* Change Japanese translation for custom emoji's created_msg.

8 years agoRemove unnecessary css property (#5025)
TomoyaShibata [Wed, 20 Sep 2017 13:26:22 +0000 (22:26 +0900)]
Remove unnecessary css property (#5025)

8 years agol10n Occitan: theme site, custom emoji, Oauth, newcomers follow admins, ... (#5023)
JeanGauthier [Wed, 20 Sep 2017 13:00:54 +0000 (15:00 +0200)]
l10n Occitan: theme site, custom emoji, Oauth, newcomers follow admins, ... (#5023)

* Oauto code string

* Theme, custom emoji and more

* Site theme

* added two spaces wierdly gone away

* Update oc.yml

Changes adviced

8 years agoAdd japanese translations for custom emoji. (#5007)
mayaeh [Wed, 20 Sep 2017 12:57:59 +0000 (21:57 +0900)]
Add japanese translations for custom emoji. (#5007)

* Add japanese translations for custom emoji.

* Remove spaces.

* Change destroyed_msg.

* Revert "Change destroyed_msg."

8 years agoChange IDs to strings rather than numbers in API JSON output (#5019)
aschmitz [Wed, 20 Sep 2017 12:53:48 +0000 (07:53 -0500)]
Change IDs to strings rather than numbers in API JSON output (#5019)

* Fix JavaScript interface with long IDs

Somewhat predictably, the JS interface handled IDs as numbers, which in
JS are IEEE double-precision floats. This loses some precision when
working with numbers as large as those generated by the new ID scheme,
so we instead handle them here as strings. This is relatively simple,
and doesn't appear to have caused any problems, but should definitely
be tested more thoroughly than the built-in tests. Several days of use
appear to support this working properly.

BREAKING CHANGE:

The major(!) change here is that IDs are now returned as strings by the
REST endpoints, rather than as integers. In practice, relatively few
changes were required to make the existing JS UI work with this change,
but it will likely hit API clients pretty hard: it's an entirely
different type to consume. (The one API client I tested, Tusky, handles
this with no problems, however.)

Twitter ran into this issue when introducing Snowflake IDs, and decided
to instead introduce an `id_str` field in JSON responses. I have opted
to *not* do that, and instead force all IDs to 64-bit integers
represented by strings in one go. (I believe Twitter exacerbated their
problem by rolling out the changes three times: once for statuses, once
for DMs, and once for user IDs, as well as by leaving an integer ID
value in JSON. As they said, "If you’re using the `id` field with JSON
in a Javascript-related language, there is a very high likelihood that
the integers will be silently munged by Javascript interpreters. In most
cases, this will result in behavior such as being unable to load or
delete a specific direct message, because the ID you're sending to the
API is different than the actual identifier associated with the
message." [1]) However, given that this is a significant change for API
users, alternatives or a transition time may be appropriate.

1: https://blog.twitter.com/developer/en_us/a/2011/direct-messages-going-snowflake-on-sep-30-2011.html

* Additional fixes for stringified IDs in JSON

These should be the last two. These were identified using eslint to try
to identify any plain casts to JavaScript numbers. (Some such casts are
legitimate, but these were not.)

Adding the following to .eslintrc.yml will identify casts to numbers:

~~~
  no-restricted-syntax:
  - warn
  - selector: UnaryExpression[operator='+'] > :not(Literal)
    message: Avoid the use of unary +
  - selector: CallExpression[callee.name='Number']
    message: Casting with Number() may coerce string IDs to numbers
~~~

The remaining three casts appear legitimate: two casts to array indices,
one in a server to turn an environment variable into a number.

* Back out RelationshipsController Change

This was made to make a test a bit less flakey, but has nothing to
do with this branch.

* Change internal streaming payloads to stringified IDs as well

Per
https://github.com/tootsuite/mastodon/pull/5019#issuecomment-330736452
we need these changes to send deleted status IDs as strings, not
integers.

8 years agoFix custom emojis with non-1:1 aspect ratio being stretched (#5017)
Eugen Rochko [Wed, 20 Sep 2017 01:38:38 +0000 (03:38 +0200)]
Fix custom emojis with non-1:1 aspect ratio being stretched (#5017)

8 years agoredo #4500 with customEmojis (#5016)
MIYAGI Hikaru [Tue, 19 Sep 2017 21:27:29 +0000 (21:27 +0000)]
redo #4500 with customEmojis (#5016)

8 years agoi18n: Update Polish translation (#5015)
m4sk1n [Tue, 19 Sep 2017 21:25:17 +0000 (23:25 +0200)]
i18n: Update Polish translation (#5015)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoFix race condition when processing incoming OStatus messages (#5013)
ThibG [Tue, 19 Sep 2017 19:44:18 +0000 (21:44 +0200)]
Fix race condition when processing incoming OStatus messages (#5013)

* Avoid races in incoming OStatus toots processing

* oops

* oops again

8 years agoIntroduce OStatus::TagManager (#5008)
Akihiko Odaki [Tue, 19 Sep 2017 16:08:08 +0000 (01:08 +0900)]
Introduce OStatus::TagManager (#5008)

8 years agoFix non-local statuses are html_encoded in public_page. (#5012)
Naoki Kosaka [Tue, 19 Sep 2017 15:55:48 +0000 (00:55 +0900)]
Fix non-local statuses are html_encoded in public_page. (#5012)

8 years agoSet touchstart listener to 'passive', remove 'once' (#5011)
Nolan Lawson [Tue, 19 Sep 2017 15:00:29 +0000 (08:00 -0700)]
Set touchstart listener to 'passive', remove 'once' (#5011)

8 years agoUse OrderedCollectionPage to return followers/following list (#4949)
nullkal [Tue, 19 Sep 2017 14:37:06 +0000 (23:37 +0900)]
Use OrderedCollectionPage to return followers/following list (#4949)

8 years agoAdd support for multiple themes (#4959)
Andrew [Tue, 19 Sep 2017 14:36:23 +0000 (07:36 -0700)]
Add support for multiple themes (#4959)

* Add support for selecting a theme

* Fix codeclimate issues

* Look up site default style if current user is not available due to e.g. not being logged in

* Remove outdated comment in common.js

* Address requested changes in themes PR

* Fix codeclimate issues

* Explicitly check current_account in application controller and only check theme availability if non-nil

* codeclimate

* explicit precedence with &&

* Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml

* codeclimate: indentation + return

8 years agoHide sensitive image in default on the public pages (#5009)
unarist [Tue, 19 Sep 2017 14:03:45 +0000 (23:03 +0900)]
Hide sensitive image in default on the public pages (#5009)

Additionally, this restores previous background / text color for media spoiler.

8 years agoFix incomplete account records being read (#4998)
Eugen Rochko [Tue, 19 Sep 2017 04:53:16 +0000 (06:53 +0200)]
Fix incomplete account records being read (#4998)

* Fix incomplete account records being read

- Put account processing into redis lock
- Do not save until record is complete

* Fix spaces

8 years agoRemove ubuntu-toolchain-r-test (#5005)
Akihiko Odaki [Tue, 19 Sep 2017 03:06:27 +0000 (12:06 +0900)]
Remove ubuntu-toolchain-r-test (#5005)

8 years agoFix custom emojis index (#5006)
Yamagishi Kazutoshi [Tue, 19 Sep 2017 03:06:13 +0000 (12:06 +0900)]
Fix custom emojis index (#5006)

8 years agoDefine emoji context for ActivityPub (#5004)
Eugen Rochko [Tue, 19 Sep 2017 03:05:48 +0000 (05:05 +0200)]
Define emoji context for ActivityPub (#5004)

* Define emoji context for ActivityPub

* Fix the emojo

* Use general Mastodon context instead

8 years agoAdmin interface for listing, adding and removing custom emojis (#5002)
Eugen Rochko [Tue, 19 Sep 2017 01:52:38 +0000 (03:52 +0200)]
Admin interface for listing, adding and removing custom emojis (#5002)

* Admin interface for listing, adding and removing custom emojis

* Only display local ones in the list

8 years agoRun i18n-tasks normalize (#5003)
Eugen Rochko [Tue, 19 Sep 2017 01:27:08 +0000 (03:27 +0200)]
Run i18n-tasks normalize (#5003)

8 years agoCustom emoji (#4988)
Eugen Rochko [Tue, 19 Sep 2017 00:42:40 +0000 (02:42 +0200)]
Custom emoji (#4988)

* Custom emoji

- In OStatus: `<link rel="emoji" name="coolcat" href="http://..." />`
- In ActivityPub: `{ type: "Emoji", name: ":coolcat:", href: "http://..." }`
- In REST API: Status object includes `emojis` array (`shortcode`, `url`)
- Domain blocks with reject media stop emojis
- Emoji file up to 50KB
- Web UI handles custom emojis
- Static pages render custom emojis as `<img />` tags

Side effects:

- Undo #4500 optimization, as I needed to modify it to restore
  shortcode handling in emojify()
- Formatter#plaintext should now make sure stripped out line-breaks
  and paragraphs are replaced with newlines

* Fix emoji at the start not being converted

8 years agoA few updates to the Spanish translation and some typos fixing (#4997)
BruWalfas [Mon, 18 Sep 2017 22:47:48 +0000 (19:47 -0300)]
A few updates to the Spanish translation and some typos fixing (#4997)

* So Spanish. Much changes. Wow.

* Some little fixes

* Updated es.yml, and fixed some ortographical errors

* Some little changes to simple_form.es.yml

* Yeah, so much translations

* Spanish e-mail messages

* Remove unused message

8 years agoAdd will-change to improve scrolling perf (#5001)
Nolan Lawson [Mon, 18 Sep 2017 21:29:15 +0000 (14:29 -0700)]
Add will-change to improve scrolling perf (#5001)

8 years agoRe-allow underscore on valid_url_path_ending_chars (#4999)
unarist [Mon, 18 Sep 2017 19:25:40 +0000 (04:25 +0900)]
Re-allow underscore on valid_url_path_ending_chars (#4999)

Limiting allowed characters in the last character of the URL is came from twitter-text, but underscore is allowed on there, and Mastodon before #4941.

8 years agoAdd published property to ActivityPub activity for reblogs (#5000)
unarist [Mon, 18 Sep 2017 18:30:11 +0000 (03:30 +0900)]
Add published property to ActivityPub activity for reblogs (#5000)

Since reblogs are serialized as Announce activity, its published property can be used for the creation time of reblog.

8 years agoDo not add image size without meta to OGP (regression from #4901) (#4995)
Yamagishi Kazutoshi [Mon, 18 Sep 2017 13:00:29 +0000 (22:00 +0900)]
Do not add image size without meta to OGP (regression from #4901) (#4995)

8 years agoUse Account.local.sum(statuses_count) instead of Status.local.count (#4996)
Akihiko Odaki [Mon, 18 Sep 2017 12:59:57 +0000 (21:59 +0900)]
Use Account.local.sum(statuses_count) instead of Status.local.count (#4996)

It is faster.

8 years agoBump ruby version to 2.4.2 (#4958)
Daigo 3 Dango [Mon, 18 Sep 2017 02:55:57 +0000 (16:55 -1000)]
Bump ruby version to 2.4.2 (#4958)

* Bump ruby version to 2.4.2

https://www.ruby-lang.org/en/news/2017/09/14/ruby-2-4-2-released/

Gemfile.lock is also updated.

TODO
- [ ] Update Dockerfile with Alpine release of ruby-2.4.2

* Revert jwt version

It seems that jwt 2.0.0 fails in some environment.
ref. https://github.com/zaru/webpush/issues/42

* Bump Ruby version on docker image

8 years agoAdd `strip_insignificant_zeros: true` option to `number_to_human` (#4993)
Yamagishi Kazutoshi [Mon, 18 Sep 2017 02:55:23 +0000 (11:55 +0900)]
Add `strip_insignificant_zeros: true` option to `number_to_human` (#4993)