Commit Graph

  • b316d373ea Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-05-04 12:16:12 -05:00
  • 2058922cc9 Merge branch 'merge-upstream' into gs-master David Yip 2018-05-04 12:04:55 -05:00
  • 1aa25ee0f5 Merge pull request #456 from m4sk1n/glitch-contrast David Yip 2018-05-04 11:47:49 -05:00
  • d181aad033 Improve “how to translate” (#7358) Marcin Mikołajczak 2018-05-04 18:37:37 +02:00
  • 00ff8dc00a Add translate guide to CONTRIBUTING.md (#7355) Yamagishi Kazutoshi 2018-05-05 01:01:12 +09:00
  • a7a61889d7 “Enable” high contrast theme Marcin Mikołajczak 2018-05-04 17:50:11 +02:00
  • 54e80bec73 Remove duplicate posix-spawn entry from Gemfile. David Yip 2018-05-04 10:11:45 -05:00
  • e41332c37b Make posix-spawn spec in Gemfile match what's in Gemfile.lock. David Yip 2018-05-04 09:51:18 -05:00
  • 77a92d3260 Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-05-04 09:42:31 -05:00
  • 251bbf9728 Show remote reports in admin UI as coming from domain rather than user (#7347) Eugen Rochko 2018-05-04 13:26:25 +02:00
  • a78b27c7cc Marginally improve convert/ffmpeg calls performance with posix-spawn (#7346) Eugen Rochko 2018-05-04 13:22:23 +02:00
  • c511b0f72a Merge remote-tracking branch 'glitchsoc/master' into gs-master David Yip 2018-05-04 03:47:35 -05:00
  • da70208b45 Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-05-04 03:23:57 -05:00
  • 63f848ac8c Merge pull request #453 from ThibG/glitch-soc/features/short-date David Yip 2018-05-04 03:08:28 -05:00
  • 2d392fb3b8 Remove unused translations. David Yip 2018-05-04 03:01:10 -05:00
  • 106a5d7b83 Remove unnecessary code from MediaAttachment#set_type_and_extension. David Yip 2018-05-04 02:38:04 -05:00
  • c61ddd8249 Fix 2fa description in Japanese (#7349) Shuhei Kitagawa 2018-05-04 13:58:08 +09:00
  • c816701550 Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-05-03 17:23:44 -05:00
  • a24605961a Fixes/do not override timestamps (#7336) ThibG 2018-05-03 23:02:46 +02:00
  • 8c601b54cc Do not re-position scroll when loading more (inserting items from below) (#7344) ThibG 2018-05-03 22:32:05 +02:00
  • a7e71bbd08 Add a missing question mark in rack_attack.rb (#7338) Akihiko Odaki 2018-05-04 01:51:00 +09:00
  • b1d4471e36 Throttle media post (#7337) Akihiko Odaki 2018-05-04 00:32:00 +09:00
  • 7495a3470e Add el and te (#7332) Yamagishi Kazutoshi 2018-05-03 22:54:10 +09:00
  • e9c5c16ba0 Delete dump.rdb (#7334) Yamagishi Kazutoshi 2018-05-03 21:30:18 +09:00
  • 581a5c9d29 Fixes/do not override timestamps (#7331) ThibG 2018-05-03 13:33:08 +02:00
  • d5fa4fbcd2 Revert "Do not override timestamps for incoming toots" (#7330) Eugen Rochko 2018-05-03 12:32:33 +02:00
  • dfa6bccb64 Weblate translations 20180503 (#7325) Renato "Lond" Cerqueira 2018-05-03 12:12:09 +02:00
  • 58852695c8 Prevent timeline from moving when cursor is hovering over it (fixes #7278) (#7327) ThibG 2018-05-03 12:09:11 +02:00
  • ab773e4d5f Add pry-byebug (#7307) Shuhei Kitagawa 2018-05-03 19:08:54 +09:00
  • bd36791832 Do not override timestamps for incoming toots (#7326) ThibG 2018-05-03 11:42:52 +02:00
  • 28b366d065 Add missing tests for report.rb (#7324) Shuhei Kitagawa 2018-05-03 17:42:36 +09:00
  • ad5d3134e4 Place emoji picker top if it is closer to the bottom of the viewport (fixes #7277) (#7314) ThibG 2018-05-03 10:42:18 +02:00
  • a5293fdf61 Fix n+1 queries in StatusThreadingConcern (#7321) Eugen Rochko 2018-05-03 10:41:58 +02:00
  • a3d84e705a Fix cache_associated no longer working (#7320) Eugen Rochko 2018-05-03 10:41:41 +02:00
  • 28bd4b9800 Serialize webfinger XML with Ox instead of Nokogiri (#7319) Eugen Rochko 2018-05-02 22:28:46 +02:00
  • 658cbc9425 Improve PostStatusService performance (#7317) Eugen Rochko 2018-05-02 22:10:57 +02:00
  • cb5b5cb5f7 Slightly reduce RAM usage (#7301) Eugen Rochko 2018-05-02 18:58:48 +02:00
  • 71a7cea73f Keep notification when muting_notifications is true (#7311) abcang 2018-05-02 23:14:51 +09:00
  • d0cdd5cf94 Accept actor object updates from all supported actor types (#7312) ThibG 2018-05-02 16:08:16 +02:00
  • cae933510c Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288) Eugen Rochko 2018-05-02 15:57:37 +02:00
  • f62539ce5c Remove most behaviour disparities between blocks and mutes (#7231) Eugen Rochko 2018-05-02 15:50:20 +02:00
  • c5dcd7d836 Speed up test suite by not generating RSA keys in test environment (#7296) Eugen Rochko 2018-05-02 15:45:24 +02:00
  • 965345316f Guard against nil URLs in Request class (#7284) Eugen Rochko 2018-05-02 15:44:22 +02:00
  • 6c40e567aa Add missing tests for user.rb (#7306) Shuhei Kitagawa 2018-05-02 21:13:52 +09:00
  • 70a16d8858 [Glitch] Improve relative timestamps in web UI Thibaut Girka 2018-05-02 13:45:40 +02:00
  • dc786c0cf4 Support Actors/Statuses with multiple types (#7305) Surinna Curtis 2018-05-02 05:40:24 -05:00
  • 86efccce2a Fix low-contrasted cancel button of reply indicator (#7300) Lynx Kotoura 2018-05-01 21:02:04 +09:00
  • 3a47842223 Merge pull request #451 from glitch-soc/450-make-non-whole-word-mutes-case-insensitive David Yip 2018-04-30 22:38:10 -05:00
  • 5f8f481425 Also treat non-whole-word mutes as case-insensitive. #450. David Yip 2018-04-30 20:08:22 -05:00
  • 705f1d7bf1 Fix missing updated_at attribute on emoji EntityCache (#7297) Eugen Rochko 2018-04-30 22:49:33 +02:00
  • 16468bdf1b [i18n] Occitan update (#7294) Yamagishi Kazutoshi 2018-04-30 20:14:50 +09:00
  • f62ee1ddb0 Disable API access when login is disabled (#7289) Eugen Rochko 2018-04-30 09:13:14 +02:00
  • 295e3ef02b Fix missing domain attribute in EntityCache for emoji (#7290) Eugen Rochko 2018-04-30 09:12:55 +02:00
  • 54f34d3f2a Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287) Eugen Rochko 2018-04-30 09:12:36 +02:00
  • da61352fab Fix "Show more" URL on paginated threads for remote statuses (#7285) Eugen Rochko 2018-04-30 01:59:42 +02:00
  • 356d0214c9 Implement tootsuite-style account fields Thibaut Girka 2018-04-29 16:24:15 +02:00
  • 91fb82a4dd Fix style of account fields form Thibaut Girka 2018-04-29 16:30:05 +02:00
  • 1c3ace23cb Remove unnecessary hyphen from restore_cache key (#7276) Yamagishi Kazutoshi 2018-04-28 18:20:30 +09:00
  • 64be38da0c Merge pull request #448 from m4sk1n/glitch-pl beatrix 2018-04-27 10:31:08 -04:00
  • 8de8a621f5 Merge pull request #447 from ThibG/glitch-soc/features/unfold-thread beatrix 2018-04-27 10:30:26 -04:00
  • fc01ae31c6 🌍: 🇵🇱⬆️ (#7275) Marcin Mikołajczak 2018-04-27 15:12:14 +02:00
  • deb91f5989 🌍: 🇵🇱⬆️ Marcin Mikołajczak 2018-04-27 14:15:38 +02:00
  • a872392cd9 Add entity cache (#7271) Eugen Rochko 2018-04-27 01:38:10 +02:00
  • 63553c6b5c Add support for separate Redis for cache (#7272) Eugen Rochko 2018-04-27 01:37:59 +02:00
  • 0ce06657c0 Update react-redux to 5.0.7 to fix an issue with getDerivedStateFromProps Thibaut Girka 2018-04-27 00:45:44 +02:00
  • 1222e0a381 Use new getDerivedStateFromProps instead of deprecated componentWillReceiveProps Thibaut Girka 2018-04-26 20:23:25 +02:00
  • b39f3648a7 Tentative fix for #446 Thibaut Girka 2018-04-26 19:39:10 +02:00
  • f4ed38272b Merge pull request #401 from ThibG/glitch-soc/features/unfold-thread beatrix 2018-04-26 11:34:14 -04:00
  • 8f12afb599 Merge pull request #438 from ThibG/glitch-soc/fixes/j-k-hotkeys-pinned beatrix 2018-04-26 11:33:48 -04:00
  • 1e9fe95e13 Merge pull request #439 from ThibG/glitch-soc/fixes/emoji-shortcode-inline beatrix 2018-04-26 11:33:36 -04:00
  • 33691f4920 Merge pull request #440 from ThibG/glitch-soc/fixes/video-fullscreen beatrix 2018-04-26 11:33:24 -04:00
  • 36b6631c12 Add Basque language support (#7267) Yamagishi Kazutoshi 2018-04-26 20:56:45 +09:00
  • 3afdd6a17b Weblate translations 20180426 (#7266) Renato "Lond" Cerqueira 2018-04-26 11:58:22 +02:00
  • fa5b28df8a Better phrasing in swedish translation (#7263) Stefan Midjich 2018-04-26 00:36:52 +02:00
  • eb593a5a0c Append '.test' to hostname in stub data (#7260) MIYAGI Hikaru 2018-04-25 21:12:28 +09:00
  • f58dcbc981 HTTP proxy support for outgoing request, manage access to hidden service (#7134) MIYAGI Hikaru 2018-04-25 09:14:49 +09:00
  • 9d4710ed00 Add RSS feeds for end-users (#7259) Eugen Rochko 2018-04-25 02:10:02 +02:00
  • bfc41711dd more sane phrasing in 🇸🇪 translation (#7256) Stefan Midjich 2018-04-25 01:54:24 +02:00
  • aebcf83b4d Merge pull request #443 from unascribed/glitchsoc-pr-better-collapsed-statuses-fix David Yip 2018-04-24 14:26:53 -05:00
  • 62bea7a290 Fix fade being colored wrongly for DMs and upon focus Una Thompson 2018-04-24 11:31:26 -04:00
  • 7681ad8044 Weblate translations (2018-04-24) (#7252) Renato "Lond" Cerqueira 2018-04-24 11:48:11 +02:00
  • 306267dbd2 Fix ID duplication in timelines (#7251) Akihiko Odaki 2018-04-24 18:47:27 +09:00
  • 60b871d56c Implement the ability for instances to define a list of disallowed hashtags (#7176) Emelia Smith 2018-04-23 23:52:58 +02:00
  • 65b8880ec9 Merge pull request #442 from ThibG/glitch-soc/fixes/actions-modal-mobile ThibG 2018-04-23 23:42:29 +02:00
  • 240833c023 Fix actions modal on mobile (fixes #441) Thibaut Girka 2018-04-23 22:15:38 +02:00
  • 495303d9b8 Prevent suspended accounts from appearing in AccountSearchService (#7246) Emelia Smith 2018-04-23 21:27:18 +02:00
  • 51d276fb98 [Glitch] Fix fullscreen video player Thibaut Girka 2018-04-23 20:38:08 +02:00
  • 53b1d88873 Fix fullscreen video player (fixes #7244) (#7245) ThibG 2018-04-23 20:12:16 +02:00
  • 1258efa882 Paginate descendant statuses in public page (#7148) Akihiko Odaki 2018-04-24 02:27:35 +09:00
  • 06817b3c1f tasks/mastodon: fix prompt for Redis password (#7241) Alejandro Martinez Ruiz 2018-04-23 15:03:58 +01:00
  • 3ccca6cece 🌍: Make 🇵🇱 translation more consistent (#7239) Marcin Mikołajczak 2018-04-23 11:49:03 +02:00
  • 9613a53cb3 Update dependencies for Ruby (2018-04-23) (#7237) Yamagishi Kazutoshi 2018-04-23 18:29:17 +09:00
  • 7db7d68136 Detect and prevent image bombs, max. processable dimension 4096^2 (#7229) Eugen Rochko 2018-04-23 09:16:38 +02:00
  • 3bf6da1ffc Move precompile step to build stage (#7235) Yamagishi Kazutoshi 2018-04-23 16:16:26 +09:00
  • 0758b00bfd Refactor resizeImage method (#7236) Yamagishi Kazutoshi 2018-04-23 16:15:51 +09:00
  • 660cb058e1 Improve relative timestamps in web UI (#7233) Eugen Rochko 2018-04-23 00:43:53 +02:00
  • 05fb6f096d Resize images before upload in web UI to reduce bandwidth (#7223) Eugen Rochko 2018-04-23 00:43:36 +02:00
  • 003d114332 [Glitch] Fix the hot key (j, k) does not function correctly when there is a pinned toot in account timeline. Thibaut Girka 2018-04-22 22:08:30 +02:00
  • 105ffaef8f [Glitch] Do not set emoji as inline-block Thibaut Girka 2018-04-22 22:10:53 +02:00
  • 75c4ab9d12 Remove "nsfw" category for sensitive statuses in OStatus serializer (#7048) Eugen Rochko 2018-04-22 22:09:03 +02:00