]> cat aescling's git repositories - mastodon.git/log
mastodon.git
8 years agoPrepend check_enabled_deletion to Settings::DeletesController (#229)
David Yip [Wed, 6 Dec 2017 22:19:43 +0000 (16:19 -0600)]
Prepend check_enabled_deletion to Settings::DeletesController (#229)

The specs for Settings::DeletesController include an example that
sets Settings.open_deletion to false and expects the "if deletion is not
available, redirect to root" logic to run.  However, this spec does not
set up a user, which means that the spec (intentionally or otherwise)
expects this redirection to work with unauthenticated access.

We should preserve that behavior.  To do so, we prepend the deletion
check to the action chain set up by Settings::BaseController, so that
said check occurs before the authenticate_user! check.

8 years agoVarious fixes
kibigo! [Tue, 5 Dec 2017 05:54:36 +0000 (21:54 -0800)]
Various fixes

8 years agocurrent_theme -> current_flavour (#229)
David Yip [Mon, 4 Dec 2017 17:35:35 +0000 (11:35 -0600)]
current_theme -> current_flavour (#229)

8 years agoMerge branch 'gs-master' into glitch-theme
David Yip [Mon, 4 Dec 2017 17:07:01 +0000 (11:07 -0600)]
Merge branch 'gs-master' into glitch-theme

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Mon, 4 Dec 2017 12:17:13 +0000 (12:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoUpdate mutes.js (#5882)
Neetshin [Mon, 4 Dec 2017 11:52:14 +0000 (17:22 +0530)]
Update mutes.js (#5882)

8 years agoFixed a name + localizations
kibigo! [Mon, 4 Dec 2017 08:19:39 +0000 (00:19 -0800)]
Fixed a name + localizations

8 years agoFixed image require
kibigo! [Mon, 4 Dec 2017 07:52:13 +0000 (23:52 -0800)]
Fixed image require

8 years agoRename themes -> flavours ? ?
kibigo! [Mon, 4 Dec 2017 07:26:40 +0000 (23:26 -0800)]
Rename themes -> flavours ? ?

8 years agoFixed typos
kibigo! [Mon, 4 Dec 2017 06:30:45 +0000 (22:30 -0800)]
Fixed typos

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Sun, 3 Dec 2017 21:17:13 +0000 (21:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoAdd keyboard shortcuts link to getting-started navigation (#5874)
Lynx Kotoura [Sun, 3 Dec 2017 20:29:51 +0000 (05:29 +0900)]
Add keyboard shortcuts link to getting-started navigation (#5874)

* Add keyboard shortcuts link to getting-started navigation

* i18n: 🇵🇱

* yarn manage:translations

8 years agoAdd back button to keyboard shortcuts legend column (#5872)
Lynx Kotoura [Sun, 3 Dec 2017 20:29:41 +0000 (05:29 +0900)]
Add back button to keyboard shortcuts legend column (#5872)

8 years agoUpdate dependencies for Node.js (2017-12-03) (#5876)
Yamagishi Kazutoshi [Sun, 3 Dec 2017 15:55:53 +0000 (00:55 +0900)]
Update dependencies for Node.js (2017-12-03) (#5876)

* Update babel-plugin-lodash to version 3.3.2

* Update enzyme to version 3.2.0

* Update enzyme-adapter-react-16 to version 1.1.0

* Update intersection-observer to version 0.5.0

* Update intl-messageformat to version 2.2.0

* Update node-sass to version 4.7.2

* Update postcss-loader to version 2.0.9

* Update React to version 16.2.0

* Update react-textarea-autosize to version 5.2.1

* Update stringz to version 0.3.0

* Update webpack to version 3.9.1

* Update webpack-bundle-analyzer to version 2.9.1

* Update webpack-dev-server to version 2.9.5

* Update webpack-merge to version 4.1.1

* Update fsevents to version 1.1.3

* yarn upgrade

8 years agoUpdate dependencies for Ruby (2017-12-03) (#5878)
Yamagishi Kazutoshi [Sun, 3 Dec 2017 15:55:27 +0000 (00:55 +0900)]
Update dependencies for Ruby (2017-12-03) (#5878)

* Update active_model_serializers to version 0.10.7

* Update capistrano-rails to version 1.3.1

* Update capistrano-rbenv to version 2.1.3

* Update capybara to version 2.16.1

* Update devise-two-factor to version 3.0.2

* Update i18n-tasks to version 0.8.19

* Update ox to version 2.8.2

* Update parallel_tests to version 2.19.0

* Update puma to version 3.11.0

* Update redis-namespace to version 1.6.0

* Update rspec-rails to version 3.7.2

* Update scss_lint to version 0.56.0

* Update webmock to version 3.1.1

* Update webpush to version 0.3.3

* bundle update

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Sat, 2 Dec 2017 14:17:11 +0000 (14:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoAdd Japanese translations for invite filter. (#5869)
mayaeh [Sat, 2 Dec 2017 14:09:56 +0000 (23:09 +0900)]
Add Japanese translations for invite filter. (#5869)

8 years agoRemove redundant import statement in SCSS (#5864)
cormo [Fri, 1 Dec 2017 23:42:20 +0000 (08:42 +0900)]
Remove redundant import statement in SCSS (#5864)

* Remove redudant import statement in SCSS

* Fix wrong chmod

8 years agoi18n: 🇵🇱 (#5865)
Marcin Mikołajczak [Fri, 1 Dec 2017 18:19:30 +0000 (19:19 +0100)]
i18n: 🇵🇱 (#5865)

8 years agoAdd invite filter (#5862)
Yamagishi Kazutoshi [Fri, 1 Dec 2017 15:40:02 +0000 (00:40 +0900)]
Add invite filter (#5862)

8 years agoFix invites form path (#5861)
Yamagishi Kazutoshi [Fri, 1 Dec 2017 11:26:57 +0000 (20:26 +0900)]
Fix invites form path (#5861)

8 years agoAllow admin to deactivate invite created by users (#5860)
Yamagishi Kazutoshi [Fri, 1 Dec 2017 11:26:19 +0000 (20:26 +0900)]
Allow admin to deactivate invite created by users (#5860)

8 years agoSkins support
kibigo! [Fri, 1 Dec 2017 03:29:47 +0000 (19:29 -0800)]
Skins support

8 years agoUpdate Japanese translations for KeyboardShortcuts. (#5858)
mayaeh [Fri, 1 Dec 2017 00:35:47 +0000 (09:35 +0900)]
Update Japanese translations for KeyboardShortcuts. (#5858)

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Thu, 30 Nov 2017 03:17:12 +0000 (03:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoAdd semi-support for Video/Image objects in ActivityPub (#5848)
Eugen Rochko [Thu, 30 Nov 2017 03:06:20 +0000 (04:06 +0100)]
Add semi-support for Video/Image objects in ActivityPub (#5848)

* Add semi-support for Video/Image objects in ActivityPub

Video and Image objects will create corresponding status records
with manually crafted text contents (title + URL)

* Extract html-url-finding logic into JsonLdHelper

* Fallback to id when url missing, extract supported object types

8 years agoFix too many forwards (#5854)
Eugen Rochko [Thu, 30 Nov 2017 02:50:05 +0000 (03:50 +0100)]
Fix too many forwards (#5854)

* Avoid sending explicit Undo->Announce when original deleted

* Do not forward a reply back to the server that sent it

* Deduplicate inboxes of rebloggers' followers for delete forwarding

* Adjust test

* Fix wrong class, bad SQL, wrong variable, outdated comment

8 years agoadd index on stream_entries table (#5793)
takayamaki [Thu, 30 Nov 2017 02:35:54 +0000 (11:35 +0900)]
add index on stream_entries table (#5793)

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Wed, 29 Nov 2017 22:17:13 +0000 (22:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoFix Korean translation (#5853)
Mayu Laierlence [Wed, 29 Nov 2017 22:16:29 +0000 (07:16 +0900)]
Fix Korean translation (#5853)

"어플리케이션" -> "애플리케이션"

8 years agoi18n: 🇵🇱 (#5851)
Marcin Mikołajczak [Wed, 29 Nov 2017 11:51:24 +0000 (12:51 +0100)]
i18n: 🇵🇱 (#5851)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoUpdate Japanese translations. (#5844)
mayaeh [Wed, 29 Nov 2017 06:41:21 +0000 (15:41 +0900)]
Update Japanese translations. (#5844)

8 years agoMerge pull request #232 from glitch-soc/hotkeys-glitch
David Yip [Tue, 28 Nov 2017 23:34:03 +0000 (17:34 -0600)]
Merge pull request #232 from glitch-soc/hotkeys-glitch

Implement status hotkeys + spoiler expanding

8 years agoNormalize pl translation.
David Yip [Tue, 28 Nov 2017 18:17:36 +0000 (12:17 -0600)]
Normalize pl translation.

8 years agoMerge remote-tracking branch 'origin/master' into gs-master
David Yip [Tue, 28 Nov 2017 17:45:13 +0000 (11:45 -0600)]
Merge remote-tracking branch 'origin/master' into gs-master

8 years agoShow "expired" in invite index (#5838)
Yamagishi Kazutoshi [Tue, 28 Nov 2017 14:41:02 +0000 (23:41 +0900)]
Show "expired" in invite index (#5838)

* Show "expired" in invite index

* "Force expire" -> "Deactivate"

8 years agoAllow hiding of reblogs from followed users (#5762)
aschmitz [Tue, 28 Nov 2017 14:00:35 +0000 (08:00 -0600)]
Allow hiding of reblogs from followed users (#5762)

* Allow hiding of reblogs from followed users

This adds a new entry to the account menu to allow users to hide
future reblogs from a user (and then if they've done that, to show
future reblogs instead).

This does not remove or add historical reblogs from/to the user's
timeline; it only affects new statuses.

The API for this operates by sending a "reblogs" key to the follow
endpoint. If this is sent when starting a new follow, it will be
respected from the beginning of the follow relationship (even if
the follow request must be approved by the followee). If this is
sent when a follow relationship already exists, it will simply
update the existing follow relationship. As with the notification
muting, this will now return an object ({reblogs: [true|false]}) or
false for each follow relationship when requesting relationship
information for an account. This should cause few issues due to an
object being truthy in many languages, but some modifications may
need to be made in pickier languages.

Database changes: adds a show_reblogs column (default true,
non-nullable) to the follows and follow_requests tables. Because
these are non-nullable, we use the existing MigrationHelpers to
perform this change without locking those tables, although the
tables are likely to be small anyway.

Tests included.

See also <https://github.com/glitch-soc/mastodon/pull/212>.

* Rubocop fixes

* Code review changes

* Test fixes

This patchset closes #648 and resolves #3271.

* Rubocop fix

* Revert reblogs defaulting in argument, fix tests

It turns out we needed this for the same reason we needed it in muting:
if nil gets passed in somehow (most usually by an API client not passing
any value), we need to detect and handle it.

We could specify a default in the parameter and then also catch nil, but
there's no great reason to duplicate the default value.

8 years agoFix handling of temporary failures in ProcessMentionsService (#5842)
ThibG [Tue, 28 Nov 2017 14:00:22 +0000 (15:00 +0100)]
Fix handling of temporary failures in ProcessMentionsService (#5842)

* Add test for temporary account resolving failures in ProcessMentionsService

* Fix processing of mentions to already-known remote accounts on temporary failures

8 years agoRefactor KeyboardShortcuts component (#5835)
Yamagishi Kazutoshi [Tue, 28 Nov 2017 13:32:27 +0000 (22:32 +0900)]
Refactor KeyboardShortcuts component (#5835)

8 years agoFix account migration feature (#5837)
nullkal [Tue, 28 Nov 2017 13:31:23 +0000 (22:31 +0900)]
Fix account migration feature (#5837)

* Make removable account migration

* Fix error during update of account migration setting

* Add notice when update account migration setting

8 years agoi18n: 🇵🇱 (#5841)
Marcin Mikołajczak [Tue, 28 Nov 2017 10:30:18 +0000 (11:30 +0100)]
i18n: 🇵🇱 (#5841)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoMerge remote-tracking branch 'tootsuite/master'
David Yip [Tue, 28 Nov 2017 04:33:26 +0000 (22:33 -0600)]
Merge remote-tracking branch 'tootsuite/master'

8 years agoNormalize config/locales/en.yml.
David Yip [Tue, 28 Nov 2017 04:32:31 +0000 (22:32 -0600)]
Normalize config/locales/en.yml.

8 years agoAdds spoiler hotkey support to detailed statuses
kibigo! [Mon, 27 Nov 2017 22:05:03 +0000 (14:05 -0800)]
Adds spoiler hotkey support to detailed statuses

8 years agoAdd UI for setting up account migration (#5832)
Eugen Rochko [Mon, 27 Nov 2017 21:47:06 +0000 (22:47 +0100)]
Add UI for setting up account migration (#5832)

8 years agoImplement status hotkeys + spoiler expanding
kibigo! [Mon, 27 Nov 2017 21:17:12 +0000 (13:17 -0800)]
Implement status hotkeys + spoiler expanding

8 years agoAdd Keyboard Shortcuts Legend (#5823)
Joshua Wood [Mon, 27 Nov 2017 20:31:58 +0000 (12:31 -0800)]
Add Keyboard Shortcuts Legend (#5823)

* Add Keyboard Shortcuts Legend

Adds a "Keyboard Shortcuts" legend (displayed in the rightmost column)
which is toggled via a new "?" hotkey. When subsequently pressed from
the Keyboard Shortcuts legend, "?" will navigate back to the previous
location.

* Add hidden table headings.

Makes the headings available for accessibility but hides them visually.

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Mon, 27 Nov 2017 20:17:12 +0000 (20:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoi18n: Update ja translation for consumable invites. (#5829)
mayaeh [Mon, 27 Nov 2017 19:23:14 +0000 (04:23 +0900)]
i18n: Update ja translation for consumable invites. (#5829)

* Add Japanese translation for consumable invites.

* Add Japanese translation.

* Update Japanese translation.

8 years agochore(yarn): Upgrade react-swipeable-views (smoother swiping) (#5830)
Sorin Davidoi [Mon, 27 Nov 2017 19:22:47 +0000 (20:22 +0100)]
chore(yarn): Upgrade react-swipeable-views (smoother swiping) (#5830)

8 years agoMerge indexes for reblog on statuses table (#5831)
unarist [Mon, 27 Nov 2017 19:22:27 +0000 (04:22 +0900)]
Merge indexes for reblog on statuses table (#5831)

We added an index for `[account_id, reblog_of_id]`, but we already have a similar index for `reblog_of_id`. Those index will be bigger according to statuses count. For example, `reblog_of_id` index uses 800MB for 10GB statuses table.

So this patch swaps indexed columns like `[reblog_of_id, account_id]`, then it will covers both usage with single index.

Since those index creation may take a while, I've also disabled previous index creation.

8 years agoMerge remote-tracking branch 'origin/master' into gs-master
David Yip [Mon, 27 Nov 2017 17:29:04 +0000 (11:29 -0600)]
Merge remote-tracking branch 'origin/master' into gs-master

8 years agoUse account.username when display_name is empty (#5828)
Yamagishi Kazutoshi [Mon, 27 Nov 2017 15:09:52 +0000 (00:09 +0900)]
Use account.username when display_name is empty (#5828)

8 years agoAdd consumable invites (#5814)
Eugen Rochko [Mon, 27 Nov 2017 15:07:59 +0000 (16:07 +0100)]
Add consumable invites (#5814)

* Add consumable invites

* Add UI for generating invite codes

* Add tests

* Display max uses and expiration in invites table, delete invite

* Remove unused column and redundant validator

- Default follows not used, probably bad idea
- InviteCodeValidator is redundant because RegistrationsController
  checks invite code validity

* Add admin setting to disable invites

* Add admin UI for invites, configurable role for invite creation

- Admin UI that lists everyone's invites, always available
- Admin setting min_invite_role to control who can invite people
- Non-admin invite UI only visible if users are allowed to

* Do not remove invites from database, expire them instantly

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Mon, 27 Nov 2017 05:17:11 +0000 (05:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoUse account.display_name for og:title single toot pages (#5821)
Alda Marteau-Hardi [Mon, 27 Nov 2017 04:31:26 +0000 (05:31 +0100)]
Use account.display_name for og:title single toot pages (#5821)

8 years agoDo not filter the status collection after muting and blocking (#5815)
Akihiko Odaki [Sun, 26 Nov 2017 00:45:17 +0000 (09:45 +0900)]
Do not filter the status collection after muting and blocking (#5815)

Filtering the status collection wipes out even the profiles of muted and
blocked accounts. However, the behavior is inconsistent with the server-
side behavior.

8 years agoi18n: (zh-CN) Add translations for #5746 & #5750 (#5816)
SerCom_KC [Sat, 25 Nov 2017 17:38:40 +0000 (01:38 +0800)]
i18n: (zh-CN) Add translations for #5746 & #5750 (#5816)

8 years agoAllow to open a modal for embedded photo (#5777)
Akihiko Odaki [Sat, 25 Nov 2017 14:41:45 +0000 (23:41 +0900)]
Allow to open a modal for embedded photo (#5777)

8 years agoRename ariaLabel property of Dropdown to title (#5813)
Akihiko Odaki [Sat, 25 Nov 2017 14:41:08 +0000 (23:41 +0900)]
Rename ariaLabel property of Dropdown to title (#5813)

DropdownMenu has ariaLabel property, but it is actually applied to title
property of IconButton. Keep it consistent.

8 years agoUpdated Catalan strings (#5801)
spla [Sat, 25 Nov 2017 14:22:59 +0000 (15:22 +0100)]
Updated Catalan strings (#5801)

* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Sat, 25 Nov 2017 05:17:15 +0000 (05:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoChange navigation link for moderators (#5812)
Yamagishi Kazutoshi [Sat, 25 Nov 2017 04:53:54 +0000 (13:53 +0900)]
Change navigation link for moderators (#5812)

8 years agoAdd Japanese translations (#5810)
Yamagishi Kazutoshi [Sat, 25 Nov 2017 02:39:57 +0000 (11:39 +0900)]
Add Japanese translations (#5810)

* yarn manage:translations

* Add Japanese translation for #5087

* Add Japanese translation for #5616

* Add Japanese translation for #5746

* Add Japanese translation for #5750

8 years agostatus: preserve visibility attribute when reblogging (infoleak fix) (#5789)
William Pitcock [Sat, 25 Nov 2017 00:36:08 +0000 (18:36 -0600)]
status: preserve visibility attribute when reblogging (infoleak fix) (#5789)

this should fix *all* remaining visibility-related mastodon ostatus infoleaks.
thanks to @csaurus@gnusocial.de for pointing out the infoleak.

8 years agoDisplay list column (#5750)
Eugen Rochko [Fri, 24 Nov 2017 23:35:37 +0000 (00:35 +0100)]
Display list column (#5750)

8 years agoFix unnecessary order (#5807)
abcang [Fri, 24 Nov 2017 17:41:07 +0000 (02:41 +0900)]
Fix unnecessary order (#5807)

8 years agoDon't remove originals of boosted toots from timeline (#5479)
sdukhovni [Fri, 24 Nov 2017 13:43:53 +0000 (08:43 -0500)]
Don't remove originals of boosted toots from timeline (#5479)

* Don't remove originals of boosted toots from timeline

* Remove unused argument to updateTimeline

8 years agoAdd tests for Streamable (#5771)
ysksn [Fri, 24 Nov 2017 13:42:57 +0000 (22:42 +0900)]
Add tests for Streamable (#5771)

8 years agoAdd index of account and reblog to statuses (#5785)
abcang [Fri, 24 Nov 2017 13:42:09 +0000 (22:42 +0900)]
Add index of account and reblog to statuses (#5785)

8 years agoAdd tests for AccountRelationshipsPresenter (#5805)
ysksn [Fri, 24 Nov 2017 13:41:04 +0000 (22:41 +0900)]
Add tests for AccountRelationshipsPresenter (#5805)

8 years agoi18n: Update ja translations (#5804)
mayaeh [Fri, 24 Nov 2017 12:14:31 +0000 (21:14 +0900)]
i18n: Update ja translations (#5804)

* Add Japanese translations.

* Update Japanese translations.

* Fix japanese translation.

8 years agoDo not require onClose property in NavigationBar (#5802)
Akihiko Odaki [Fri, 24 Nov 2017 12:13:17 +0000 (21:13 +0900)]
Do not require onClose property in NavigationBar (#5802)

NavigationBar can be used as mock as it is in OnboardingModal. In such a
case, onClose property is not required.

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Fri, 24 Nov 2017 01:17:20 +0000 (01:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoAdd logging of admin actions (#5757)
Eugen Rochko [Fri, 24 Nov 2017 01:05:53 +0000 (02:05 +0100)]
Add logging of admin actions (#5757)

* Add logging of admin actions

* Update brakeman whitelist

* Log creates, updates and destroys with history of changes

* i18n: Update Polish translation (#5782)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Split admin navigation into moderation and administration

* Redesign audit log page

* 🇵🇱 (#5795)

* Add color coding to audit log

* Change dismiss->resolve, log all outcomes of report as resolve

* Update terminology (e-mail blacklist) (#5796)

* Update terminology (e-mail blacklist)

imho looks better

* Update en.yml

* Fix code style issues

* i18n-tasks normalize

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Thu, 23 Nov 2017 21:17:14 +0000 (21:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoDisable Code Climate maintainability checks (#5798)
Devon Blandin [Thu, 23 Nov 2017 20:38:17 +0000 (15:38 -0500)]
Disable Code Climate maintainability checks (#5798)

- Migrate `.codeclimate.yml` to version 2 structure
- Disable Code Climate [maintainability checks][]

https://docs.codeclimate.com/docs/advanced-configuration

[maintainability checks]: http://blog.codeclimate.com/blog/2017/10/12/10-point-technical-debt-assessment

This commit upgrades the Code Climate configuration file and disables
the new maintainability checks.

Once this PR is merged, we can experiment with the new checks via pull
requests (the PR will report new issues) or via the [Code Climate
CLI][cli], which [now also supports the new maintainability
checks][cli-support].

[cli]: https://github.com/codeclimate/codeclimate
[cli-support]: https://codeclimate.com/changelog/5a0e488824cfa902a300091c

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Thu, 23 Nov 2017 02:17:12 +0000 (02:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoi18n: (zh-CN) Add translations for #5746 & #5735 (#5764)
SerCom_KC [Thu, 23 Nov 2017 01:49:21 +0000 (09:49 +0800)]
i18n: (zh-CN) Add translations for #5746 & #5735 (#5764)

8 years agoStyling fixes
kibigo! [Wed, 22 Nov 2017 03:00:07 +0000 (19:00 -0800)]
Styling fixes

8 years agoUpdate statuses on hidden toggle (Fixes #227)
kibigo! [Wed, 22 Nov 2017 02:27:34 +0000 (18:27 -0800)]
Update statuses on hidden toggle (Fixes #227)

8 years agoMinor fixes
kibigo! [Wed, 22 Nov 2017 02:17:38 +0000 (18:17 -0800)]
Minor fixes

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Tue, 21 Nov 2017 17:17:11 +0000 (17:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoi18n: Update Polish translation - front-end added (#231)
Marcin Mikołajczak [Tue, 21 Nov 2017 16:53:13 +0000 (17:53 +0100)]
i18n: Update Polish translation - front-end added (#231)

* i18n: Update Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* i18n: Update Polish translation

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoAdd Japanese translations. (#5769)
mayaeh [Tue, 21 Nov 2017 16:11:33 +0000 (01:11 +0900)]
Add Japanese translations. (#5769)

8 years agoupdate code of conduct email address
beatrix [Tue, 21 Nov 2017 16:01:28 +0000 (11:01 -0500)]
update code of conduct email address

8 years agoi18n: Update Polish translation - back-end (#230)
Marcin Mikołajczak [Tue, 21 Nov 2017 15:36:22 +0000 (16:36 +0100)]
i18n: Update Polish translation - back-end (#230)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoUpdate and fix Catalan translation (#5773)
Joan Montané [Tue, 21 Nov 2017 14:17:28 +0000 (15:17 +0100)]
Update and fix Catalan translation (#5773)

* Update activerecord.ca.yml

* Update ca.yml

* Update devise.ca.yml

* Update doorkeeper.ca.yml

* Update simple_form.ca.yml

* fix syntax error for ca translation

* fix syntax errors in ca translations

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
8 years agoFinalized theme loading and stuff
kibigo! [Tue, 21 Nov 2017 06:13:37 +0000 (22:13 -0800)]
Finalized theme loading and stuff

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Tue, 21 Nov 2017 05:17:12 +0000 (05:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoAdd tests for Remotable (#5768)
ysksn [Tue, 21 Nov 2017 04:59:36 +0000 (13:59 +0900)]
Add tests for Remotable (#5768)

8 years agoFixed duplicating URL of photo type of oEmbed (#5763)
abcang [Mon, 20 Nov 2017 19:45:54 +0000 (04:45 +0900)]
Fixed duplicating URL of photo type of oEmbed (#5763)

8 years agoMerge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Jenkins [Sun, 19 Nov 2017 15:17:12 +0000 (15:17 +0000)]
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

8 years agoFix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753)
abcang [Sun, 19 Nov 2017 14:33:15 +0000 (23:33 +0900)]
Fix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753)

8 years agoFix N+1 at notification (#5752)
abcang [Sun, 19 Nov 2017 14:32:48 +0000 (23:32 +0900)]
Fix N+1 at notification (#5752)

8 years agoUpdate .following_map examples with show-reblogs information.
David Yip [Sun, 19 Nov 2017 08:56:45 +0000 (02:56 -0600)]
Update .following_map examples with show-reblogs information.

8 years agoMerge remote-tracking branch 'tootsuite/master'
David Yip [Sun, 19 Nov 2017 07:30:29 +0000 (01:30 -0600)]
Merge remote-tracking branch 'tootsuite/master'

8 years agoi18n: Update ja translation for moderator badge. (#5731)
mayaeh [Sun, 19 Nov 2017 03:16:56 +0000 (12:16 +0900)]
i18n: Update ja translation for moderator badge. (#5731)

* Update Japanese translation for moderator badge.

* Follows English notation

8 years agoAdd tests for AccountInteractions (#5751)
ysksn [Sun, 19 Nov 2017 03:16:14 +0000 (12:16 +0900)]
Add tests for AccountInteractions (#5751)

* Add tests for class methods of AccountInteractions

* Add tests for instance methods of AccountInteractions

8 years agoRemove translations of default theme (#5741)
Lynx Kotoura [Sun, 19 Nov 2017 03:15:50 +0000 (12:15 +0900)]
Remove translations of default theme (#5741)