Commit Graph

  • 6b518fd76d fixed for webpack kawax 2017-05-03 16:40:44 +0900
  • c354110fef accept code review. modeverv 2017-05-03 16:32:05 +0900
  • 6b4cd795ba Merge 49f318e383 into 2b9bc9c154 Josh04 2017-05-03 06:33:44 +0000
  • db0d326244 Remove duplicate expression words Yamagishi Kazutoshi 2017-05-03 15:13:55 +0900
  • 6a4ffe86b4
    mail's html version ...... KenOokamiHoro 2017-05-03 13:58:19 +0800
  • f07f18d66f
    fix some changes KenOokamiHoro 2017-05-03 13:56:09 +0800
  • 66a593c0b2 Merge branch 'master' into parallel-test futoase 2017-05-03 14:42:57 +0900
  • ad674b5b1c Added support parallel_tests futoase 2017-05-03 14:19:30 +0900
  • 16ac515039
    Merge branch 'tootsuite-master' KenOokamiHoro 2017-05-03 13:06:29 +0800
  • 0c2c635f7f
    change .jsx to json KenOokamiHoro 2017-05-03 13:06:10 +0800
  • a6176ac2e1 move files for latest master kawax 2017-05-03 14:03:01 +0900
  • cea4603f83
    forget mail for text format ...... KenOokamiHoro 2017-05-03 13:01:04 +0800
  • 38199efb72
    Follow @Artoria2e5 's change advices. KenOokamiHoro 2017-05-03 12:54:08 +0800
  • 3ac67baee7 Add Japanese translation for allowed languages Yamagishi Kazutoshi 2017-05-03 13:46:13 +0900
  • 9312cc8c8d Additional specs for URI handling Thibaut Girka 2017-04-20 08:18:17 +0200
  • 78e63ff3d7 Update specs to handle URI verification Thibaut Girka 2017-04-19 22:24:05 +0200
  • 68cc1aaed2 Unify resolution of remote account identifiers Thibaut Girka 2017-04-19 22:24:05 +0200
  • aef5c9fa49 Make FollowRemoteAccountService.call return nil on a nil input Thibaut Girka 2017-04-19 22:24:05 +0200
  • 634267eaf6 Move account_needs_webfinger_update to Account.needs_webfinger_update Thibaut Girka 2017-04-19 22:24:05 +0200
  • 858c4273be Require account URIs to map back to a valid acct: URI Thibaut Girka 2017-04-19 22:24:05 +0200
  • 2399ada8da Change WEB_DOMAIN comments to point to the extensive online documentation Thibaut Girka 2017-04-24 21:48:00 +0200
  • a0eacb0a98 Add additional documentation and warnings to the WEB_DOMAIN setting. Thibaut Girka 2017-04-24 05:07:03 +0200
  • 04d2a26f3f rename mixins.scss kawax 2017-05-03 13:08:17 +0900
  • ccdaf0bced Update th.yml jirayudech 2017-05-03 10:38:27 +0700
  • a7dae98e00 Add AvatarOverlay component kawax 2017-05-03 12:09:00 +0900
  • 4f7be3e2dc Add inline prop to Avatar component kawax 2017-05-02 22:55:03 +0900
  • ea93bc15b4 account__avatar-boost kawax 2017-05-01 15:29:54 +0900
  • c9c814a985 apply to notifications too. kawax 2017-04-30 10:33:22 +0900
  • c151c7873b margin kawax 2017-04-29 15:49:44 +0900
  • 153a41db52 add .status__avatar-boost kawax 2017-04-27 17:43:51 +0900
  • 9195d6eaed Show boosted user's avatar kawax 2017-04-27 15:14:44 +0900
  • 69b8b8426b Update th.yml jirayudech 2017-05-03 10:15:48 +0700
  • 950b3b20e6 Merge 8eca58bac7 into 2b9bc9c154 Daigo 3 Dango 2017-05-03 03:10:56 +0000
  • 2b0212ac5e Merge 8919f0de56 into 2b9bc9c154 m4sk1n 2017-05-03 01:30:31 +0000
  • b24092671e remove capistrano/faster_assets from Capfile Ichigo Mayo 2017-05-03 10:24:59 +0900
  • 2b9bc9c154 Use puma config for Procfile.dev (#2735) Matt Jankowski 2017-05-02 20:28:47 -0400
  • e8e060fc69 Use puma config for Procfile.dev Matt Jankowski 2017-05-02 20:23:51 -0400
  • e16693fe48 Likely fix #2458, fix #2031 - handle out-of-order deletes for statuses Eugen Rochko 2017-05-03 02:21:14 +0200
  • f5bf5ebb82 Replace sprockets/browserify with Webpack (#2617) Eugen Rochko 2017-05-03 02:04:16 +0200
  • d7b88d9e73 Fix #2706 - Always respond with 200 to PuSH payloads Fix #2196 - Respond with 201 when Salmon accepted, 400 when unverified Fix #2629 - Correctly handle confirm_domain? for local accounts Unify rules for extracting author acct from XML, prefer <email>, fall back to <name> + <uri> (see also #2017, #2172) Eugen Rochko 2017-05-03 01:45:22 +0200
  • f2a4091312 Merge b0a11be1fe into 26bc591572 STJrInuyasha 2017-05-02 23:03:34 +0000
  • 8b31ee46de Merge fd0771de5e into 26bc591572 Masafumi Okada 2017-05-02 23:03:33 +0000
  • 91038cb4b5 Merge 7753d24141 into 26bc591572 Ash Furrow 2017-05-02 23:03:32 +0000
  • 2bb45488d1 Merge c28cd03ce3 into 26bc591572 Muḥend Belqasem 2017-05-02 23:03:32 +0000
  • 2768956aec Merge b7d56eefd1 into 26bc591572 Lindsey Bieda 2017-05-02 23:03:32 +0000
  • a0a5a90ef3 Merge 129e1f0d91 into 26bc591572 Kaylee 2017-05-02 23:03:31 +0000
  • 3d9827909b Merge b6a9b9bca8 into 26bc591572 Quent-in 2017-05-02 23:03:23 +0000
  • ed03fdbf70 Merge 271fd9cc7c into 26bc591572 narupo 2017-05-02 23:03:23 +0000
  • 4c9cf303b2 Merge 6eab296bec into 26bc591572 Nolan Lawson 2017-05-02 23:03:23 +0000
  • c5674c5ed6 Merge 1af4936f64 into 26bc591572 Thor Harald Johansen 2017-05-02 23:03:23 +0000
  • 55f7e3b3fe Merge c9601d15fb into 26bc591572 R Tucker 2017-05-02 23:03:22 +0000
  • e0d1c8424c Merge 51ed2fc043 into 26bc591572 TheInventrix 2017-05-02 23:03:19 +0000
  • 592cdebba0 Merge 7ce7a872b0 into 26bc591572 Tristan Mahé 2017-05-02 23:03:19 +0000
  • e9836ea651 Merge aae32eed3b into 26bc591572 Spyros 2017-05-02 23:03:16 +0000
  • 26bc591572 Allow to set CA file for SMTP (#2713) Akihiko Odaki 2017-05-03 08:03:12 +0900
  • eb1c33e05d Clean up redis configuration. Allow using REDIS_URL to set advanced connection options instead of setting REDIS_HOST etc individually Eugen Rochko 2017-05-03 00:39:35 +0200
  • e1fd3d6631 Merge 450c544024 into 268dd32d76 kabuakan 2017-05-02 22:28:32 +0000
  • cc9c1d9c74 Merge pull request #1 from m4sk1n/patch-1 m4sk1n 2017-05-03 00:07:44 +0200
  • 8919f0de56 i18n: Updated Polish translation m4sk1n 2017-05-03 00:05:01 +0200
  • 0008a2b667 Add Procfile.dev for running rails, webpack and streaming API at the same time Eugen Rochko 2017-05-02 23:50:07 +0200
  • 91d7b133c8 Merge branch 'master' into master m4sk1n 2017-05-02 23:39:45 +0200
  • d1b4d0a786 Merge f2efac9209 into 268dd32d76 Kody 2017-05-02 21:38:19 +0000
  • 13242f60d4 Merge cfe4accf27 into 268dd32d76 Gaëtan Guéraud 2017-05-02 21:38:18 +0000
  • f72700a906 Merge a3a8ada3d0 into 268dd32d76 Matt Jankowski 2017-05-02 21:38:11 +0000
  • 268dd32d76 Auth sign out (#2511) Matt Jankowski 2017-05-02 17:37:58 -0400
  • bea97ea766 Add rspec to further specify FollowRemoteAccountService (#2414) ThibG 2017-05-02 23:37:26 +0200
  • 295f68e595 i18n: updated Polish translation Marcin Mikołajczak 2017-05-02 23:35:37 +0200
  • d326aad24f Merge branch 'master' into feature-webpack Eugen Rochko 2017-05-02 23:30:41 +0200
  • 03f3223d72 i18n: updated Polish translation (#2727) m4sk1n 2017-05-02 23:04:41 +0200
  • bee51d2314 i18n: updated Polish translation Marcin Mikołajczak 2017-05-02 23:01:33 +0200
  • 61ac472aed Merge 7e2c65f85e into 7880671f35 shinriyo 2017-05-02 20:47:26 +0000
  • a3a8ada3d0 Rename InstancePresenter to SitePresenter Matt Jankowski 2017-05-02 10:13:49 -0400
  • 094d95e36e Add admin/instances#show page to list basic counts about remote instances Matt Jankowski 2017-05-02 09:54:07 -0400
  • 7880671f35 Add option to disable two factor auth in admin accounts panel. (#2584) Kaylee 2017-05-02 20:07:12 +0100
  • b5eec34230 Add admin area view partials for each record type (#2700) Matt Jankowski 2017-05-02 14:56:28 -0400
  • 2128682162 Creation of activerecord for OC (#2721) Quent-in 2017-05-02 20:55:14 +0200
  • 97ebb087f3 Allow suspended account users to sign out Matt Jankowski 2017-04-26 20:37:37 -0400
  • 8c38c54957 Add spec showing that suspended user gets a 403 forbidden on sign out Matt Jankowski 2017-04-26 20:36:40 -0400
  • b7ca930dce Add a spec for signing out Matt Jankowski 2017-04-26 20:33:35 -0400
  • 752f00e7d7 Add admin area view partials for each record type Matt Jankowski 2017-04-29 07:05:21 -0400
  • e68c0ce5f6 Norwegian translation for email notifications (#2673) Audun Larsen 2017-05-02 20:18:43 +0200
  • 696ec0fc7e Update activerecord.oc.yml Quent-in 2017-05-02 20:15:48 +0200
  • 54dddfe9b8 Darkens colour on stream entries meta. (#2616) Ash Furrow 2017-05-02 20:10:55 +0200
  • aea3aff4e4 i18n: Updated Polish translation (#2686) m4sk1n 2017-05-02 20:08:44 +0200
  • 46943b64c6 Reset textarea height when press submit key (#2681) Yamagishi Kazutoshi 2017-05-03 03:08:21 +0900
  • 302c0d2046 Language: update pt-BR (#2687) Eduardo Elias 2017-05-02 19:05:21 +0100
  • 9d501e4711 Merge 6563a14783 into 22b1a70274 Nolan Lawson 2017-05-02 18:03:43 +0000
  • 22b1a70274 Fix to completely hide NSFW-tagged images (#2724) hakoai 2017-05-03 03:03:00 +0900
  • a945b10fe0 Fix to completely hide NSFW-tagged images hakoai 2017-05-03 01:50:16 +0900
  • c277db458d Language: update pt-BR Eduardo Elias 2017-05-01 17:34:51 +0100
  • bdc8294cda Creation of activerecord for OC Quent-in 2017-05-02 19:00:28 +0200
  • fc4a830a8c Update of simple_forum_oc Quent-in 2017-05-02 18:55:55 +0200
  • 0d70085276 Merge 4694287391 into 6f75c8451d Keiji, Yoshimi 2017-05-02 16:39:40 +0000
  • 6f75c8451d Fix subscription expiration condition (#2715) Yamagishi Kazutoshi 2017-05-03 01:21:22 +0900
  • 4784f0e694 dry and add spec Yamagishi Kazutoshi 2017-05-03 01:18:34 +0900
  • 974ab5fe61 DON'T NEED props Yamagishi Kazutoshi 2017-05-03 01:16:20 +0900
  • b3a17b07da Merge pull request #3 from narabo/collapses-layout-1.3.2 narabo 2017-05-03 01:08:01 +0900
  • ba0b0312a0 Fix collapses layout narabo 2017-05-03 01:07:17 +0900
  • c5522e4f50 Merge pull request #2 from narabo/v1.3.2 narabo 2017-05-03 00:49:23 +0900
  • 825a36750f Merge branch 'production' into v1.3.2 narabo 2017-05-03 00:49:12 +0900