]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoAdd instance search feature (#4925)
nullkal [Wed, 13 Sep 2017 10:30:07 +0000 (19:30 +0900)]
Add instance search feature (#4925)

8 years agoMake instance names in into links to user list in the instance (#4924)
nullkal [Wed, 13 Sep 2017 09:34:07 +0000 (18:34 +0900)]
Make instance names in  into links to user list in the instance (#4924)

8 years agoFix #4917 - Add missing suspend checks (#4921)
Eugen Rochko [Wed, 13 Sep 2017 09:05:02 +0000 (11:05 +0200)]
Fix #4917 - Add missing suspend checks (#4921)

8 years agoFix #4918 - Limit pinned toots to 5 (#4923)
Eugen Rochko [Wed, 13 Sep 2017 09:04:32 +0000 (11:04 +0200)]
Fix #4918 - Limit pinned toots to 5 (#4923)

8 years agoFix height cache (#4909)
abcang [Wed, 13 Sep 2017 08:24:33 +0000 (17:24 +0900)]
Fix height cache (#4909)

8 years agoSpecify libicu explicitly in Aptfile (#4920)
Daigo 3 Dango [Wed, 13 Sep 2017 07:30:13 +0000 (21:30 -1000)]
Specify libicu explicitly in Aptfile (#4920)

It seems libicu-dev no longer installs libicu55 needed by charlock_holmes.

8 years ago[WiP] Whenever a remote keypair changes, unfollow them and re-subscribe to … (#4907)
ThibG [Tue, 12 Sep 2017 21:10:40 +0000 (23:10 +0200)]
[WiP] Whenever a remote keypair changes, unfollow them and re-subscribe to … (#4907)

* Whenever a remote keypair changes, unfollow them and re-subscribe to them

In Mastodon (it could be different for other OStatus or AP-enabled software),
a keypair change is indicative of whole user (or instance) data loss. In this
situation, the “new” user might be different, and almost certainly has an empty
followers list. In this case, Mastodon instances will disagree on follower
lists, leading to unreliable delivery and “shadow followers”, that is users
believed by a remote instance to be followers, without the affected user
knowing.

Drawbacks of this change are:
1. If an user legitimately changes public key for some reason without losing
   data (not possible in Mastodon at the moment), they will have their remote
   followers unsubscribed/re-subscribed needlessly.
2. Depending of the number of remote followers, this may generate quite some
   traffic.
3. If the user change is an attempt at usurpation, the remote followers will
   unknowingly follow the usurper. Note that this is *not* a change of
   behavior, Mastodon already behaves like that, although delivery might be
   unreliable, and the usurper would not have known the former user's
   followers.

* Rename ResubscribeWorker to RefollowWorker

* Process followers in batches

8 years agoAdd section for protocol specific information on the admin page (#4910)
unarist [Tue, 12 Sep 2017 21:06:10 +0000 (06:06 +0900)]
Add section for protocol specific information on the admin page (#4910)

This PR adds section for protocol specific information, then always show
both of OStatus and ActivityPub. Specifically, this will help admins to
check PuSH subscription status and unsubscribe manually, even `protocol`
has been changed.

This also includes below changes:

* Add `overflow: hidden` to prevent float leaking
* Add missing fields for ActivityPub

8 years agoClean up and improve generated OpenGraph tags (#4901)
Eugen Rochko [Tue, 12 Sep 2017 03:39:38 +0000 (05:39 +0200)]
Clean up and improve generated OpenGraph tags (#4901)

- Return all images as og:image
- Return videos as og:image (preview) and og:video
- Return profile:username on profiles

8 years agoFix nil error for old toots that don't have a conversation (#4900)
Eugen Rochko [Mon, 11 Sep 2017 22:57:18 +0000 (00:57 +0200)]
Fix nil error for old toots that don't have a conversation (#4900)

8 years agoFix #4894 - Merge context hash into final JSON hash after key transform (#4898)
Eugen Rochko [Mon, 11 Sep 2017 22:16:18 +0000 (00:16 +0200)]
Fix #4894 - Merge context hash into final JSON hash after key transform (#4898)

8 years agoFix count numbers from ActivityPub not being saved (#4899)
Eugen Rochko [Mon, 11 Sep 2017 22:16:03 +0000 (00:16 +0200)]
Fix count numbers from ActivityPub not being saved (#4899)

They are marked as read-only by Rails, but we know what we are doing,
so we are un-marking them as such.

The mastodon:maintenance:update_counter_caches task is not really
supposed to be run anymore (it was a one-time thing during an upgrade)
however, just in case, I have modified it to not touch ActivityPub
accounts.

Also, no point writing to logger from these rake tasks, since they
are not to be run from cron. Better to give stdout feedback.

8 years agoFix error when following locked accounts (#4896)
Eugen Rochko [Mon, 11 Sep 2017 21:50:37 +0000 (23:50 +0200)]
Fix error when following locked accounts (#4896)

8 years agoBump puma from 3.9.1 to 3.10.0 (#4879)
Grey Baker [Mon, 11 Sep 2017 21:43:19 +0000 (22:43 +0100)]
Bump puma from 3.9.1 to 3.10.0 (#4879)

Bumps [puma](https://github.com/puma/puma) from 3.9.1 to 3.10.0.
- [Release notes](https://github.com/puma/puma/releases/tag/v3.10.0)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v3.9.1...v3.10.0)

8 years agoBump rails from 5.1.3 to 5.1.4 (#4875)
Grey Baker [Mon, 11 Sep 2017 21:03:14 +0000 (22:03 +0100)]
Bump rails from 5.1.3 to 5.1.4 (#4875)

Bumps [rails](https://github.com/rails/rails) from 5.1.3 to 5.1.4.
- [Commits](https://github.com/rails/rails/compare/v5.1.3...v5.1.4)

8 years agoReset preview image if avatar/header image selection was cancelled (#4893)
unarist [Mon, 11 Sep 2017 14:19:54 +0000 (23:19 +0900)]
Reset preview image if avatar/header image selection was cancelled (#4893)

8 years agoAdd OpenStack Keystone V3 support (#4889)
Patrick Figel [Mon, 11 Sep 2017 13:11:13 +0000 (15:11 +0200)]
Add OpenStack Keystone V3 support (#4889)

Keystone V2 is deprecated in favour of V3. This adds the necessary
connection parameters for establishing a V3 connection. Connections
to V2 endpoints are still possible and the configuration should
remain compatible.

This also introduces a SWIFT_REGION variable for multi-region
OpenStack environments and a SWIFT_CACHE_TTL that controls how long
tokens and other meta-data is cached for. Caching tokens avoids
rate-limiting errors that would result in media uploads becoming
unavailable during high load or when using tasks like
media:remove_remote. fog-openstack only supports token caching for
V3 endpoints, so a recommendation for using V3 was added.

8 years agol10n: Full PT-BR translation (#4882)
Anna e só [Sun, 10 Sep 2017 23:40:29 +0000 (20:40 -0300)]
l10n: Full PT-BR translation (#4882)

* devise.pt-BR.yml now fully translated

* pt-BR.json now fully translated

* pt-BR.yml partially translated; 46 lines left

* pt-BR.yml now fully translated

* simple_form.pt-BR.yml fully translated

* doorkeeper.pt-BR.yml now fully translated

* E-mail instructions on app/views/user_mailer added and fully translated

* PT-BR translation for #4871

* Deleted an unwanted caracter on pt-BR.yml

* Fixing typos on pt-BR.yml

* Added translation for Pinned toots tab on pt-BR.json

* Added missing translation for navigation_bar.pins

8 years agol10n: update Persian translation (#4880)
Masoud Abkenar [Sun, 10 Sep 2017 23:35:27 +0000 (01:35 +0200)]
l10n: update Persian translation (#4880)

* l10n: update Persian translation

* l10n: fix missing Persian translation

8 years agoi18n: Update Polish translation (#4881)
m4sk1n [Sun, 10 Sep 2017 15:25:39 +0000 (17:25 +0200)]
i18n: Update Polish translation (#4881)

8 years agoBump to 1.6.0
Eugen Rochko [Sun, 10 Sep 2017 13:10:03 +0000 (15:10 +0200)]
Bump to 1.6.0

8 years agoFix POST /api/v1/follows error when already following (#4878)
Eugen Rochko [Sun, 10 Sep 2017 13:09:06 +0000 (15:09 +0200)]
Fix POST /api/v1/follows error when already following (#4878)

8 years agoFix Japanese translation (#4876)
yoshipc [Sun, 10 Sep 2017 11:34:15 +0000 (20:34 +0900)]
Fix Japanese translation (#4876)

I translated the additional text ( added by #4871)

8 years agoBump version to 1.6.0rc5
Eugen Rochko [Sun, 10 Sep 2017 08:26:51 +0000 (10:26 +0200)]
Bump version to 1.6.0rc5

8 years agoHide modal loading screen for media/video/boost/confirm/actions modals (#4873)
Eugen Rochko [Sun, 10 Sep 2017 08:26:01 +0000 (10:26 +0200)]
Hide modal loading screen for media/video/boost/confirm/actions modals (#4873)

8 years agoDefault follows for new users (#4871)
Eugen Rochko [Sun, 10 Sep 2017 07:58:38 +0000 (09:58 +0200)]
Default follows for new users (#4871)

When a new user confirms their e-mail, bootstrap their home timeline
by automatically following a set of accounts. By default, all local
admin accounts (that are unlocked). Can be customized by new admin
setting (comma-separated usernames, local and unlocked only)

8 years agoFix dimensions of loading component for compose drawer (#4872)
Eugen Rochko [Sun, 10 Sep 2017 06:48:11 +0000 (08:48 +0200)]
Fix dimensions of loading component for compose drawer (#4872)

8 years agoSet fallback address when empty notification address (#4868)
Yamagishi Kazutoshi [Sat, 9 Sep 2017 19:31:48 +0000 (04:31 +0900)]
Set fallback address when empty notification address (#4868)

8 years agoi10n minors changes for 1.6 (#4867)
Quent-in [Sat, 9 Sep 2017 16:22:56 +0000 (18:22 +0200)]
i10n minors changes for 1.6 (#4867)

* wrong preposition + typo

* wrong preposition + typo

* Typo

* Typo

* minor changes

* minor changes

8 years agoFix errors preventing UnsubscribeService from working (#4866)
Eugen Rochko [Sat, 9 Sep 2017 15:36:27 +0000 (17:36 +0200)]
Fix errors preventing UnsubscribeService from working (#4866)

8 years agoAdd script to make embedded iframes autosize (#4853)
Eugen Rochko [Sat, 9 Sep 2017 14:23:44 +0000 (16:23 +0200)]
Add script to make embedded iframes autosize (#4853)

8 years agoDisable mouse-based pause from #4859 (#4865)
Eugen Rochko [Sat, 9 Sep 2017 13:09:50 +0000 (15:09 +0200)]
Disable mouse-based pause from #4859 (#4865)

It wasn't working ideally and introduced some annoying false positivies

8 years agoBump version to 1.6.0rc4
Eugen Rochko [Sat, 9 Sep 2017 12:53:49 +0000 (14:53 +0200)]
Bump version to 1.6.0rc4

8 years agoFix scroll behavior and others on paused timeline (#4864)
unarist [Sat, 9 Sep 2017 12:16:11 +0000 (21:16 +0900)]
Fix scroll behavior and others on paused timeline (#4864)

Resolved:

* Lot of redundant renders while mouse moving
* Scroll jumping when timeline loaded
* Scroll position isn't kept when statuses below the scrollTop was deleted then new status arrived

Unresolved:

* Scroll position isn't kept when statuses over the scrollTop was deleted then new status arrived
-> It needs to know which statuses are over the scrollTop
* New status indicator should be active when new statuses arrived while mouse moved recently
-> It needs a) update indicator in ScrollableList, or b) set scrollTop status while mouse moving

8 years agoFix second report (regression from 3b81baaaaf51ff1c70fb1f865eef07fdb33a5950) (#4863)
Yamagishi Kazutoshi [Sat, 9 Sep 2017 11:42:48 +0000 (20:42 +0900)]
Fix second report (regression from 3b81baaaaf51ff1c70fb1f865eef07fdb33a5950) (#4863)

8 years agoAdd missing reject_media check before avatar download via ActivityPub (#4862)
Eugen Rochko [Sat, 9 Sep 2017 11:41:45 +0000 (13:41 +0200)]
Add missing reject_media check before avatar download via ActivityPub (#4862)

8 years agoScrollable tables in settings pages (#4857)
Lynx Kotoura [Sat, 9 Sep 2017 00:26:58 +0000 (09:26 +0900)]
Scrollable tables in settings pages (#4857)

* Scrollable tables in settings pages

* Add space before curly brace

8 years agoFix #1004 - Temporarily pause timeline if there's been recent mouse movement (#4859)
Eugen Rochko [Sat, 9 Sep 2017 00:26:41 +0000 (02:26 +0200)]
Fix #1004 - Temporarily pause timeline if there's been recent mouse movement (#4859)

8 years agoFix #4852 - Check if already requested from FollowService (#4855)
Eugen Rochko [Sat, 9 Sep 2017 00:02:44 +0000 (02:02 +0200)]
Fix #4852 - Check if already requested from FollowService (#4855)

8 years agoFix #4850 - When visibility missing from API call to toot, fallback to user preferenc...
Eugen Rochko [Sat, 9 Sep 2017 00:02:29 +0000 (02:02 +0200)]
Fix #4850 - When visibility missing from API call to toot, fallback to user preference (#4861)

8 years agoRefresh timeline after toot while the timeline is disconnected (#4858)
unarist [Fri, 8 Sep 2017 19:43:34 +0000 (04:43 +0900)]
Refresh timeline after toot while the timeline is disconnected (#4858)

To reflect status posting immediately, we've inserted the status into timelines directly. However, status insertion changes "latest status", and it means next timeline refresh only fetches statuses since the inserted status. This behavior is very bad for disconnected timeline and mobile views.

After this patch, it refreshes timeline for disconnected timelines, instead of direct insertion.

8 years agoHandle stream_entry URL correctly in ActivityPub (#4854)
unarist [Fri, 8 Sep 2017 16:20:03 +0000 (01:20 +0900)]
Handle stream_entry URL correctly in ActivityPub (#4854)

In before, the method uses stream_entry id as status id, so replied status was wrongly selected.

This PR uses StatusFinder which was introduced with `Api::Web::EmbedsController`.

8 years agoi10n update OC and FR (#4849)
Quent-in [Fri, 8 Sep 2017 11:55:47 +0000 (13:55 +0200)]
i10n update OC and FR (#4849)

* Missing "navigation_bar.pins"

* Missing "navigation_bar.pins"

8 years agoFix language filter codes (#4841)
Eugen Rochko [Fri, 8 Sep 2017 10:32:22 +0000 (12:32 +0200)]
Fix language filter codes (#4841)

* Fix language filter codes

CLD3 returns BCP-47 language identifier, filter settings expect
identifiers in the ISO 639-1 format. Convert between formats,
and exclude duplicate languages from filter choices (zh-CN->zh)

* Fix zh name

8 years ago"Mute conversation" option on all own toots, not just in notifications (#4844)
Eugen Rochko [Fri, 8 Sep 2017 10:00:30 +0000 (12:00 +0200)]
"Mute conversation" option on all own toots, not just in notifications (#4844)

That way you can mute notifications for a toot before you get replies
to it or boosts or favourites

8 years agoFetch statuses/following/followers numbers from ActivityPub collections (#4840)
Eugen Rochko [Fri, 8 Sep 2017 10:00:17 +0000 (12:00 +0200)]
Fetch statuses/following/followers numbers from ActivityPub collections (#4840)

8 years agoi18n: Update Polish translation (#4845)
m4sk1n [Thu, 7 Sep 2017 20:51:48 +0000 (22:51 +0200)]
i18n: Update Polish translation (#4845)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoi10n OC / FR update Pinned toots (#4842)
Quent-in [Thu, 7 Sep 2017 20:07:03 +0000 (22:07 +0200)]
i10n OC / FR update Pinned toots (#4842)

* Added column.pins

New strings

* Added column.pins

* Update confirmation_instructions.oc.html.erb

* Update confirmation_instructions.oc.text.erb

* Update password_change.oc.html.erb

* Update password_change.oc.text.erb

* Update reset_password_instructions.oc.html.erb

* Update reset_password_instructions.oc.text.erb

* Update confirmation_instructions.oc.html.erb

* Update confirmation_instructions.oc.text.erb

8 years agoFix #4834 - Adjust Status#local and Status#remote scopes (#4839)
Eugen Rochko [Thu, 7 Sep 2017 18:18:34 +0000 (20:18 +0200)]
Fix #4834 - Adjust Status#local and Status#remote scopes (#4839)

8 years agoEnable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)
abcang [Thu, 7 Sep 2017 14:44:15 +0000 (23:44 +0900)]
Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)

8 years agoUse <button> instead of <div role="button"> (#4835)
PFM [Thu, 7 Sep 2017 14:18:41 +0000 (23:18 +0900)]
Use <button> instead of <div role="button"> (#4835)

8 years agoAdd Pinned toot column (#4817)
voidSatisfaction [Thu, 7 Sep 2017 07:58:11 +0000 (16:58 +0900)]
Add Pinned toot column (#4817)

* Add Pinned_toot_section

* Fix add frozen_string_literal

* Fix delete no need controller and tests

* Fix replace query strings to axios params

* Fix change value to accountId and disabling more button

8 years agoFeat add validation for report comment: characters under 1000 valid (#4833)
voidSatisfaction [Thu, 7 Sep 2017 07:55:42 +0000 (16:55 +0900)]
Feat add validation for report comment: characters under 1000 valid (#4833)

8 years agoUse casecmp() instead of casecmp?() for now (#4832)
Joseph Mingrone [Thu, 7 Sep 2017 01:55:06 +0000 (22:55 -0300)]
Use casecmp() instead of casecmp?() for now (#4832)

* Use casecmp() instead of casecmp?() for now

casecmp?() is only available in ruby 2.4.0.  Users running earlier ruby versions
would see errors, e.g., running
RAILS_ENV=production rails mastodon:maintenance:remove_deprecated_preview_cards.

* Correctly check whether casecmp() returns 0

8 years agoi10n update OC and FR files (#4824)
Quent-in [Wed, 6 Sep 2017 23:55:03 +0000 (01:55 +0200)]
i10n update OC and FR files (#4824)

* Onboarding: corrections

Some missing letters and spaces or better wording

* Embed

Translated as Intégrer in FR / Embarcar in OC

8 years agoUpdate fr.json (#4830)
Olivier Humbert [Wed, 6 Sep 2017 20:32:49 +0000 (22:32 +0200)]
Update fr.json (#4830)

typo

8 years agoFix locking migration on statuses table. Nullable column and NO default value (#4825)
Eugen Rochko [Wed, 6 Sep 2017 18:57:52 +0000 (20:57 +0200)]
Fix locking migration on statuses table. Nullable column and NO default value (#4825)

8 years agoBump version to 1.6.0rc2
Eugen Rochko [Wed, 6 Sep 2017 17:02:03 +0000 (19:02 +0200)]
Bump version to 1.6.0rc2

8 years agoSwitch to static URIs, new URI format in both protocols for new statuses (#4815)
Eugen Rochko [Wed, 6 Sep 2017 17:01:28 +0000 (19:01 +0200)]
Switch to static URIs, new URI format in both protocols for new statuses (#4815)

* Decouple Status#local? from uri being nil

* Replace on-the-fly URI generation with stored URIs

- Generate URI in after_save hook for local statuses
- Use static value in TagManager when available, fallback to tag format
- Make TagManager use ActivityPub::TagManager to understand new format
- Adjust tests

* Use other heuristic for locality of old statuses, do not perform long query

* Exclude tombstone stream entries from Atom feed

* Prevent nil statuses from landing in Pubsubhubbub::DistributionWorker

* Fix URI not being saved (#4818)

* Add more specs for Status

* Save generated uri immediately

and also fix method order to minimize diff.

* Fix alternate HTML URL in Atom

* Fix tests

* Remove not-null constraint from statuses migration to speed it up

8 years agoAdd Smartphone screen favourite back button and adjust styles (#4813)
voidSatisfaction [Wed, 6 Sep 2017 15:32:15 +0000 (00:32 +0900)]
Add Smartphone screen favourite back button and adjust styles (#4813)

* Feat add get-back button on favourite columnHeader

* Style adjust nice looking get-back button

* Fix delete media query and add padding right

* fix: restore padding and add lastchild style for back-button

8 years agoi18n: update Persian translation (#4822)
Masoud Abkenar [Wed, 6 Sep 2017 15:31:54 +0000 (17:31 +0200)]
i18n: update Persian translation (#4822)

8 years agofix scroll position (#4821)
Clworld [Wed, 6 Sep 2017 15:29:56 +0000 (00:29 +0900)]
fix scroll position (#4821)

8 years agoUpdate react-intl to version 2.4.0 (#4820)
Yamagishi Kazutoshi [Wed, 6 Sep 2017 14:25:19 +0000 (23:25 +0900)]
Update react-intl to version 2.4.0 (#4820)

8 years agofix text position of NSFW for video file (#4819)
PFM [Wed, 6 Sep 2017 11:55:47 +0000 (20:55 +0900)]
fix text position of NSFW for video file (#4819)

8 years agoAdd environment sample for OpenStack Swift (#4816)
Yamagishi Kazutoshi [Wed, 6 Sep 2017 10:13:00 +0000 (19:13 +0900)]
Add environment sample for OpenStack Swift (#4816)

8 years agoswift-enable the paperclip! :paperclip: (#2322)
Adam Thurlow [Tue, 5 Sep 2017 21:17:06 +0000 (18:17 -0300)]
swift-enable the paperclip! :paperclip: (#2322)

8 years agoDo not execute the job with the same arguments as the retry job (#4814)
abcang [Tue, 5 Sep 2017 18:56:20 +0000 (03:56 +0900)]
Do not execute the job with the same arguments as the retry job (#4814)

8 years agoFix mentions in direct statuses not being delivered via AP (#4806)
Eugen Rochko [Tue, 5 Sep 2017 18:55:25 +0000 (20:55 +0200)]
Fix mentions in direct statuses not being delivered via AP (#4806)

8 years agoFix #4794 - Fake instant follow in API response when account is believed unlocked...
Eugen Rochko [Tue, 5 Sep 2017 15:48:13 +0000 (17:48 +0200)]
Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799)

8 years agoAdjust status embeds (#4808)
Lynx Kotoura [Tue, 5 Sep 2017 10:31:24 +0000 (19:31 +0900)]
Adjust status embeds (#4808)

* Adjust status embeds

Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal.

* Remove trailing whitespace

* Using width from the variable

8 years agoadd index_notifications_on_id_and_account_id_and_activity_type on notifications table...
takayamaki [Tue, 5 Sep 2017 10:30:01 +0000 (19:30 +0900)]
add index_notifications_on_id_and_account_id_and_activity_type on notifications table (#4750)

8 years agocomment correction (#4812)
Treyssat-Vincent Nino [Tue, 5 Sep 2017 10:13:25 +0000 (12:13 +0200)]
comment correction (#4812)

8 years agoTranslation korean added (#4802)
voidSatisfaction [Mon, 4 Sep 2017 18:40:02 +0000 (03:40 +0900)]
Translation korean added (#4802)

8 years agoUpdate ar.yml (#4810)
ButterflyOfFire [Mon, 4 Sep 2017 17:54:12 +0000 (18:54 +0100)]
Update ar.yml (#4810)

Some little changes to "ar" locale

8 years agoFix some ActivityPub JSON bugs (#4796)
Eugen Rochko [Mon, 4 Sep 2017 16:26:33 +0000 (18:26 +0200)]
Fix some ActivityPub JSON bugs (#4796)

- Fix assumption that `url` is always a string. Handle it if it's an
  array of strings, array of objects, object, or string, both for
  accounts and for objects
- `sharedInbox` is actually supposed to be under `endpoints`, handle
  both cases and adjust the serializer

8 years agoShow pinned statuses only in the top of the profile page (#4803)
nullkal [Mon, 4 Sep 2017 10:53:18 +0000 (19:53 +0900)]
Show pinned statuses only in the top of the profile page (#4803)

* Show pinned statuses only in the top of the profile page

* Refactor AccountsController#show_pinned_statuses?

8 years agoFix streaming url to lowercase (#4804)
voidSatisfaction [Mon, 4 Sep 2017 10:52:06 +0000 (19:52 +0900)]
Fix streaming url to lowercase (#4804)

8 years agoFix #4551 - Use correct syntax for content preloading (#4798)
Eugen Rochko [Mon, 4 Sep 2017 00:14:12 +0000 (02:14 +0200)]
Fix #4551 - Use correct syntax for content preloading (#4798)

8 years agoFix a problem that notification column goes to top (#4792)
abcang [Sun, 3 Sep 2017 18:31:51 +0000 (03:31 +0900)]
Fix a problem that notification column goes to top (#4792)

8 years agoFix short number locales (#4790)
Eugen Rochko [Sun, 3 Sep 2017 13:17:34 +0000 (15:17 +0200)]
Fix short number locales (#4790)

Overwrite values from rails-i18n by manually overwriting in every locale.
We want numbers like 1.5K in every language

8 years agoMake german translation more gender neutral #4755 (#4789)
Andreas Drop [Sun, 3 Sep 2017 13:17:24 +0000 (15:17 +0200)]
Make german translation more gender neutral #4755 (#4789)

8 years agoUse next instead of return in task (#4787)
Akihiko Odaki [Sun, 3 Sep 2017 10:39:39 +0000 (19:39 +0900)]
Use next instead of return in task (#4787)

8 years agoCroatian translation - updated (#4183)
May Kittens Devour Your Soul [Sun, 3 Sep 2017 09:10:53 +0000 (11:10 +0200)]
Croatian translation - updated  (#4183)

* Update hr.json

* Update hr.json

8 years agol10n Occitan update for Embed, cancel follow request, ... (#4788)
Quent-in [Sun, 3 Sep 2017 09:08:37 +0000 (11:08 +0200)]
l10n Occitan update for Embed, cancel follow request, ... (#4788)

* Update: some missing strings

* Updates missing strings

* New string

* Update oc.json

* Update oc.yml

* Update oc.json

8 years agoExplicitly define attached file of DeprecatedPreviewCard (#4786)
Akihiko Odaki [Sun, 3 Sep 2017 05:58:58 +0000 (14:58 +0900)]
Explicitly define attached file of DeprecatedPreviewCard (#4786)

The path template of the attached files must explicitly be defined because
it is contradicting to the name of the class.

8 years agoBump version to 1.6.0rc1 (#4768)
Eugen Rochko [Sat, 2 Sep 2017 23:12:05 +0000 (01:12 +0200)]
Bump version to 1.6.0rc1 (#4768)

8 years agoInstantly upgrade account to ActivityPub if we receive ActivityPub payload (#4766)
Eugen Rochko [Sat, 2 Sep 2017 23:11:23 +0000 (01:11 +0200)]
Instantly upgrade account to ActivityPub if we receive ActivityPub payload (#4766)

8 years agoImprove client-side German i18n (#4785)
Eugen Rochko [Sat, 2 Sep 2017 21:21:48 +0000 (23:21 +0200)]
Improve client-side German i18n (#4785)

8 years agoRename "locked" to "manuallyApprovesFollowers" in ActivityPub (#4779)
Eugen Rochko [Sat, 2 Sep 2017 21:13:35 +0000 (23:13 +0200)]
Rename "locked" to "manuallyApprovesFollowers" in ActivityPub (#4779)

See: <https://www.w3.org/wiki/Activity_Streams_extensions#as:manuallyApprovesFollowers>

8 years agoValidate data of Imports (#4782)
abcang [Sat, 2 Sep 2017 18:45:42 +0000 (03:45 +0900)]
Validate data of Imports (#4782)

8 years agoi18n: Improve Polish translation (#4783)
m4sk1n [Sat, 2 Sep 2017 18:45:20 +0000 (20:45 +0200)]
i18n: Improve Polish translation (#4783)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoMake "unfollow" undo pending outgoing follow request too (#4781)
Eugen Rochko [Sat, 2 Sep 2017 18:44:41 +0000 (20:44 +0200)]
Make "unfollow" undo pending outgoing follow request too (#4781)

* Make "unfollow" undo pending outgoing follow request too

* Add cancel button to web UI when awaiting follow request approval

* Make the hourglass button do the cancelling

8 years agofix text position of NSFW in Safari (Mac/iPhone) (#4570)
PFM [Sat, 2 Sep 2017 16:52:56 +0000 (01:52 +0900)]
fix text position of NSFW in Safari (Mac/iPhone) (#4570)

8 years agoRaise an error for remote url in StatusFinder (#4776)
unarist [Sat, 2 Sep 2017 15:42:47 +0000 (00:42 +0900)]
Raise an error for remote url in StatusFinder (#4776)

* Raise an error for remote url in StatusFinder

Previous implementation had allowed remote url with status id which also exists on local.

Then that bug leads /api/web/embed to return wrong embed url.

* Fix oembed_controller_spec

8 years agoFix WebPush (regression from #4524) (#4778)
unarist [Sat, 2 Sep 2017 14:50:42 +0000 (23:50 +0900)]
Fix WebPush (regression from #4524) (#4778)

* Fix NoMethodError in Web::PushSubscription

```
undefined method `site_contact_email' for #<Class:0x00005976d13c40>

/usr/local/bundle/gems/activerecord-5.1.3/lib/active_record/dynamic_matchers.rb:22:in `method_missing'
/usr/local/bundle/gems/attr_encrypted-3.0.3/lib/attr_encrypted.rb:295:in `method_missing'
/usr/local/bundle/gems/attr_encrypted-3.0.3/lib/attr_encrypted/adapters/active_record.rb:129:in `method_missing_with_attr_encrypted'
/mastodon/app/models/web/push_subscription.rb:53:in `push_payload'
```

* Specify serializer in Web::NotificationSerializer

8 years agoDon't unconditionally call `preventDefault` and `stopPropagation` on all keyup events...
Surinna Curtis [Sat, 2 Sep 2017 14:27:16 +0000 (09:27 -0500)]
Don't unconditionally call `preventDefault` and `stopPropagation` on all keyup events (#4777)

* UploadArea should only preventDefault for Escape

This will make accessibility for some things less effortful, since we won't have to define a prior event handler to do whatever should be happening by default.

* Remove workaround for fixed bug in SettingToggle

SettingToggle was toggling itself in response to keydown of space, and then the keyup was doing it again

8 years agoi18n: Update Polish translation (#4775)
m4sk1n [Sat, 2 Sep 2017 14:25:54 +0000 (16:25 +0200)]
i18n: Update Polish translation (#4775)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoAdjust settings pages (#4765)
Lynx Kotoura [Sat, 2 Sep 2017 13:49:28 +0000 (22:49 +0900)]
Adjust settings pages (#4765)

* views: Adjust heading positions

* Adjust settings pages

Adjust label. Adjust tables. Adjust admin/reports/* pages. Fix 2FA QR code style for narrow devices. Widen several pages. Increase contrast.

* Remove trailing whitespace

8 years agoAdd Japanese translate for #4561 (#4771)
Yamagishi Kazutoshi [Sat, 2 Sep 2017 12:02:29 +0000 (21:02 +0900)]
Add Japanese translate for #4561 (#4771)

8 years agoAdd text color style for noscript link (#4772)
Yamagishi Kazutoshi [Sat, 2 Sep 2017 12:02:15 +0000 (21:02 +0900)]
Add text color style for noscript link (#4772)