about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2017-12-04Various fixeskibigo!
2017-12-04current_theme -> current_flavour (#229)David Yip
2017-12-04Merge branch 'gs-master' into glitch-themeDavid Yip
2017-12-04Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-04Update mutes.js (#5882)Neetshin
2017-12-04Fixed a name + localizationskibigo!
2017-12-03Fixed image requirekibigo!
2017-12-03Rename themes -> flavours ? ?kibigo!
2017-12-03Fixed typoskibigo!
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-11-30Skins supportkibigo!
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
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.