Commit graph

  • 1eaa2ead85 l10n Occitan update (#6367) Quenty31 2018-01-27 00:51:03 +0100
  • bd8d8ad894 l10n Occitan update (#6367) Quenty31 2018-01-27 00:51:03 +0100
  • 310f29b996 Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-01-24 23:10:19 -0600
  • 00ce2be148
    Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-01-24 23:10:19 -0600
  • 858313726c Do not manually update system RubyGems (#6355) Akihiko Odaki 2018-01-25 12:23:29 +0900
  • 7e07e61a30 Do not manually update system RubyGems (#6355) Akihiko Odaki 2018-01-25 12:23:29 +0900
  • 65098f5b1d Do not require sudo on Travis CI (#6356) Akihiko Odaki 2018-01-25 12:23:09 +0900
  • 4a974c6db1 Do not require sudo on Travis CI (#6356) Akihiko Odaki 2018-01-25 12:23:09 +0900
  • 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-24 19:17:11 +0000
  • 0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-24 19:17:11 +0000
  • ac8263b074 Merge pull request #346 from KnzkDev/fix/travis David Yip 2018-01-24 13:09:13 -0600
  • 1b4d79acf8
    Merge pull request #346 from KnzkDev/fix/travis David Yip 2018-01-24 13:09:13 -0600
  • 292f030a64 Merge pull request #349 from codl/patch-1 beatrix 2018-01-24 08:56:38 -0500
  • 5a4de1cf0f
    Merge pull request #349 from codl/patch-1 beatrix 2018-01-24 08:56:38 -0500
  • 073f4309a5 Fix initial_state me in push_notification_register (#6349) abcang 2018-01-24 22:37:46 +0900
  • a3c0a20373 Fix initial_state me in push_notification_register (#6349) abcang 2018-01-24 22:37:46 +0900
  • 2710843f69 remove escapes from server-side γaml handler codl 2018-01-24 14:23:25 +0100
  • 9abb5becf4
    remove escapes from server-side γaml handler codl 2018-01-24 14:23:25 +0100
  • 83a68aa224 Fix hide and show media button on admin page (#6347) abcang 2018-01-24 21:29:46 +0900
  • 8cd2828e91 Fix hide and show media button on admin page (#6347) abcang 2018-01-24 21:29:46 +0900
  • b190de470a Add packs volume to docker-compose.yml (#6348) Yamagishi Kazutoshi 2018-01-24 21:29:32 +0900
  • 3d881eed27 Add packs volume to docker-compose.yml (#6348) Yamagishi Kazutoshi 2018-01-24 21:29:32 +0900
  • cd18b23226 l10n Occitan language update (#6346) Quenty31 2018-01-24 13:29:03 +0100
  • 7650506b39 l10n Occitan language update (#6346) Quenty31 2018-01-24 13:29:03 +0100
  • de667c2a95 Bump to 2.2.0rc2 Eugen Rochko 2018-01-24 04:16:30 +0100
  • e6db3427b7
    Bump to 2.2.0rc2 Eugen Rochko 2018-01-24 04:16:30 +0100
  • 6661ae14b0 Fix style of legacy column headers (#6342) Eugen Rochko 2018-01-24 04:03:51 +0100
  • daefbd66a6
    Fix style of legacy column headers (#6342) Eugen Rochko 2018-01-24 04:03:51 +0100
  • 8f60c22ba4 Fix #6311: Replace relative URLs in CSS only for Premailer (#6335) Eugen Rochko 2018-01-24 02:57:14 +0100
  • b1daa71da5
    Fix #6311: Replace relative URLs in CSS only for Premailer (#6335) Eugen Rochko 2018-01-24 02:57:14 +0100
  • f378280e49 Fix #6331 (#6341) Eugen Rochko 2018-01-23 20:52:30 +0100
  • 1cc44cba81
    Fix #6331 (#6341) Eugen Rochko 2018-01-23 20:52:30 +0100
  • ae041129ba Merge pull request #334 from ThibG/glitch-soc/cleanup-leftover-code David Yip 2018-01-23 10:27:13 -0600
  • c53d7196e6
    Merge pull request #334 from ThibG/glitch-soc/cleanup-leftover-code David Yip 2018-01-23 10:27:13 -0600
  • 42457924eb Display deleted users' role as “Suspended” (#6339) ThibG 2018-01-23 14:31:31 +0100
  • 4ec9d8b4d9 Display deleted users' role as “Suspended” (#6339) ThibG 2018-01-23 14:31:31 +0100
  • 0efaa528c4 Update goldfinger, ostatus2 and http.rb versions (#6337) Eugen Rochko 2018-01-23 14:30:42 +0100
  • d966878e87
    Update goldfinger, ostatus2 and http.rb versions (#6337) Eugen Rochko 2018-01-23 14:30:42 +0100
  • 876c20ad92 Fix e-mail icon for reblog being stretched (#6336) Eugen Rochko 2018-01-23 14:30:28 +0100
  • 2fc2725076
    Fix e-mail icon for reblog being stretched (#6336) Eugen Rochko 2018-01-23 14:30:28 +0100
  • 810312213a Remove some leftover code, I guess Thibaut Girka 2018-01-18 17:18:01 +0100
  • 2107891edb Remove some leftover code, I guess Thibaut Girka 2018-01-18 17:18:01 +0100
  • 5a3792dfd8 add 'this.props' to fetchLists cwm 2018-01-23 01:23:56 -0600
  • 0ddeed9377 add 'this.props' to fetchLists cwm 2018-01-23 01:23:56 -0600
  • 923f2ce3e3 Fix travis.yml ncls7615 2018-01-23 15:50:59 +0900
  • 16d5f9e162
    Fix travis.yml ncls7615 2018-01-23 15:50:59 +0900
  • 4cf5144099 Fix regression from #6199: Make entire column header clickable (#6334) Eugen Rochko 2018-01-23 05:06:29 +0100
  • 69f13e7bca
    Fix regression from #6199: Make entire column header clickable (#6334) Eugen Rochko 2018-01-23 05:06:29 +0100
  • 0bf2f1d6d5 remove unused openOnboardingModal from getting_started cwm 2018-01-22 19:38:34 -0600
  • 939075899e remove unused openOnboardingModal from getting_started cwm 2018-01-22 19:38:34 -0600
  • 02b8b6efdf merge tootsuite pr #6313 into glitch cwm 2018-01-22 19:05:13 -0600
  • 00be9eb3fe merge tootsuite pr #6313 into glitch cwm 2018-01-22 19:05:13 -0600
  • b5162e2aff Rename ResolveRemoteAccountService to ResolveAccountService (#6327) Akihiko Odaki 2018-01-22 22:25:09 +0900
  • 613e7c7521 Rename ResolveRemoteAccountService to ResolveAccountService (#6327) Akihiko Odaki 2018-01-22 22:25:09 +0900
  • fabc4af7ff Rename FetchRemoteResourceService to ResolveURLService (#6328) Akihiko Odaki 2018-01-22 22:24:22 +0900
  • 17cecd75ca Rename FetchRemoteResourceService to ResolveURLService (#6328) Akihiko Odaki 2018-01-22 22:24:22 +0900
  • a87bb3f4f6 Resolve URL for local account in follow authorization success view (#6324) Akihiko Odaki 2018-01-22 22:22:14 +0900
  • 8cc65cde27 Resolve URL for local account in follow authorization success view (#6324) Akihiko Odaki 2018-01-22 22:22:14 +0900
  • 11f970da4d Weblate translations (#6323) Renato "Lond" Cerqueira 2018-01-22 14:20:58 +0100
  • b7f6ddeaf1 Weblate translations (#6323) Renato "Lond" Cerqueira 2018-01-22 14:20:58 +0100
  • 93972b95b3 Merge pull request #343 from glitch-soc/merge-upstream-20180121 David Yip 2018-01-21 18:00:08 -0600
  • a90d0419d9
    Merge pull request #343 from glitch-soc/merge-upstream-20180121 David Yip 2018-01-21 18:00:08 -0600
  • e96b90c274 Korean translation (#6322) Jeong Arm 2018-01-22 08:49:57 +0900
  • 143fb54ab9 Korean translation (#6322) Jeong Arm 2018-01-22 08:49:57 +0900
  • db052e79ad Merge remote-tracking branch 'origin/master' into merge-upstream-20180121 David Yip 2018-01-21 16:26:50 -0600
  • 48d79007f6
    Merge remote-tracking branch 'origin/master' into merge-upstream-20180121 David Yip 2018-01-21 16:26:50 -0600
  • 37d03b1639 Update Vagrantfile to ubuntu/xenial64. David Yip 2018-01-21 16:09:40 -0600
  • 81b78fac54
    Update Vagrantfile to ubuntu/xenial64. David Yip 2018-01-21 16:09:40 -0600
  • 62e47f7041 armenian translations initial commit (#6320) Norayr Chilingarian 2018-01-22 00:02:23 +0400
  • 48cd6dc6ca armenian translations initial commit (#6320) Norayr Chilingarian 2018-01-22 00:02:23 +0400
  • a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-21 13:36:10 -0600
  • 1253279feb
    Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-21 13:36:10 -0600
  • 4d15390eb6 fix filter search index being too strict when looking for line breaks (#6318) codl 2018-01-21 13:23:17 +0100
  • cfd2b06821 fix filter search index being too strict when looking for line breaks (#6318) codl 2018-01-21 13:23:17 +0100
  • 55567d05b2 Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319) ThibG 2018-01-21 13:22:31 +0100
  • d613dda91d Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319) ThibG 2018-01-21 13:22:31 +0100
  • a1979b50c9 Redirect to 2FA creation page when otp_secret is not available (#6314) Aboobacker MK 2018-01-21 17:51:28 +0530
  • 112b1fa265 Redirect to 2FA creation page when otp_secret is not available (#6314) Aboobacker MK 2018-01-21 17:51:28 +0530
  • 4ee27e1630 Display number of follow requests in getting started menu, and (#6313) Eugen Rochko 2018-01-21 13:20:20 +0100
  • 31d1485887
    Display number of follow requests in getting started menu, and (#6313) Eugen Rochko 2018-01-21 13:20:20 +0100
  • d9421e01df Fix invalid value passed to full_asset_url in mailers (#6312) Eugen Rochko 2018-01-21 13:20:00 +0100
  • 1287de1b83
    Fix invalid value passed to full_asset_url in mailers (#6312) Eugen Rochko 2018-01-21 13:20:00 +0100
  • d000f5dd80 Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-01-20 16:42:57 -0600
  • 2c578a01d8
    Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-01-20 16:42:57 -0600
  • 8354cca2fa Merge pull request #336 from ThibG/glitch-soc/features/tag-warning David Yip 2018-01-20 16:37:52 -0600
  • e7a0840f8c
    Merge pull request #336 from ThibG/glitch-soc/features/tag-warning David Yip 2018-01-20 16:37:52 -0600
  • 6b4f90e5fb Merge pull request #342 from glitch-soc/merge-upstream David Yip 2018-01-20 16:37:35 -0600
  • 24b6e4121f
    Merge pull request #342 from glitch-soc/merge-upstream David Yip 2018-01-20 16:37:35 -0600
  • c8d971a5c1 Change mailer avatar url (#6309) Iijima Yasushi 2018-01-21 03:27:13 +0900
  • 72f9eab3d6 Change mailer avatar url (#6309) Iijima Yasushi 2018-01-21 03:27:13 +0900
  • 75dac5d056 Merge new onboarding styles; delete refs to PNGs. David Yip 2018-01-20 11:23:06 -0600
  • 3cae362214
    Merge new onboarding styles; delete refs to PNGs. David Yip 2018-01-20 11:23:06 -0600
  • 0f703fe455 Eliminate stray conflict markers. David Yip 2018-01-20 10:46:43 -0600
  • 38f6d8130d
    Eliminate stray conflict markers. David Yip 2018-01-20 10:46:43 -0600
  • 03f157f6da Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-20 10:45:43 -0600
  • 071c2c9c85
    Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-20 10:45:43 -0600
  • b9794f1a49 Bump version to 2.2.0rc1 Eugen Rochko 2018-01-20 16:27:19 +0100
  • 0b7a0d15c7
    Bump version to 2.2.0rc1 Eugen Rochko 2018-01-20 16:27:19 +0100
  • d26ae4a147 Update Simplified Chinese translations (#6306) SerCom_KC 2018-01-20 23:11:21 +0800
  • 80b3ca0f6f Update Simplified Chinese translations (#6306) SerCom_KC 2018-01-20 23:11:21 +0800