]> cat aescling's git repositories - mastodon.git/log
mastodon.git
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 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 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 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 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)

8 years agoAdd a test for Settings::Extend#settings (#5720)
ysksn [Sun, 19 Nov 2017 03:15:32 +0000 (12:15 +0900)]
Add a test for Settings::Extend#settings (#5720)

8 years agoAdd tests for Status#title (#5718)
ysksn [Sun, 19 Nov 2017 03:15:17 +0000 (12:15 +0900)]
Add tests for Status#title (#5718)

8 years agoAdd “staff” badge to admin user pages (#5735)
Yamagishi Kazutoshi [Sun, 19 Nov 2017 03:13:57 +0000 (12:13 +0900)]
Add “staff” badge to admin user pages (#5735)

* Allow staff badge to change from setting to hidden

* i18n: Update Polish translation

8 years agoMerge pull request #226 from glitch-soc/glitch-theme
beatrix [Sun, 19 Nov 2017 01:32:17 +0000 (20:32 -0500)]
Merge pull request #226 from glitch-soc/glitch-theme

Glitch/Vanilla themes

8 years agoi18n: Update Polish translation (#5749)
Marcin Mikołajczak [Sat, 18 Nov 2017 20:43:10 +0000 (21:43 +0100)]
i18n: Update Polish translation (#5749)

8 years agoEnabled vanilla thmee
kibigo! [Sat, 18 Nov 2017 19:06:04 +0000 (11:06 -0800)]
Enabled vanilla thmee

8 years agoPublic pack fix
kibigo! [Sat, 18 Nov 2017 19:05:39 +0000 (11:05 -0800)]
Public pack fix

8 years agoMedia styling
kibigo! [Sat, 18 Nov 2017 19:05:23 +0000 (11:05 -0800)]
Media styling

8 years agoFont styles are now packagified
kibigo! [Sat, 18 Nov 2017 19:05:00 +0000 (11:05 -0800)]
Font styles are now packagified

8 years agoProfile redirect notes (#5746)
Eugen Rochko [Sat, 18 Nov 2017 18:39:02 +0000 (19:39 +0100)]
Profile redirect notes (#5746)

* Serialize moved accounts into REST and ActivityPub APIs

* Parse federated moved accounts from ActivityPub

* Add note about moved accounts to public profiles

* Add moved account message to web UI

* Fix code style issues

8 years agoMerge pull request #208 from yipdw/keyword-mute
beatrix [Sat, 18 Nov 2017 17:06:40 +0000 (12:06 -0500)]
Merge pull request #208 from yipdw/keyword-mute

Run keyword mutes on hashtags

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

8 years agoUpdating Chinese (Simplified) translations (#5725)
SerCom_KC [Sat, 18 Nov 2017 05:35:11 +0000 (13:35 +0800)]
Updating Chinese (Simplified) translations (#5725)

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Change `静音` to `隐藏`

* i18n: (zh-CN) Add translations for #5087 & #5669

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Improve translations

* i18n: (zh-CN) Add missing translation for #5728

8 years agoMake it possible to bind streming service to 0.0.0.0 (#5744)
Baptiste Gelez [Sat, 18 Nov 2017 03:44:19 +0000 (04:44 +0100)]
Make it possible to bind streming service to 0.0.0.0 (#5744)

8 years agoSets default theme to glitch
kibigo! [Sat, 18 Nov 2017 03:32:04 +0000 (19:32 -0800)]
Sets default theme to glitch

8 years agoRemoved glitch tests
kibigo! [Sat, 18 Nov 2017 03:25:06 +0000 (19:25 -0800)]
Removed glitch tests

8 years agoRestore vanilla components
kibigo! [Sat, 18 Nov 2017 03:16:35 +0000 (19:16 -0800)]
Restore vanilla components

8 years agoForking glitch theme
kibigo! [Sat, 18 Nov 2017 03:11:18 +0000 (19:11 -0800)]
Forking glitch theme

8 years agoMerge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size
beatrix [Sat, 18 Nov 2017 00:02:40 +0000 (19:02 -0500)]
Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size

Make character limit configurable (from tootsuite/mastodon#5697)

8 years agoMerge pull request #224 from yipdw/merge-upstream
David Yip [Fri, 17 Nov 2017 23:58:13 +0000 (17:58 -0600)]
Merge pull request #224 from yipdw/merge-upstream

Merge upstream (tootsuite/mastodon#5703)

8 years agoUpdate annotations on Follow, FollowRequest, and Mute.
David Yip [Fri, 17 Nov 2017 23:41:15 +0000 (17:41 -0600)]
Update annotations on Follow, FollowRequest, and Mute.

Follow and FollowRequest had conflicts in their schema annotations, so I
ran latest migrations and let annotate_models fix them up.

8 years agoMerge remote-tracking branch 'origin/master' into merge-upstream
David Yip [Fri, 17 Nov 2017 23:40:00 +0000 (17:40 -0600)]
Merge remote-tracking branch 'origin/master' into merge-upstream

8 years agoLists (#5703)
Eugen Rochko [Fri, 17 Nov 2017 23:16:48 +0000 (00:16 +0100)]
Lists (#5703)

* Add structure for lists

* Add list timeline streaming API

* Add list APIs, bind list-account relation to follow relation

* Add API for adding/removing accounts from lists

* Add pagination to lists API

* Add pagination to list accounts API

* Adjust scopes for new APIs

- Creating and modifying lists merely requires "write" scope
- Fetching information about lists merely requires "read" scope

* Add test for wrong user context on list timeline

* Clean up tests

8 years agoMerge pull request #222 from yipdw/merge/tootsuite/master
David Yip [Fri, 17 Nov 2017 20:35:16 +0000 (14:35 -0600)]
Merge pull request #222 from yipdw/merge/tootsuite/master

Merge upstream (e28b33c.. 94c5a11)

8 years agoMerge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into...
David Yip [Fri, 17 Nov 2017 20:28:16 +0000 (14:28 -0600)]
Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size

8 years agoMerge pull request #221 from glitch-soc/local-only-policy
beatrix [Fri, 17 Nov 2017 20:17:49 +0000 (15:17 -0500)]
Merge pull request #221 from glitch-soc/local-only-policy

Update StatusPolicy to check current_account for local_only? toots.

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

8 years agoMerge pull request #218 from glitch-soc/themed-prefetching
David Yip [Fri, 17 Nov 2017 20:01:23 +0000 (14:01 -0600)]
Merge pull request #218 from glitch-soc/themed-prefetching

Themed preloading

8 years agoIncrease contrast of Admin badges (#5740)
Lynx Kotoura [Fri, 17 Nov 2017 18:59:53 +0000 (03:59 +0900)]
Increase contrast of Admin badges (#5740)

To comply WCAG 2.0 guidelines on contrast ratio.

8 years agoFix regression #5467: fixes emoji copy (#5739)
Clworld [Fri, 17 Nov 2017 17:22:31 +0000 (02:22 +0900)]
Fix regression #5467: fixes emoji copy (#5739)

8 years agoChange libinconv download URL to HTTPS (#5738)
Alex Coto [Fri, 17 Nov 2017 17:21:05 +0000 (12:21 -0500)]
Change libinconv download URL to HTTPS (#5738)

8 years agoUpdate StatusPolicy to check current_account for local_only? toots.
David Yip [Fri, 17 Nov 2017 15:07:21 +0000 (09:07 -0600)]
Update StatusPolicy to check current_account for local_only? toots.

StatusPolicy#account was renamed to StatusPolicy#current_account in
upstream.  This commit renames the local-only changes to match and
augments the #show? policy spec with what we expect for local-only
toots.

8 years agoMove "Permissions" row into main table in /admin/accounts/:id (#5734)
unarist [Fri, 17 Nov 2017 14:18:20 +0000 (23:18 +0900)]
Move "Permissions" row into main table in /admin/accounts/:id (#5734)

8 years agoAdd trailing comma in mapStateToProps
David Yip [Fri, 17 Nov 2017 06:24:22 +0000 (00:24 -0600)]
Add trailing comma in mapStateToProps

Consistency, eslint, etc.

8 years agoMerge pull request #219 from glitch-soc/no-spin
David Yip [Fri, 17 Nov 2017 06:14:24 +0000 (00:14 -0600)]
Merge pull request #219 from glitch-soc/no-spin

Remove 'spin' theme

8 years agoThrow layout, isWide, navbarUnder back into mapStateToProps.
David Yip [Fri, 17 Nov 2017 06:11:01 +0000 (00:11 -0600)]
Throw layout, isWide, navbarUnder back into mapStateToProps.

This gets wide view, auto layout, and navbar-under-mobile working again.

8 years agoRemoves spin theme
kibigo! [Fri, 17 Nov 2017 05:50:07 +0000 (21:50 -0800)]
Removes spin theme