Commit Graph

  • 48440602b3
    1 fix + 1 translation Olivier Humbert 2017-12-13 21:35:54 +0100
  • 10f800ab46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-12-13 20:17:13 +0000
  • 7cad926401
    Bump version to 2.1.0rc5 v2.1.0rc5 Eugen Rochko 2017-12-13 20:53:39 +0100
  • 3487460f00
    Fix regression from #6014 (#6018) Eugen Rochko 2017-12-13 20:33:04 +0100
  • 342f06dc1a
    Fix regression from #6014 Eugen Rochko 2017-12-13 20:18:54 +0100
  • 82236a3703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-12-13 18:17:16 +0000
  • 72314d26ae l10n OC and FR updates (#6017) Quenty31 2017-12-13 19:17:04 +0100
  • 7089a95a30
    Update fr.yml Quenty31 2017-12-13 18:47:45 +0100
  • c3aa02ccf5
    Add filters to admin UI for custom emojis (#6003) + #6004 Quenty31 2017-12-13 18:44:56 +0100
  • 43cf59a183
    Adjust empty list timeline message (#5997) Quenty31 2017-12-13 18:41:32 +0100
  • 83d02c2a4a
    Adjust empty list timeline message (#5997) Quenty31 2017-12-13 18:41:26 +0100
  • 25327417e7 Merge a7c965cd1b into cc75d47926 SerCom_KC 2017-12-13 17:32:52 +0000
  • cc75d47926
    Fix layout for RTL (#6014) v2.1.0rc4 Eugen Rochko 2017-12-13 18:28:13 +0100
  • b88f9b753f Fix overflowing emojis on some devices Lynx Kotoura 2017-12-14 00:58:46 +0900
  • 8bf4cc72b6 Excahnge the order of spoiler-input and unlocked warning (#6015) Lynx Kotoura 2017-12-14 02:01:56 +0900
  • 4eda9b0be1
    Fix trailing whitespace Eugen Rochko 2017-12-13 18:01:45 +0100
  • ad941f5a21 Update FR translation (#6012) Olivier Humbert 2017-12-13 18:00:42 +0100
  • 75cebb0f44 Fix layout for RTL Eugen Rochko 2017-12-13 17:12:22 +0100
  • 2b663de680 Excahnge the order of spoiler-input and unlocked warning Lynx Kotoura 2017-12-14 00:37:48 +0900
  • 0aeec0390b Redesign tootbox (#5919) Lynx Kotoura 2017-12-14 01:37:23 +0900
  • 8593ff3d36 Move counter into compose-form__buttons-wrapper Lynx Kotoura 2017-12-14 01:07:30 +0900
  • a7c965cd1b i18n: (zh-CN) Update translation for the title of /terms page SerCom-KC 2017-12-14 00:04:40 +0800
  • 4576504939 Fix title of /terms page according to #5817 SerCom-KC 2017-12-14 00:03:28 +0800
  • 155d3a5b12
    Update FR translation Olivier Humbert 2017-12-13 16:46:51 +0100
  • fef6625496
    Weblate translations (#6011) Eugen Rochko 2017-12-13 16:37:15 +0100
  • ddea795f6f i18n: (zh-CN) Change `协管` to `监察员` SerCom-KC 2017-12-13 23:30:42 +0800
  • db482baac6 i18n: (zh-CN) Change `工作人员` (staff) to `管理人员` Suggested by @Gargron at https://github.com/tootsuite/mastodon/pull/6005#discussion_r156678109 SerCom-KC 2017-12-13 23:27:35 +0800
  • bf0eff63ad Restore wrongfully deleted files Eugen Rochko 2017-12-13 16:27:12 +0100
  • 814255418d Merge branch 'master' into mastodon-weblate-master Eugen Rochko 2017-12-13 16:24:21 +0100
  • 8bacfe5703 i18n-tasks normalize && yarn manage:translations Eugen Rochko 2017-12-13 16:22:24 +0100
  • 775c3056b6 Update Chinese (Simplified) translations (#6005) SerCom_KC 2017-12-13 22:52:40 +0800
  • 3b40f7476a Merge with upstream SerCom-KC 2017-12-13 22:03:10 +0800
  • 5ae58f92a4 Merge ca5440b93d into ccf4f170de lambadalambda 2017-12-13 13:30:24 +0000
  • ccf4f170de Make sure call `done();` in the listener of public timeline for anonymous connection (#6009) nullkal 2017-12-13 22:27:36 +0900
  • 88b5c73fe5 Make sure call `done();` in the listener of public timeline for anonymous connection nullkal 2017-12-13 22:19:52 +0900
  • 90e7da16a0 Fix the condition in streaming listener (#6008) nullkal 2017-12-13 21:42:16 +0900
  • 971b38fc94 Fix the condition in streaming listener nullkal 2017-12-13 21:29:00 +0900
  • ad75ec8b5b
    Add filters to admin UI for custom emojis (#6003) Eugen Rochko 2017-12-13 13:28:31 +0100
  • 57fcc21a86
    Bump version to 2.1.0rc4 Eugen Rochko 2017-12-13 12:45:12 +0100
  • 1bbc21d1a2
    Merge branch 'master' into feature-admin-emojis-filter Eugen Rochko 2017-12-13 12:44:35 +0100
  • 6855baa0c5 Change streaming API URL when remote development (#5942) Yamagishi Kazutoshi 2017-12-13 20:43:54 +0900
  • 07b4427865 Set direction style to reply indicator (#6006) Yamagishi Kazutoshi 2017-12-13 20:17:37 +0900
  • a8deb6648b
    Fix redundant HTTP request in FetchLinkCardService (#6002) Eugen Rochko 2017-12-13 12:15:28 +0100
  • 20a6584d2d
    Clean up admin UI for accounts (#6004) Eugen Rochko 2017-12-13 12:15:10 +0100
  • 155e211dd0
    Fix GIF avatars not autoplaying when GIF autoplay is enabled (#6000) Eugen Rochko 2017-12-13 12:14:03 +0100
  • 6cd01271a6 Set direction style to reply indicator Yamagishi Kazutoshi 2017-12-13 19:38:16 +0900
  • 29d0a65a38 i18n: (zh-CN) Normalization SerCom_KC 2017-12-13 17:49:20 +0800
  • ddef9305d8 Merge e8954382b6 into 81923f88ba Akihiko Odaki 2017-12-13 08:03:15 +0000
  • 81923f88ba Shorten English title for 2FA to avoid line-break (#6001) Eugen Rochko 2017-12-13 07:42:22 +0100
  • 8edf4c2ed9 Merge https://github.com/tootsuite/mastodon NeetShin 2017-12-13 12:00:28 +0530
  • b8664a1aea i18n: (zh-CN) Add translations for #6003 SerCom-KC 2017-12-13 13:10:56 +0800
  • 17e53b931c code style fixes cwm 2017-12-12 23:07:12 -0600
  • 3a235625d2 i18n: (zh-CN) Add translation for #6004 also change translation of `staff` from `管理员` to `工作人员` SerCom-KC 2017-12-13 13:01:56 +0800
  • 395a1eeba8 i18n: (zh-CN) Update translations for #5997 SerCom-KC 2017-12-13 12:55:08 +0800
  • 9719983f2d move list items into an array, don't unnecessarily concat misc nav item cwm 2017-12-12 22:50:20 -0600
  • b8f7c7e5de i18n: (zh-CN) Remove spaces in time distances SerCom-KC 2017-12-13 12:50:19 +0800
  • 5706fe18c2
    Fix #5952 - NameError (regression from #5762) (#5999) Eugen Rochko 2017-12-13 04:12:38 +0100
  • 9d005668d7
    Fix Eugen Rochko 2017-12-13 02:46:14 +0100
  • 71965cbef2
    Adjust empty list timeline message (#5997) Eugen Rochko 2017-12-13 02:40:32 +0100
  • e418080c2c Translated using Weblate (Portuguese) manequim 2017-12-12 20:17:57 +0000
  • 0128b86d30
    Use streaming API for standalone timelines on /about and /tag pages (#5998) Eugen Rochko 2017-12-13 02:12:41 +0100
  • 8ba0d04b7b Only display OStatus section in admin UI for accounts when OStatus data Eugen Rochko 2017-12-13 01:46:21 +0100
  • 7319254151 Add staff filter to admin UI for accounts, remove obsolete columns Eugen Rochko 2017-12-13 01:42:49 +0100
  • 9ce61dc7a5 Fix redundant HTTP request in FetchLinkCardService Eugen Rochko 2017-12-13 00:54:38 +0100
  • 0f4f83bc7a Add filters to admin UI for custom emojis Eugen Rochko 2017-12-13 01:14:10 +0100
  • d1f58cd0b3 Fix GIF avatars not autoplaying when GIF autoplay is enabled Eugen Rochko 2017-12-13 00:14:55 +0100
  • 7e19b71f09 Shorten English title for 2FA to avoid line-break Eugen Rochko 2017-12-13 00:16:44 +0100
  • f64fcfe263 Fix #5952 - NameError (regression from #5762) Eugen Rochko 2017-12-13 00:03:36 +0100
  • 5a6a923063 Use streaming API for standalone timelines on /about and /tag pages Eugen Rochko 2017-12-12 23:58:14 +0100
  • 5789d307be Adjust empty list timeline message Eugen Rochko 2017-12-12 23:44:02 +0100
  • 20aad59d88 Translated using Weblate (Portuguese) manequim 2017-12-12 18:50:22 +0000
  • 0370ba7b0a Update: #5985 and #5817 (#5996) Quenty31 2017-12-12 20:48:26 +0100
  • f0a021311d
    Update: #5985 and #5817 Quenty31 2017-12-12 20:23:58 +0100
  • b22de2afa4 Translated using Weblate (Arabic) ButterflyOfFire 2017-12-12 17:03:21 +0000
  • c986218c3a Improve error handling in streaming/index.js (#5968) erin 2017-12-12 13:19:33 -0600
  • 778cd05ab5 Translated using Weblate (Arabic) ButterflyOfFire 2017-12-12 17:15:02 +0000
  • 4d13f26435 Translated using Weblate (Arabic) ButterflyOfFire 2017-12-12 17:10:35 +0000
  • 0c8b1eb577 Make detect empty string before assign image description (#5994) Neetshin 2017-12-12 18:57:22 +0000
  • febaa54c44 Make detect empty string brefore assign upload description NeetShin 2017-12-12 23:17:54 +0530
  • acf447c274 Merge https://github.com/tootsuite/mastodon NeetShin 2017-12-12 23:11:20 +0530
  • cfa3f55221 Remove duplicate indexes in lists (#5990) abcang 2017-12-13 01:38:42 +0900
  • 176db96265 Remove duplicate indexes in lists ABCanG 2017-12-12 19:57:35 +0900
  • 0d691b0433 Merge 1fcd50af29 into f9f6918148 Akihiko Odaki 2017-12-12 14:56:06 +0000
  • f9f6918148 Store preview image for embedded photo in preview cards (#5986) Akihiko Odaki 2017-12-12 23:54:38 +0900
  • b6ded7119e travis fixes cwm 2017-12-12 08:50:31 -0600
  • 65d083338d
    Merge pull request #263 from KnzkDev/optimize-paperclip beatrix 2017-12-12 09:15:52 -0500
  • 2a61b9f000 Update Chinese (Simplified) translations (#5991) SerCom_KC 2017-12-12 22:13:47 +0800
  • cfea28216f make it possible to stream public timelines without authorization (#5977) nullkal 2017-12-12 23:13:24 +0900
  • 19257d91bf Return false if object does not respond to url (#5988) Renato "Lond" Cerqueira 2017-12-12 15:12:09 +0100
  • fe180f18ff Change conditional to avoid nil into string error in sidekiq (#5987) Renato "Lond" Cerqueira 2017-12-12 15:11:13 +0100
  • cefcd496eb Translated using Weblate (Portuguese (Brazil)) Renato "Lond" Cerqueira 2017-12-12 09:40:56 +0000
  • cfd7bf959f Translated using Weblate (Portuguese (Brazil)) Renato "Lond" Cerqueira 2017-12-12 09:40:08 +0000
  • 1486fd64cc Move files for GitHub to .github directory (#5989) Yamagishi Kazutoshi 2017-12-12 23:10:12 +0900
  • 504c3d650f
    Merge pull request #264 from KnzkDev/add-ja beatrix 2017-12-12 08:49:19 -0500
  • 569d24263c
    i18n: (zh-CN) Normalization SerCom_KC 2017-12-12 20:23:38 +0800
  • 90d25a67cb Use presence instead of blank? with ternary. Following suggestion on PR Renato "Lond" Cerqueira 2017-12-12 10:31:38 +0100
  • be33247235
    Remove themes.default from nl and pt-BR locales. David Yip 2017-12-12 03:28:15 -0600
  • 8d6c7462e2 Move files for GitHub to .github directory Yamagishi Kazutoshi 2017-12-12 18:26:15 +0900
  • 5568194ab7 Return false if object does not respond to url Avoid error when the service returns a mostly valid oembed, but has no url in it, causing a MethodError: undefined method `url' for #<OEmbed::Response::Photo:0x000056505def9620> Renato "Lond" Cerqueira 2017-12-12 10:07:28 +0100
  • b9d3357441 Change conditional to avoid nil into string error in sidekiq When obtaining information about users with mastodon in a different subdomain, sidekiq was giving out a 'no implicit conversion of nil into String' Renato "Lond" Cerqueira 2017-12-12 09:56:00 +0100