]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoAdjust public hashtag pages (#5357)
Lynx Kotoura [Sat, 14 Oct 2017 12:48:12 +0000 (21:48 +0900)]
Adjust public hashtag pages (#5357)

8 years agoUse atomUri in Undo activity of Announce (#5376)
unarist [Sat, 14 Oct 2017 12:42:09 +0000 (21:42 +0900)]
Use atomUri in Undo activity of Announce (#5376)

This allows deletion of reblogs which delivered before with OStatus URI.

8 years agoreplace newlines in desktop notif with spaces instead of removing them (#5361)
Ondřej Hruška [Sat, 14 Oct 2017 12:41:12 +0000 (14:41 +0200)]
replace newlines in desktop notif with spaces instead of removing them (#5361)

8 years agoUpdated Catalan strings (#5323)
spla [Sat, 14 Oct 2017 12:40:35 +0000 (14:40 +0200)]
Updated Catalan strings (#5323)

* Add Catalan language

* Add Catalan language

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update ca.json

* Update settings_helper.rb

* Update mastodon.js

* Update index.js

* Update application.rb

* Update ca.yml

* removed extra spaces at line 225

* Catalan translation update

added activerecord.ca.yml

* Update activerecord.ca.yml

Done

* Updated activerecord.ca.yml

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Catalan language updated

* Update ca.json

Removed :

<<<<<<< HEAD
  "getting_started.support": "{faq} • {userguide} • {apps}",
=======
>>>>>>> upstream/master

* Syncing to master

* Added new Catalan strings

* removed config.secret_key line

* Corrected <sotrong> tag to <strong>

Line 515

* Removed extra line

* Reverted

* yarn.lock reverted

* Updated Catalan strings

* Updated Catalan strings

8 years agoFix #5351 - Redirection with page params after copy emoji (#5387)
KY [Sat, 14 Oct 2017 12:40:10 +0000 (20:40 +0800)]
Fix #5351 - Redirection with page params after copy emoji (#5387)

* Fix #5351 - Redirection with page params after copy emoji

* Add page params to copy emoji link

8 years agoClose connection when succeeded posting (#5390)
abcang [Sat, 14 Oct 2017 12:38:57 +0000 (21:38 +0900)]
Close connection when succeeded posting (#5390)

* Close connection when succeeded posting

* Update webmock

8 years agoUpdate French translation (#5384)
Yannick A [Sat, 14 Oct 2017 12:30:19 +0000 (14:30 +0200)]
Update French translation (#5384)

Update French translation

8 years agol10n: update Persian translation for 2.0 (#5391)
Masoud Abkenar [Sat, 14 Oct 2017 12:28:19 +0000 (14:28 +0200)]
l10n: update Persian translation for 2.0 (#5391)

8 years agoUpdate German translation (#5389)
Jakob Kramer [Sat, 14 Oct 2017 10:00:23 +0000 (12:00 +0200)]
Update German translation (#5389)

8 years agoCorrect some misspellings (#5381)
Mathias B [Sat, 14 Oct 2017 01:34:59 +0000 (03:34 +0200)]
Correct some misspellings (#5381)

* Correct some misspellings

Remove some english language and put the proper french words in place.

* Forgot some shit

Buurps'

8 years agoDutch strings: small change (#5375)
Jeroen [Fri, 13 Oct 2017 16:03:56 +0000 (18:03 +0200)]
Dutch strings: small change (#5375)

* Dutch strings: small change

* And this too.

8 years agoOptimize Status#permitted_for 500x (account timeline) (#5373)
unarist [Fri, 13 Oct 2017 14:53:44 +0000 (23:53 +0900)]
Optimize Status#permitted_for 500x (account timeline) (#5373)

The main change of this PR is removing `order by visibility` hack.

This was introduced to force using of `index_statuses_on_account_id` instead of PK index, but it seems no longer needed probably due to `index_statuses_on_account_id_id`. Removing this avoids reading all rows, so really improves first fetching of the user who has lot of statuses.

I have also changed JOIN to IN + subquery, which slightly faster in most cases.

8 years agoFix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5371)
Eugen Rochko [Fri, 13 Oct 2017 14:44:43 +0000 (16:44 +0200)]
Fix NameError: uninitialized constant OStatus::AtomSerializer::TagManager (#5371)

This error occurred at least in development environment

8 years agoFix UserTrackingConcern firing on every request, optimize some queries (#5368)
Eugen Rochko [Fri, 13 Oct 2017 14:44:29 +0000 (16:44 +0200)]
Fix UserTrackingConcern firing on every request, optimize some queries (#5368)

- For some reason, :if option on before_action did not work. It got
  executed every time, returned false, and the action run anyway,
  which led to the current_sign_in_at and sign_in_count being
  updated on every request
- Return "do not filter" early in FeedManager#filter_from_home? if
  the status is authored by receiver. Usually this method is not
  called for own statuses at all, but it is called when Feed#get
  uses the database
- Return early if #reload_stale_associations! has nothing to load
  to save a database query with WHERE 1=0

8 years agoDo not try to guess why home timeline is empty in web UI (#5370)
Eugen Rochko [Fri, 13 Oct 2017 14:44:16 +0000 (16:44 +0200)]
Do not try to guess why home timeline is empty in web UI (#5370)

* Do not try to guess why home timeline is empty in web UI

* Fix style issue

8 years agoWhen unfollowing, remove from home in web UI immediately (#5369)
Eugen Rochko [Fri, 13 Oct 2017 14:44:02 +0000 (16:44 +0200)]
When unfollowing, remove from home in web UI immediately (#5369)

Do NOT send "delete" through streaming API when unmerging from
home timeline. "delete" implies that the original status was
deleted, which is not true!

8 years agoFix remote status fetching for “pure” ActivityPub WEB_ACCOUNT users (#5372)
ThibG [Fri, 13 Oct 2017 10:58:13 +0000 (12:58 +0200)]
Fix remote status fetching for “pure” ActivityPub WEB_ACCOUNT users (#5372)

Remote ActivityPub users that have never been known as OStatus users
(whether or not they support it) will not have a “remote_url” attribute
set. In case they reside on an instance with WEB_DOMAIN ≠ LOCAL_DOMAIN,
the current check did rely on “remote_url” to verify the user's domain.

8 years agoImprove spec of Feed and UserTrackingConcern (#5367)
Eugen Rochko [Fri, 13 Oct 2017 09:00:11 +0000 (11:00 +0200)]
Improve spec of Feed and UserTrackingConcern (#5367)

8 years agoSet InstancePresenter to `Auth::RegistrationsController#create` (#5366)
Yamagishi Kazutoshi [Fri, 13 Oct 2017 07:35:07 +0000 (16:35 +0900)]
Set InstancePresenter to `Auth::RegistrationsController#create` (#5366)

8 years agoRetoot count increases without reason (#5363)
Lex Alexander [Fri, 13 Oct 2017 00:52:09 +0000 (14:52 -1000)]
Retoot count increases without reason (#5363)

* Retoot count increases without reason

-The store_uri method for Statuses was being called on after_create and causing reblogs to be incremented twice.
-This calls it when the transaction is finished by using after_create_commit.
-Fixes #4916.

* Added test case for after_create_commit callback for checking reblog count.

* Rewrote test to keep original, but added one for only the after_create_commit callback.

8 years agoReduce discrepancies between server and client-side character count (#5360)
ThibG [Thu, 12 Oct 2017 21:26:34 +0000 (23:26 +0200)]
Reduce discrepancies between server and client-side character count (#5360)

8 years agol10n: PT-BR translation updated (#5362)
Anna e só [Thu, 12 Oct 2017 21:16:43 +0000 (18:16 -0300)]
l10n: PT-BR translation updated (#5362)

* PT-BR translation updated

* Testing

* Indentation error fixed

* More indentation errors fixed

8 years agoUpdating more Dutch strings for 2.0 (#5359)
Jeroen [Thu, 12 Oct 2017 19:33:37 +0000 (21:33 +0200)]
Updating more Dutch strings for 2.0 (#5359)

8 years agoFix some consistance errors in gender neutral formulations. Add some missing ones...
Alda Marteau-Hardi [Thu, 12 Oct 2017 14:31:14 +0000 (16:31 +0200)]
Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)

8 years agoUpdate oc.json (#5343)
JeanGauthier [Thu, 12 Oct 2017 13:40:45 +0000 (15:40 +0200)]
Update oc.json (#5343)

8 years agoUpdate fr.yml (#5330)
JohnD28 [Thu, 12 Oct 2017 13:25:34 +0000 (15:25 +0200)]
Update fr.yml (#5330)

* Update fr.yml

Update of french translation and reformatting Privacy Policy for better maintenance.

* Update fr.yml

* Update fr.yml

* Update fr.yml

Corrections suivant les remarques d'Alda.

* Update fr.yml

* Update fr.yml

* Update fr.yml

* Update fr.yml

* Update fr.yml

I have replaced my proposals with those accepted here to reduce the conflict.

https://github.com/tootsuite/mastodon/pull/5340

J'ai remplacé mes propositions par celles acceptées ici pour réduire le conflit.

Comment dois-je faire à l'avenir pour éviter ce genre de situations ?

* Update fr.yml

Conflict reduction.

8 years ago+ me for Dutch (#5349)
Jeroen [Thu, 12 Oct 2017 10:07:35 +0000 (12:07 +0200)]
+ me for Dutch (#5349)

I didn't received  the memo, but I just follow the flow.

8 years agoFix some failure cases on FetchLinkCardService (#5347)
unarist [Thu, 12 Oct 2017 10:01:32 +0000 (19:01 +0900)]
Fix some failure cases on FetchLinkCardService (#5347)

* If OEmbed response doesn't have a required property `type`, ignore it.
  e.g. `NoMethodError: undefined method 'type' for ...`
* If we failed to detect encoding, fallback to default behavior of Nokogiri.
  e.g. `KeyError: key not found: :encoding`

8 years agoi18n: Update Polish translation (#5346)
Marcin Mikołajczak [Thu, 12 Oct 2017 07:56:03 +0000 (09:56 +0200)]
i18n: Update Polish translation (#5346)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoModeration notes (#5344)
JeanGauthier [Thu, 12 Oct 2017 06:28:15 +0000 (08:28 +0200)]
Moderation notes (#5344)

8 years agoUpdate ja.yml (#5342)
nullkal [Thu, 12 Oct 2017 03:18:13 +0000 (12:18 +0900)]
Update ja.yml (#5342)

* Update ja.yml

* Update simple_form.ja.yml

8 years agoChange Android icon padding again to half of previous (#5339)
Eugen Rochko [Wed, 11 Oct 2017 22:58:14 +0000 (00:58 +0200)]
Change Android icon padding again to half of previous (#5339)

8 years agoFixes and updates for the French translation (#5340)
Sylvhem [Wed, 11 Oct 2017 22:58:01 +0000 (00:58 +0200)]
Fixes and updates for the French translation (#5340)

* Ajout du support des thèmes multiples

Ajoute des traductions pour les nouvelles chaînes permettant le support de thèmes multiples.

Add translations for the new strings allowing support for multiple themes.

* Mise à jour de la traduction

Met à jour les chaînes modifiées et ajoute des traductions pour celle n’en ayant pas.

Update modified strings and add new translations for the ones who are missing them.

* Remplace « ' » par « ’ »

Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019).
En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux.

Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019).
In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both.

8 years agoUpdating Dutch strings for 2.0 (#5334)
Jeroen [Wed, 11 Oct 2017 19:21:22 +0000 (21:21 +0200)]
Updating Dutch strings for 2.0 (#5334)

8 years agoAdd myself as codeowner of the translation files. (#5333)
Alda Marteau-Hardi [Wed, 11 Oct 2017 19:21:13 +0000 (21:21 +0200)]
Add myself as codeowner of the translation files. (#5333)

8 years agoUse gender neutral language as in the rest of the french translation (#5331)
Alda Marteau-Hardi [Wed, 11 Oct 2017 19:20:56 +0000 (21:20 +0200)]
Use gender neutral language as in the rest of the french translation (#5331)

8 years agoFix #5329 (#5332)
aschmitz [Wed, 11 Oct 2017 19:20:39 +0000 (14:20 -0500)]
Fix #5329 (#5332)

This fixes #5329, which occurred when using MigrationHelpers on a
table that Postgres estimated to be non-empty when it was actually
empty.

8 years agoFix styles of error pages (#5335)
Lynx Kotoura [Wed, 11 Oct 2017 19:18:46 +0000 (04:18 +0900)]
Fix styles of error pages (#5335)

Signed-off-by: Lynx Kotoura <admin@sanin.link>
Signed-off-by: Lynx Kotoura <admin@sanin.link>
8 years agofix presented og:url is incorrect (#5320)
takayamaki [Wed, 11 Oct 2017 17:22:21 +0000 (02:22 +0900)]
fix presented og:url is incorrect (#5320)

8 years agoIn thread view, only scroll first update, scroll to replied-to post (#5322)
Eugen Rochko [Wed, 11 Oct 2017 17:21:44 +0000 (19:21 +0200)]
In thread view, only scroll first update, scroll to replied-to post (#5322)

8 years agoOnly preload JS in /web pages (#5325)
Nolan Lawson [Wed, 11 Oct 2017 17:20:55 +0000 (10:20 -0700)]
Only preload JS in /web pages (#5325)

8 years agoAdd padding to Android icon, change Apple and MS icons (#5321)
Eugen Rochko [Wed, 11 Oct 2017 17:11:15 +0000 (19:11 +0200)]
Add padding to Android icon, change Apple and MS icons (#5321)

8 years agoFully disable hotkeys when input element is focused (#5324)
Eugen Rochko [Wed, 11 Oct 2017 14:31:07 +0000 (16:31 +0200)]
Fully disable hotkeys when input element is focused (#5324)

Because alt+n is a way to enter some kinda letter on some keyboard

8 years agoUpdate french translation : mastodon/locales/fr.json (#5318)
JohnD28 [Wed, 11 Oct 2017 13:07:09 +0000 (15:07 +0200)]
Update french translation : mastodon/locales/fr.json (#5318)

* Update fr.json

* Update fr.json

* Update fr.json

8 years agoUpdate doorkeeper.fr.yml (#5317)
JohnD28 [Wed, 11 Oct 2017 13:04:36 +0000 (15:04 +0200)]
Update doorkeeper.fr.yml (#5317)

8 years agoUpdate ar.json (#5316)
ButterflyOfFire [Wed, 11 Oct 2017 12:19:04 +0000 (13:19 +0100)]
Update ar.json (#5316)

Pushing new arabic translated strings for Mastodon web client.

8 years agoFix an error when ancestors get loaded before the status itself (#5312)
unarist [Wed, 11 Oct 2017 09:25:15 +0000 (18:25 +0900)]
Fix an error when ancestors get loaded before the status itself (#5312)

When ancestors get loaded, we scroll to the target status (i.e. skip
ancestors). However, ancestors may get loaded before the status itself,
then it causes TypeError because `this.node` is undefined yet.

Since we don't show anything until the status gets loaded, we don't need
to scroll to the target status in this time. If we get the status itslef
later, it causes `componentDidUpdate` and scrolling correctly.

8 years agoFix #5281 - Fix tooltip/custom emoji/search interaction (#5310)
Eugen Rochko [Tue, 10 Oct 2017 23:33:29 +0000 (01:33 +0200)]
Fix #5281 - Fix tooltip/custom emoji/search interaction (#5310)

8 years agoFix #5306: Stop hotkeys in input fields even when shift is pressed (#5309)
Eugen Rochko [Tue, 10 Oct 2017 23:01:17 +0000 (01:01 +0200)]
Fix #5306: Stop hotkeys in input fields even when shift is pressed (#5309)

AZERTY layouts require pressing shift to press a number at all, so
it triggers a column switch even when simply typing numbers in
textarea

8 years agosign_in and sign_up views present og meta infos (#5308)
takayamaki [Tue, 10 Oct 2017 22:52:25 +0000 (07:52 +0900)]
sign_in and sign_up views present og meta infos (#5308)

8 years agoBump version to 2.0.0rc2
Eugen Rochko [Tue, 10 Oct 2017 18:48:26 +0000 (20:48 +0200)]
Bump version to 2.0.0rc2

8 years agoFix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305)
Eugen Rochko [Tue, 10 Oct 2017 18:47:14 +0000 (20:47 +0200)]
Fix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305)

8 years agoRemove prop types from external libraries (#5304)
Nolan Lawson [Tue, 10 Oct 2017 16:44:51 +0000 (09:44 -0700)]
Remove prop types from external libraries (#5304)

8 years agoUpdate German translation (#5302)
Jakob Kramer [Tue, 10 Oct 2017 14:12:18 +0000 (16:12 +0200)]
Update German translation (#5302)

8 years agoFix custom emoji copy not copying file (#5298)
Eugen Rochko [Tue, 10 Oct 2017 13:18:27 +0000 (15:18 +0200)]
Fix custom emoji copy not copying file (#5298)

8 years agoFix #5295 - Order custom emoji lexicographically (#5297)
Eugen Rochko [Tue, 10 Oct 2017 13:18:12 +0000 (15:18 +0200)]
Fix #5295 - Order custom emoji lexicographically (#5297)

8 years agoFix an error when video playback buffer is empty (#5300)
unarist [Tue, 10 Oct 2017 13:17:53 +0000 (22:17 +0900)]
Fix an error when video playback buffer is empty (#5300)

8 years agoforeign_key, non-nullable, dependent: destroy in account_moderation_notes (#5294)
nullkal [Tue, 10 Oct 2017 11:12:17 +0000 (20:12 +0900)]
foreign_key, non-nullable, dependent: destroy in account_moderation_notes (#5294)

* Add foreign key constraint to column `account` in `account_moderation_notes`

* Change account_id and target_account_id to non-nullable in account_moderation_notes

* Add dependent: :destroy to account and target_account in account_moderation_notes

8 years agoFix wrong dimensions on Android icon (#5296)
Eugen Rochko [Tue, 10 Oct 2017 10:41:30 +0000 (12:41 +0200)]
Fix wrong dimensions on Android icon (#5296)

8 years agoMaterial app icon for Chrome (#5291)
Eugen Rochko [Mon, 9 Oct 2017 19:27:16 +0000 (21:27 +0200)]
Material app icon for Chrome (#5291)

8 years agoFix #5278 - Update emoji-mart so invalid emoji IDs don't crash it (#5290)
Eugen Rochko [Mon, 9 Oct 2017 18:52:40 +0000 (20:52 +0200)]
Fix #5278 - Update emoji-mart so invalid emoji IDs don't crash it (#5290)

8 years agoCenter error layout (#5289)
Eugen Rochko [Mon, 9 Oct 2017 18:51:36 +0000 (20:51 +0200)]
Center error layout (#5289)

8 years agoFix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288)
Eugen Rochko [Mon, 9 Oct 2017 18:51:24 +0000 (20:51 +0200)]
Fix #5274 - Create symlink from public/500.html to public/assets/500.html (#5288)

8 years agoRemove timestamps on any option (#5282)
Jeong Arm [Mon, 9 Oct 2017 15:52:02 +0000 (00:52 +0900)]
Remove timestamps on any option (#5282)

8 years agoFix pagination in Api::V1::BlocksController (#5285)
Akihiko Odaki [Mon, 9 Oct 2017 15:30:31 +0000 (00:30 +0900)]
Fix pagination in Api::V1::BlocksController (#5285)

8 years agoFix migration failure due to StrongMigrations on production env (#5283)
unarist [Mon, 9 Oct 2017 08:05:35 +0000 (17:05 +0900)]
Fix migration failure due to StrongMigrations on production env (#5283)

8 years agoFix dependency of error page generation on database (#5280)
Eugen Rochko [Mon, 9 Oct 2017 08:05:10 +0000 (10:05 +0200)]
Fix dependency of error page generation on database (#5280)

8 years agoBump version to 2.0.0rc1 (#5209)
Eugen Rochko [Sun, 8 Oct 2017 20:03:44 +0000 (22:03 +0200)]
Bump version to 2.0.0rc1 (#5209)

8 years agoFix #5272 - Order of checks in ActivityPub handler (#5276)
Eugen Rochko [Sun, 8 Oct 2017 20:03:34 +0000 (22:03 +0200)]
Fix #5272 - Order of checks in ActivityPub handler (#5276)

8 years agoFix #5271 - Fix missing attribute in remove_from_feed (#5277)
Eugen Rochko [Sun, 8 Oct 2017 19:55:34 +0000 (21:55 +0200)]
Fix #5271 - Fix missing attribute in remove_from_feed (#5277)

Regression from #4801

8 years agoTrack frequently used emojis in web UI (#5275)
Eugen Rochko [Sun, 8 Oct 2017 19:47:15 +0000 (21:47 +0200)]
Track frequently used emojis in web UI (#5275)

* Track frequently used emojis in web UI

* Persist emoji usage, but debounce commits to the settings API

* Fix #5144 - Add tooltips to picker

* Display only 2 lines of frequently used emojis

8 years agoSet snowflake IDs for backdated statuses (#5260)
Eugen Rochko [Sun, 8 Oct 2017 15:34:34 +0000 (17:34 +0200)]
Set snowflake IDs for backdated statuses (#5260)

- Rename Mastodon::TimestampIds into Mastodon::Snowflake for clarity
- Skip for statuses coming from inbox, aka delivered in real-time
- Skip for statuses that claim to be from the future

8 years agoFix #5178 - Use object URI only in Announce, instead of embedding (#5266)
Eugen Rochko [Sun, 8 Oct 2017 12:41:59 +0000 (14:41 +0200)]
Fix #5178 - Use object URI only in Announce, instead of embedding (#5266)

8 years agoi18n: Update Polish translation (#5270)
m4sk1n [Sun, 8 Oct 2017 07:00:55 +0000 (09:00 +0200)]
i18n: Update Polish translation (#5270)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoTranslate some Esperanto (#5252)
Jeong Arm [Sun, 8 Oct 2017 05:30:14 +0000 (14:30 +0900)]
Translate some Esperanto (#5252)

* Translate some Esperanto

* More translation

* More Esperanto translation

* Esperanto translation

* Fix mistaken format

8 years agoi18n update Occitan (#5263)
JeanGauthier [Sun, 8 Oct 2017 05:18:27 +0000 (07:18 +0200)]
i18n update Occitan (#5263)

* Update oc.json

* Update oc.yml

* Update oc.yml

* Update oc.json

8 years agoVideo preload should be a string (#5267)
Nolan Lawson [Sun, 8 Oct 2017 01:06:43 +0000 (18:06 -0700)]
Video preload should be a string (#5267)

8 years agoUse ES module build of react-router-dom (#5264)
Nolan Lawson [Sun, 8 Oct 2017 00:55:58 +0000 (17:55 -0700)]
Use ES module build of react-router-dom (#5264)

8 years agoDynamically calculate card height for embeds instead of padding (#5265)
Eugen Rochko [Sun, 8 Oct 2017 00:34:49 +0000 (02:34 +0200)]
Dynamically calculate card height for embeds instead of padding (#5265)

The padding trick was hard-coded to a 16:9 ratio, but we can use
width and height provided from OEmbed information and width
of the card itself to calculate a new height

8 years agoShow buffering in video player (#5261)
Eugen Rochko [Sun, 8 Oct 2017 00:33:08 +0000 (02:33 +0200)]
Show buffering in video player (#5261)

8 years agoUpdate outdated README (#5262)
Eugen Rochko [Sat, 7 Oct 2017 19:20:59 +0000 (21:20 +0200)]
Update outdated README (#5262)

8 years agoAdd moderation note (#5240)
nullkal [Sat, 7 Oct 2017 18:26:43 +0000 (03:26 +0900)]
Add moderation note (#5240)

* Add moderation note

* Add frozen_string_literal

* Make rspec pass

8 years agoRedesign public hashtag pages (#5237)
Eugen Rochko [Sat, 7 Oct 2017 18:00:35 +0000 (20:00 +0200)]
Redesign public hashtag pages (#5237)

8 years agoFix custom emoji in emoji picker, persist skin tone (#5258)
Eugen Rochko [Sat, 7 Oct 2017 17:02:30 +0000 (19:02 +0200)]
Fix custom emoji in emoji picker, persist skin tone (#5258)

8 years agoIn REST API, when URL can be missing, cast it to nil (#5259)
Eugen Rochko [Sat, 7 Oct 2017 16:55:48 +0000 (18:55 +0200)]
In REST API, when URL can be missing, cast it to nil (#5259)

8 years agoJapanese translation (relative time) (#5251)
MitarashiDango [Sat, 7 Oct 2017 16:32:03 +0000 (01:32 +0900)]
Japanese translation (relative time) (#5251)

8 years agoEncode custom emojis as resolveable objects in ActivityPub (#5243)
Eugen Rochko [Sat, 7 Oct 2017 15:43:42 +0000 (17:43 +0200)]
Encode custom emojis as resolveable objects in ActivityPub (#5243)

* Encode custom emojis as resolveable objects in ActivityPub

* Improve code style

8 years agoUpdate emoji-mart to v2.1.1 (#5256)
Nolan Lawson [Sat, 7 Oct 2017 10:17:02 +0000 (03:17 -0700)]
Update emoji-mart to v2.1.1 (#5256)

8 years agoFix regression from #5206 - deduplicate descendants (#5253)
Eugen Rochko [Sat, 7 Oct 2017 10:16:39 +0000 (12:16 +0200)]
Fix regression from #5206 - deduplicate descendants (#5253)

8 years agoKorean translation (#5244)
Jeong Arm [Sat, 7 Oct 2017 05:16:59 +0000 (14:16 +0900)]
Korean translation (#5244)

* [i18n] Korean translation

Add missing Korean translations.

[skip ci]

* start ci

8 years agoMake auto-play GIFs preference affect custom emojis in web UI (#5254)
Eugen Rochko [Sat, 7 Oct 2017 00:38:52 +0000 (02:38 +0200)]
Make auto-play GIFs preference affect custom emojis in web UI (#5254)

8 years agoi18n: Update Polish translation (#5255)
m4sk1n [Fri, 6 Oct 2017 20:43:32 +0000 (22:43 +0200)]
i18n: Update Polish translation (#5255)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoFix overflowing in web UI (#5246)
Lynx Kotoura [Fri, 6 Oct 2017 18:40:17 +0000 (03:40 +0900)]
Fix overflowing in web UI (#5246)

* Fix overflowing in web UI

* Revert fixing dropdown menu modal

8 years agoImprove error handling on LinkCrawlWorker (#5250)
unarist [Fri, 6 Oct 2017 18:39:08 +0000 (03:39 +0900)]
Improve error handling on LinkCrawlWorker (#5250)

* Improve error handling on LinkCrawlWorker

* Ignore TimeoutError and InvalidURIError too
* Record errors to debug log
* Enable dead job queue on LinkCrawlWorker

Since most of acceptable errors were already ignored, only our side issue should go to dead job queue.

* Ignore all http gem errors

8 years agoFix remote profile being displayed in HTML on remote_follow (#5249)
unarist [Fri, 6 Oct 2017 18:38:29 +0000 (03:38 +0900)]
Fix remote profile being displayed in HTML on remote_follow (#5249)

8 years agoFix error on reloading status detail column (#5248)
K.SHIRAKASHI [Fri, 6 Oct 2017 18:37:56 +0000 (03:37 +0900)]
Fix error on reloading status detail column (#5248)

8 years agoSpecify middleware versions in docker-compose.yml (#5247)
unarist [Fri, 6 Oct 2017 18:37:17 +0000 (03:37 +0900)]
Specify middleware versions in docker-compose.yml (#5247)

PostgreSQL10 has been released, but upgrading from older versions needs dump/restore. If you pull new version without those handling, db service will fail to launch.

To prevent accidentally upgrading, and as a recommended version, this patch specifies PostgreSQL and Redis version.

8 years agoFix error at emoji_compressed in Firefox ESR (#5241)
MIYAGI Hikaru [Fri, 6 Oct 2017 14:40:41 +0000 (14:40 +0000)]
Fix error at emoji_compressed in Firefox ESR (#5241)

8 years agoFix theme settings (#5242)
Lynx Kotoura [Fri, 6 Oct 2017 11:29:53 +0000 (20:29 +0900)]
Fix theme settings (#5242)

8 years agoFix thinking_face emoji autocomplete (#5238)
Nolan Lawson [Fri, 6 Oct 2017 10:03:13 +0000 (03:03 -0700)]
Fix thinking_face emoji autocomplete (#5238)