Commit graph

  • a000085b9c Fix spacing in some FeedManager examples. David Yip 2018-06-03 23:02:01 -0500
  • a40e322f4b
    Fix spacing in some FeedManager examples. David Yip 2018-06-03 23:02:01 -0500
  • 2bb5842541 Thread scopes through #matches?. #454. David Yip 2018-06-03 19:41:54 -0500
  • 26573ad7e6
    Thread scopes through #matches?. #454. David Yip 2018-06-03 19:41:54 -0500
  • ca9ac011a5 Display numbers in account header using shortNumberFormat for consistency (#7723) Eugen Rochko 2018-06-04 05:15:50 +0200
  • 1bbe81030c
    Display numbers in account header using shortNumberFormat for consistency (#7723) Eugen Rochko 2018-06-04 05:15:50 +0200
  • 3114ac9655 Do not mark remote status sensitive even if spoiler text is present (#7395) Akihiko Odaki 2018-06-04 11:46:14 +0900
  • 5bf5003384 Do not mark remote status sensitive even if spoiler text is present (#7395) Akihiko Odaki 2018-06-04 11:46:14 +0900
  • 93d90d3237 Fix activity-stream-tabs colors and set text variables for text colors (#7722) Lynx Kotoura 2018-06-04 11:39:42 +0900
  • 73923ea6c4 Fix activity-stream-tabs colors and set text variables for text colors (#7722) Lynx Kotoura 2018-06-04 11:39:42 +0900
  • 797c72329f Fix missing column in select in mastodon:feeds:build task (#7720) Eugen Rochko 2018-06-04 04:21:15 +0200
  • c7405fda11
    Fix missing column in select in mastodon:feeds:build task (#7720) Eugen Rochko 2018-06-04 04:21:15 +0200
  • 2af43c3dce Fix bug in order of conversations in web UI (#7721) Eugen Rochko 2018-06-04 04:19:16 +0200
  • e18390cfe6
    Fix bug in order of conversations in web UI (#7721) Eugen Rochko 2018-06-04 04:19:16 +0200
  • 6dfc8999f7 Add tests for embeds controller (#7719) Shuhei Kitagawa 2018-06-04 10:35:56 +0900
  • 22caa32ba2 Add tests for embeds controller (#7719) Shuhei Kitagawa 2018-06-04 10:35:56 +0900
  • d993629ca7 "Show" instead of "return to" after (remote)-following (#7718) Eugen Rochko 2018-06-04 03:00:36 +0200
  • 6b2f4f8c09
    "Show" instead of "return to" after (remote)-following (#7718) Eugen Rochko 2018-06-04 03:00:36 +0200
  • 9e830f7f37 Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-06-03 19:44:05 -0500
  • c55263027a
    Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-06-03 19:44:05 -0500
  • 650e3e346b Remove trending hashtags (#7711) Eugen Rochko 2018-06-04 02:18:18 +0200
  • 0deb9fa6b9
    Remove trending hashtags (#7711) Eugen Rochko 2018-06-04 02:18:18 +0200
  • d55d5ccc9d keyword mute: Store keywords as a list David Yip 2018-06-03 18:12:55 -0500
  • 37d495eeeb
    keyword mute: Store keywords as a list David Yip 2018-06-03 18:12:55 -0500
  • 37fe72ecf2 Merge pull request #529 from glitch-soc/tweak-491 David Yip 2018-06-03 04:22:20 -0500
  • 0f979c3460
    Merge pull request #529 from glitch-soc/tweak-491 David Yip 2018-06-03 04:22:20 -0500
  • 471b62a6a4 prefs: Note that favourite confirmation applies to Glitch flavour only (#491) David Yip 2018-06-03 03:40:27 -0500
  • d757c8a644
    prefs: Note that favourite confirmation applies to Glitch flavour only (#491) David Yip 2018-06-03 03:40:27 -0500
  • 5ec2d25ef6 Merge pull request #528 from glitch-soc/merge-upstream David Yip 2018-06-03 03:01:09 -0500
  • 5dd2a78034
    Merge pull request #528 from glitch-soc/merge-upstream David Yip 2018-06-03 03:01:09 -0500
  • 330a234d1f Whoops, forgot to clean up a conflict. David Yip 2018-06-03 02:35:54 -0500
  • 8343f56b2c
    Whoops, forgot to clean up a conflict. David Yip 2018-06-03 02:35:54 -0500
  • 1a0491b3cf Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-null David Yip 2018-06-02 16:19:06 -0500
  • cfdbb36bdf
    Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-null David Yip 2018-06-02 16:19:06 -0500
  • 827d1ea864 Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-06-02 16:15:36 -0500
  • 3550470c18
    Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-06-02 16:15:36 -0500
  • 3dc8af0016 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-06-02 16:08:31 -0500
  • a641d1b5b8
    Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master David Yip 2018-06-02 16:08:31 -0500
  • 1f622bff18 Add tests for migrations_controller (#7707) Shuhei Kitagawa 2018-06-02 18:52:16 +0900
  • 00512ecf87 Add tests for migrations_controller (#7707) Shuhei Kitagawa 2018-06-02 18:52:16 +0900
  • ca2a6b2071 Weblate translations (2018-06-02) (#7705) Yamagishi Kazutoshi 2018-06-02 10:03:08 +0900
  • 89c86ee521 Weblate translations (2018-06-02) (#7705) Yamagishi Kazutoshi 2018-06-02 10:03:08 +0900
  • 3833c8b690 Use different algorithm for trending tags (#7697) Eugen Rochko 2018-06-01 19:19:44 +0200
  • 6e6c0e9613
    Use different algorithm for trending tags (#7697) Eugen Rochko 2018-06-01 19:19:44 +0200
  • 57ad751230 Fix margin between compose warning, reply indicator and textarea (#7701) Eugen Rochko 2018-06-01 19:19:30 +0200
  • 8d6e4e0485
    Fix margin between compose warning, reply indicator and textarea (#7701) Eugen Rochko 2018-06-01 19:19:30 +0200
  • aa54c65ee2 Improve trends layout (#7700) Eugen Rochko 2018-06-01 19:18:37 +0200
  • 73c0c36e7b
    Improve trends layout (#7700) Eugen Rochko 2018-06-01 19:18:37 +0200
  • f64f9860c7 Add loading indicator for trending tags (#7693) Yamagishi Kazutoshi 2018-06-01 21:22:42 +0900
  • 69b45350fe Add loading indicator for trending tags (#7693) Yamagishi Kazutoshi 2018-06-01 21:22:42 +0900
  • fe98e276e1 Update ESLint for Code Climate (#7696) Yamagishi Kazutoshi 2018-06-01 21:03:19 +0900
  • bfa12239e8 Update ESLint for Code Climate (#7696) Yamagishi Kazutoshi 2018-06-01 21:03:19 +0900
  • a87927437d Fix duplicate key attributes (#7694) Yamagishi Kazutoshi 2018-06-01 21:02:49 +0900
  • 15ce60f610 Fix duplicate key attributes (#7694) Yamagishi Kazutoshi 2018-06-01 21:02:49 +0900
  • c10df6cf00 Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks David Yip 2018-06-01 00:36:48 -0500
  • 9ad5de8a3a
    Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks David Yip 2018-06-01 00:36:48 -0500
  • bbe1731bb0 Merge pull request #471 from impiaaa/thread-icon David Yip 2018-06-01 00:35:13 -0500
  • 0aba716fe1
    Merge pull request #471 from impiaaa/thread-icon David Yip 2018-06-01 00:35:13 -0500
  • 559ce5c098 Adjust spacing between status icons Spencer Alves 2018-05-31 21:55:44 -0700
  • e5f25a73f2 Adjust spacing between status icons Spencer Alves 2018-05-31 21:55:44 -0700
  • c86cd2041d Merge branch 'glitch' into thread-icon Spencer Alves 2018-05-31 21:33:16 -0700
  • 7d2e6429c2 Merge branch 'glitch' into thread-icon Spencer Alves 2018-05-31 21:33:16 -0700
  • 5d2d05961c Wrong exception class: ActiveRecord::RecordNotUnique, not PG::UniqueViolation (#7688) Eugen Rochko 2018-05-31 17:22:33 +0200
  • fb1ae0152d
    Wrong exception class: ActiveRecord::RecordNotUnique, not PG::UniqueViolation (#7688) Eugen Rochko 2018-05-31 17:22:33 +0200
  • 7c50de2219 Improve account index migration (#7684) Eugen Rochko 2018-05-31 17:09:09 +0200
  • 19b4c666f7
    Improve account index migration (#7684) Eugen Rochko 2018-05-31 17:09:09 +0200
  • 946091af45 Exclude unlisted, private and direct toots from affecting trends (#7686) Eugen Rochko 2018-05-31 16:47:28 +0200
  • 1e938b966e
    Exclude unlisted, private and direct toots from affecting trends (#7686) Eugen Rochko 2018-05-31 16:47:28 +0200
  • aa1f74cba6 Make the refresh trends button refresh trends (#7685) Eugen Rochko 2018-05-31 16:46:02 +0200
  • 0ce5339a7b
    Make the refresh trends button refresh trends (#7685) Eugen Rochko 2018-05-31 16:46:02 +0200
  • a6ddd1aba2 Put the CW field between the toot we are replying to and the toot field (#7508) Mélanie Chauvel (ariasuni) 2018-05-31 15:16:31 +0200
  • 691107263c Put the CW field between the toot we are replying to and the toot field (#7508) Mélanie Chauvel (ariasuni) 2018-05-31 15:16:31 +0200
  • 93e6984be8 Make active bookmarks red (fixes #493) Thibaut Girka 2018-05-21 18:57:51 +0200
  • b9fdeceb3c Make active bookmarks red (fixes #493) Thibaut Girka 2018-05-21 18:57:51 +0200
  • 37dc96b71b Use history.state to decide whether we should goBack() or go to / (fixes #247) Thibaut Girka 2018-05-23 14:17:05 +0200
  • cc396f085d Use history.state to decide whether we should goBack() or go to / (fixes #247) Thibaut Girka 2018-05-23 14:17:05 +0200
  • fa980f2c95 Use props.router instead of context.router, as we are using withRouter Thibaut Girka 2018-05-23 12:55:31 +0200
  • f86d280fd6 Use props.router instead of context.router, as we are using withRouter Thibaut Girka 2018-05-23 12:55:31 +0200
  • 574e74bbdd Hardcode default skin/theme in error layout (fixes #373) Thibaut Girka 2018-05-22 18:29:11 +0200
  • e8a9627f66 Hardcode default skin/theme in error layout (fixes #373) Thibaut Girka 2018-05-22 18:29:11 +0200
  • 0174ca8679 Prevent a rare crash when a status' root node is undefined Thibaut Girka 2018-05-26 19:21:02 +0200
  • 893f2aff20 Prevent a rare crash when a status' root node is undefined Thibaut Girka 2018-05-26 19:21:02 +0200
  • 663c9dcf36 Fix direct timeline Thibaut Girka 2018-05-31 14:13:35 +0200
  • e396fbfe3b Fix direct timeline Thibaut Girka 2018-05-31 14:13:35 +0200
  • 4c11c429ce Weblate translations (2018-05-31) (#7681) Yamagishi Kazutoshi 2018-05-31 20:00:40 +0900
  • 648a22637c Weblate translations (2018-05-31) (#7681) Yamagishi Kazutoshi 2018-05-31 20:00:40 +0900
  • 069bb3eeeb 🌍: 🇵🇱⬆️ (#7679) Marcin Mikołajczak 2018-05-31 04:15:38 +0200
  • 063d4d4ccc 🌍: 🇵🇱⬆️ (#7679) Marcin Mikołajczak 2018-05-31 04:15:38 +0200
  • a76f40890e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-05-31 01:17:25 +0000
  • 165b5dc7f5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-05-31 01:17:25 +0000
  • 40ed681914 Fix nil error in migration (#7680) Eugen Rochko 2018-05-31 02:30:37 +0200
  • c61c4565ab
    Fix nil error in migration (#7680) Eugen Rochko 2018-05-31 02:30:37 +0200
  • 49a0a3a8a2 Speed up some rake tasks by moving execution to Sidekiq (#7678) Eugen Rochko 2018-05-30 21:09:30 +0200
  • ad40bf5e0c
    Speed up some rake tasks by moving execution to Sidekiq (#7678) Eugen Rochko 2018-05-30 21:09:30 +0200
  • eebe7fb2d5 Bump version to 2.4.1rc1 Eugen Rochko 2018-05-30 19:16:41 +0200
  • a29f196f95
    Bump version to 2.4.1rc1 Eugen Rochko 2018-05-30 19:16:41 +0200
  • d60a87d3d2 Redirect / to home on mobile layout, to getting started on desktop (#7677) Eugen Rochko 2018-05-30 18:42:06 +0200
  • 3623aea6c9
    Redirect / to home on mobile layout, to getting started on desktop (#7677) Eugen Rochko 2018-05-30 18:42:06 +0200
  • 931c88b0aa Improve getting started column (#7676) Eugen Rochko 2018-05-30 18:41:47 +0200
  • 1a7a74ff76
    Improve getting started column (#7676) Eugen Rochko 2018-05-30 18:41:47 +0200