about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-11-30Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-30Add semi-support for Video/Image objects in ActivityPub (#5848)Eugen Rochko
* 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
2017-11-30Fix too many forwards (#5854)Eugen Rochko
* 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
2017-11-30add index on stream_entries table (#5793)takayamaki
2017-11-29Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-30Fix Korean translation (#5853)Mayu Laierlence
"어플리케이션" -> "애플리케이션"
2017-11-29i18n: 🇵🇱 (#5851)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-29Update Japanese translations. (#5844)mayaeh
2017-11-28Merge pull request #232 from glitch-soc/hotkeys-glitchDavid Yip
Implement status hotkeys + spoiler expanding
2017-11-28Normalize pl translation.David Yip
2017-11-28Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-28Show "expired" in invite index (#5838)Yamagishi Kazutoshi
* Show "expired" in invite index * "Force expire" -> "Deactivate"
2017-11-28Allow hiding of reblogs from followed users (#5762)aschmitz
* 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.
2017-11-28Fix handling of temporary failures in ProcessMentionsService (#5842)ThibG
* Add test for temporary account resolving failures in ProcessMentionsService * Fix processing of mentions to already-known remote accounts on temporary failures
2017-11-28Refactor KeyboardShortcuts component (#5835)Yamagishi Kazutoshi
2017-11-28Fix account migration feature (#5837)nullkal
* Make removable account migration * Fix error during update of account migration setting * Add notice when update account migration setting
2017-11-28i18n: 🇵🇱 (#5841)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-11-27Merge remote-tracking branch 'tootsuite/master'David Yip
2017-11-27Normalize config/locales/en.yml.David Yip
2017-11-27Adds spoiler hotkey support to detailed statuseskibigo!
2017-11-27Add UI for setting up account migration (#5832)Eugen Rochko
2017-11-27Implement status hotkeys + spoiler expandingkibigo!
2017-11-27Add Keyboard Shortcuts Legend (#5823)Joshua Wood
* 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.
2017-11-27Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-27i18n: Update ja translation for consumable invites. (#5829)mayaeh
* Add Japanese translation for consumable invites. * Add Japanese translation. * Update Japanese translation.
2017-11-27chore(yarn): Upgrade react-swipeable-views (smoother swiping) (#5830)Sorin Davidoi
2017-11-27Merge indexes for reblog on statuses table (#5831)unarist
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.
2017-11-27Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
2017-11-27Use account.username when display_name is empty (#5828)Yamagishi Kazutoshi
2017-11-27Add consumable invites (#5814)Eugen Rochko
* 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
2017-11-27Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-27Use account.display_name for og:title single toot pages (#5821)Alda Marteau-Hardi
2017-11-26Do not filter the status collection after muting and blocking (#5815)Akihiko Odaki
Filtering the status collection wipes out even the profiles of muted and blocked accounts. However, the behavior is inconsistent with the server- side behavior.
2017-11-26i18n: (zh-CN) Add translations for #5746 & #5750 (#5816)SerCom_KC
2017-11-25Allow to open a modal for embedded photo (#5777)Akihiko Odaki
2017-11-25Rename ariaLabel property of Dropdown to title (#5813)Akihiko Odaki
DropdownMenu has ariaLabel property, but it is actually applied to title property of IconButton. Keep it consistent.
2017-11-25Updated Catalan strings (#5801)spla
* 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
2017-11-25Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-11-25Change navigation link for moderators (#5812)Yamagishi Kazutoshi
2017-11-25Add Japanese translations (#5810)Yamagishi Kazutoshi
* yarn manage:translations * Add Japanese translation for #5087 * Add Japanese translation for #5616 * Add Japanese translation for #5746 * Add Japanese translation for #5750
2017-11-25status: preserve visibility attribute when reblogging (infoleak fix) (#5789)William Pitcock
this should fix *all* remaining visibility-related mastodon ostatus infoleaks. thanks to @csaurus@gnusocial.de for pointing out the infoleak.
2017-11-25Display list column (#5750)Eugen Rochko
2017-11-24Fix unnecessary order (#5807)abcang
2017-11-24Don't remove originals of boosted toots from timeline (#5479)sdukhovni
* Don't remove originals of boosted toots from timeline * Remove unused argument to updateTimeline
2017-11-24Add tests for Streamable (#5771)ysksn
2017-11-24Add index of account and reblog to statuses (#5785)abcang
2017-11-24Add tests for AccountRelationshipsPresenter (#5805)ysksn
2017-11-24i18n: Update ja translations (#5804)mayaeh
* Add Japanese translations. * Update Japanese translations. * Fix japanese translation.
2017-11-24Do not require onClose property in NavigationBar (#5802)Akihiko Odaki
NavigationBar can be used as mock as it is in OnboardingModal. In such a case, onClose property is not required.
2017-11-24Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins