about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-12-06Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-masterDavid Yip
2017-12-06Merge pull request #238 from ncls7615/config-locales-jabeatrix
i18n: Update Japanese translation
2017-12-07Update ja.ymlNCLS
2017-12-06Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-07i18n: 🇵🇱 (#5903)Marcin Mikołajczak
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
2017-12-06Fix list editor modal on narrow devices (#5904)Lynx Kotoura
2017-12-06Fix extra space between status text and username (#5902)Lynx Kotoura
2017-12-06Bump version to 2.1.0rc1 (#5834)Eugen Rochko
2017-12-06Break out nested relationship API keys (#5887)aschmitz
* Break out nested relationship API keys This closes #5856 by restoring the existing behavior of the `muting` and `following` keys (returning booleans rather than truthy or false). It adds `showing_reblogs` and `muting_notifications` keys: * `showing_reblogs` returns true if: 1. You've requested to follow the user, with reblogs shown, or 2. You are following the user, with reblogs shown. * `muting_notifications` returns true if you have muted the user and their notifications as well. * Rubocop fix * Fix pulling reblog/mute status from relationships I could swear this had passed tests before, but apparently not. Works now. * More test fixes Really, you'd expect this to be more straightforward.
2017-12-06Fix emoji picker scrollbar (regression from #5046) (#5901)Yamagishi Kazutoshi
2017-12-06Handle submit event of new list form (#5895)Yamagishi Kazutoshi
2017-12-06Search only from followees (#5897)Yamagishi Kazutoshi
2017-12-06Update Yarn to version 1.3.2 (#5900)Yamagishi Kazutoshi
2017-12-06Yarn install from Debian package repository (#5899)Yamagishi Kazutoshi
2017-12-06Using double splat operator (#5859)Yamagishi Kazutoshi
2017-12-06Remove rabl dependency (#5894)Eugen Rochko
* Remove rabl dependency * Replicate old Oj configuration
2017-12-06Update Japanese translations. (#5893)mayaeh
2017-12-05Lists redis clean-up (#5886)Eugen Rochko
* When list is deleted, remove feed from redis * Clean up list feeds of inactive users
2017-12-05Add list of lists component to web UI (#5811)Eugen Rochko
* Add list of lists component to web UI * Add list adding * Add list removing * List editor modal * Add API account search limited by following=true relation * Rework list editor modal * Remove mandatory pagination of GET /api/v1/lists/:id/accounts * Adjust search input placeholder * Fix rspec (#5890) * i18n: (zh-CN) Add missing translations for #5811 (#5891) * i18n: (zh-CN) yarn manage:translations -- zh-CN * i18n: (zh-CN) Add missing translations for #5811 * Fix some issues - Display loading/missing state for list timelines - Order lists alphabetically in overview - Fix async list editor reset - Redirect to /lists after deleting unpinned list - Redirect to / after pinning a list * Remove dead list columns when a list is deleted or fetch returns 404
2017-12-06Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849)SerCom_KC
* i18n: (zh-CN) Add missing translations for multiple PRs. Related PRs: #5838 #5762 #5835 #5837 #5832 #5823 #5814 #5757 * i18n: (zh-CN) Fix translation for #5823 / #5835 * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Improve translations * i18n: (zh-CN) Change `发送者` to `作者` * i18n: (zh-CN) Add missing translations for #5862 * i18n: (zh-CN) Add missing translation for #5874 * i18n: (zh-CN) Improve translations for keyboard shortcuts
2017-12-05Add aria-autocomplete='list' in Textaria (#5889)Neetshin
ref: https://www.w3.org/TR/wai-aria-1.1/#aria-autocomplete
2017-12-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-04Update mutes.js (#5882)Neetshin
2017-12-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-03Add keyboard shortcuts link to getting-started navigation (#5874)Lynx Kotoura
* Add keyboard shortcuts link to getting-started navigation * i18n: 🇵🇱 * yarn manage:translations
2017-12-03Add back button to keyboard shortcuts legend column (#5872)Lynx Kotoura
2017-12-03Update dependencies for Node.js (2017-12-03) (#5876)Yamagishi Kazutoshi
* 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
2017-12-03Update dependencies for Ruby (2017-12-03) (#5878)Yamagishi Kazutoshi
* 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
2017-12-02Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-02Add Japanese translations for invite filter. (#5869)mayaeh
2017-12-02Remove redundant import statement in SCSS (#5864)cormo
* Remove redudant import statement in SCSS * Fix wrong chmod
2017-12-02i18n: 🇵🇱 (#5865)Marcin Mikołajczak
2017-12-01Add invite filter (#5862)Yamagishi Kazutoshi
2017-12-01Fix invites form path (#5861)Yamagishi Kazutoshi
2017-12-01Allow admin to deactivate invite created by users (#5860)Yamagishi Kazutoshi
2017-12-01Update Japanese translations for KeyboardShortcuts. (#5858)mayaeh
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
generated by cgit-pink (git 2.37.1) at 2024-11-09 10:17:41 +0000