Commit Graph

  • c1ca98311c update Dockerfile: latest nodejs LTS Wonderfall 2017-04-15 09:05:13 +0200
  • d0f97cab98 Merge pull request #1 from BoFFire/arabic ButterflyOfFire 2017-04-16 19:02:55 +0100
  • 249cb555f0 Update devise.ar.yml ButterflyOfFire 2017-04-16 19:01:04 +0100
  • f37bae4ca1 Create ar.jsx ButterflyOfFire 2017-04-16 18:54:46 +0100
  • 3ee1d2d8b0 Merge branch 'master' into feature-onboarding Eugen 2017-04-16 19:50:04 +0200
  • 7a97d0d6d1 Update application.rb ButterflyOfFire 2017-04-16 18:47:49 +0100
  • f4360dabc9 Update index.jsx ButterflyOfFire 2017-04-16 18:44:55 +0100
  • 589b0b7f3e Update settings_helper.rb ButterflyOfFire 2017-04-16 18:43:01 +0100
  • 4e041a2ba1 Update mastodon.jsx ButterflyOfFire 2017-04-16 18:40:33 +0100
  • f87b51fda8 I18n health warnings (#1949) Matt Jankowski 2017-04-16 13:37:01 -0400
  • 5377b17030 Update ar.yml ButterflyOfFire 2017-04-16 18:35:27 +0100
  • 7e2e0d6dcc Fix #1670 - Update OStatus2 gem (#1936) Eugen 2017-04-16 19:32:47 +0200
  • aa907e2943 Update ar.yml ButterflyOfFire 2017-04-16 18:32:09 +0100
  • c900ed57cd Add i18n-tasks unused to travis Matt Jankowski 2017-04-16 13:28:23 -0400
  • 7561216c96 Tell i18n-tasks to ignore missing attributes that dont need overwriting Matt Jankowski 2017-04-16 13:26:44 -0400
  • 5621aa6236 Update ar.yml ButterflyOfFire 2017-04-16 18:24:37 +0100
  • d6fd67fc56 Add missing `en` keys to i18n Matt Jankowski 2017-04-16 13:22:40 -0400
  • 5d745b2206 Update ar.yml ButterflyOfFire 2017-04-16 18:22:21 +0100
  • ec42cd8a77 Update i18n key reference to match moved location Matt Jankowski 2017-04-16 13:20:15 -0400
  • 0175bfed7e Revert "Remove unused key: admin.reports.comment.none" Matt Jankowski 2017-04-16 13:19:51 -0400
  • 922ea2d674 Update ar.yml ButterflyOfFire 2017-04-16 18:18:42 +0100
  • 52d6ae688e Ignore keys from locales which override activemodel and activerecord errors Matt Jankowski 2017-04-16 13:15:31 -0400
  • 741a173d1a Remove unused reports. i18n namespace (moved to admin.reports) Matt Jankowski 2017-04-16 13:09:04 -0400
  • 350ef2685f Remove unused key: admin.reports.comment.none Matt Jankowski 2017-04-16 13:07:10 -0400
  • dc158eb308 Use RSYNC for synced folder in vagrant on windows Naouak 2017-04-16 19:06:30 +0200
  • 3e2ddea99a Create ar.yml ButterflyOfFire 2017-04-16 18:05:10 +0100
  • fd1535f1c9 Update devise.ar.yml ButterflyOfFire 2017-04-16 18:01:50 +0100
  • cce11df69d Remove unused key two_factor_auth.recovery_codes Matt Jankowski 2017-04-16 13:01:45 -0400
  • 8dbcea1ff3 Create doorkeeper.ar.yml ButterflyOfFire 2017-04-16 18:00:14 +0100
  • 744a3e788c Remove final will_paginate i18n keys Matt Jankowski 2017-04-16 12:59:47 -0400
  • 550aac7926 Remove unused i18n key two_factor_auth.warning Matt Jankowski 2017-04-16 12:58:45 -0400
  • 2ced8e205b Update application.rb May Kittens Devour Your Soul 2017-04-16 18:54:47 +0200
  • eb2c563730 Remove unused i18n key: plaintext_secret_html Matt Jankowski 2017-04-16 12:53:58 -0400
  • 7b5f779f34 Update settings_helper.rb May Kittens Devour Your Soul 2017-04-16 18:52:24 +0200
  • 373ebadb5f Fix issue with line return in file Naouak 2017-04-16 18:50:21 +0200
  • a1429bcec2 Avoid i18n health warning for `en` locale by using symbol scope with :count Matt Jankowski 2017-04-16 12:43:22 -0400
  • d74d49eea0 Create hr.jsx May Kittens Devour Your Soul 2017-04-16 18:38:15 +0200
  • 2b292d4daa Merge 4b7fde3386 into 181115422c Eugen 2017-04-16 16:26:46 +0000
  • 181115422c Disable CodeClimate duplication checks (#1943) Eugen 2017-04-16 18:26:46 +0200
  • 4b7fde3386 Disable CodeClimate duplication checks Eugen 2017-04-16 18:25:39 +0200
  • 6037bbde5b Merge branch 'master' into master Effy Elden 2017-04-17 02:24:49 +1000
  • 1583d290b5 Merge branch 'master' into bu/open_sidekiq_pghero_new_tabs Effy Elden 2017-04-17 02:24:19 +1000
  • 5c7e9b14dd Merge branch 'master' into master Effy Elden 2017-04-17 02:23:45 +1000
  • 38b9730f38 Merge branch 'master' into preferences-input Effy Elden 2017-04-17 02:23:12 +1000
  • 569c9511d4 Merge branch 'master' into puma-worker-killer Pete Keen 2017-04-16 12:21:50 -0400
  • ac16b92c51 Re-add newline before 'react-rails' Gem to fix groupings Effy Elden 2017-04-17 02:21:45 +1000
  • 0a82d959a5 Add DomainBlock#accounts has_many Matt Jankowski 2017-04-16 12:19:13 -0400
  • 9f00301a69 Merge branch 'master' into settings-nav Effy Elden 2017-04-17 02:17:53 +1000
  • c939893e2e Merge branch 'master' into feature/status-max-length Effy Elden 2017-04-17 02:13:50 +1000
  • 86d1dcc97a Fix translation of 'reblogged' in eo.yml (#1942) oliverkeeble 2017-04-16 17:11:07 +0100
  • 4cfe75e8bf Fix translation of 'reblogged' in eo.yml oliverkeeble 2017-04-16 17:07:34 +0100
  • 86eaaf0761 Add missing keys to PT locale (#1941) Eduardo Elias 2017-04-16 17:04:19 +0100
  • 19f63ff801 Check @recipient.user at the first (#1939) alpaca-tc 2017-04-17 01:04:05 +0900
  • babbb2135e Fix #1813 - Alleviate extra requests when processing mentions (#1938) Eugen 2017-04-16 18:01:48 +0200
  • f0d5dd76b3 Merge branch 'master' into 1319-clarify-private-status-privacy-text Effy Elden 2017-04-17 02:01:40 +1000
  • 574a016269 Merge branch 'master' into fixes_undefined_method_settings Effy Elden 2017-04-17 01:54:42 +1000
  • 9b07a7db86 Merge branch 'master' into feature-language-detection Effy Elden 2017-04-17 01:53:23 +1000
  • 93084845b5 Use implicit controller/action path for i18n in admin/domain_blocks Matt Jankowski 2017-04-16 11:52:15 -0400
  • ebe2945697 Create devise.ar.yml ButterflyOfFire 2017-04-16 16:44:19 +0100
  • 3c0e94a52b Add missing keys to PT locale Eduardo Elias 2017-04-16 16:44:12 +0100
  • 55c3c9f673 Actually use the rolling restart interval Pete Keen 2017-04-16 11:41:24 -0400
  • acd33101c5 Merge branch 'master' into fix/cache_blocking Effy Elden 2017-04-17 01:41:33 +1000
  • 66e2756d16 Create simple_form.ar.yml ButterflyOfFire 2017-04-16 16:40:56 +0100
  • 49361eb4a3 Merge branch 'master' into fix-1670 Effy Elden 2017-04-17 01:37:36 +1000
  • e06005ac06 Merge branch 'master' into ignore-vendor-bundle Effy Elden 2017-04-17 01:36:28 +1000
  • 303d7b7535 Merge branch 'fix-1870' of github.com:tootsuite/mastodon into fix-1870 Eugen Rochko 2017-04-16 17:36:16 +0200
  • a3c186b602 Adjust according to comment by @alpaca-tc Eugen Rochko 2017-04-16 17:35:40 +0200
  • 4694287391 Merge branch 'master' into fix/change_removal_worker_queue_to_remove Effy Elden 2017-04-17 01:34:36 +1000
  • 0b44e62950 Rename admin.domain_block to admin.domain_blocks in prep for i18n improvement Matt Jankowski 2017-04-16 11:32:33 -0400
  • cb7a7206f5 Merge branch 'master' into puma-worker-killer Effy Elden 2017-04-17 01:31:29 +1000
  • b3370a3b6a Update wording Eugen Rochko 2017-04-16 17:22:12 +0200
  • 89627f78a2 Merge remote-tracking branch 'upstream/master' Thor H. Johansen 2017-04-16 17:19:19 +0200
  • 99226aba93 Adds note for instance admins. (#1925) Ash Furrow 2017-04-16 10:59:53 -0400
  • 16cd37fa45 Check @recipient.user at the first alpaca-tc 2017-04-16 23:58:38 +0900
  • 27fe696f0d Fix #1813 - Alleviate extra requests when processing mentions Eugen Rochko 2017-04-16 16:51:48 +0200
  • a7f2e09139
    Updates update instructions. Ash Furrow 2017-04-16 10:48:13 -0400
  • 42c9d5111a Add README note about tagged releases (#1927) Eugen 2017-04-16 16:42:46 +0200
  • 3decd53fa8 Fix #1670 - Update OStatus2 gem Eugen Rochko 2017-04-16 16:41:50 +0200
  • e0b5a94a4b Clean up check that account needs a webfinger update (#1932) Matt Jankowski 2017-04-16 10:38:29 -0400
  • 26ec042f38 Remove trailing whitespace in terms.no.html (#1933) Matt Jankowski 2017-04-16 10:38:13 -0400
  • 73b0af5c93 Simplify the og:image and og:description code in stream_entries/show (#1934) Matt Jankowski 2017-04-16 10:38:02 -0400
  • 7efde22c3a Use local vars in partials (#1935) Matt Jankowski 2017-04-16 10:37:49 -0400
  • 90760eae4c fix regex filter (#1845) abcang 2017-04-16 23:33:38 +0900
  • 3a7cded7ce Simplify the og:image and og:description code in stream_entries/show Matt Jankowski 2017-04-16 09:49:50 -0400
  • 0a6d47dd4c Clean up check that account needs a webfinger update Matt Jankowski 2017-04-16 08:39:48 -0400
  • fc34e0e191 Remove .keep in models (#1892) tackeyy 2017-04-16 23:28:52 +0900
  • de72db99fa Add presence validation to Import (#1928) alpaca-tc 2017-04-16 23:28:26 +0900
  • f8a91b7892
    Addresses feedback from #1925. Ash Furrow 2017-04-16 10:27:08 -0400
  • cc9647eb24 Make puma worker killer interval tunable Pete Keen 2017-04-16 10:19:17 -0400
  • 612dc39216 Use local variable in 2fa recovery codes partial Matt Jankowski 2017-04-16 08:56:41 -0400
  • 382f405255 Use local vars in accounts/header partial Matt Jankowski 2017-04-16 08:44:01 -0400
  • b00bd976b4 Remove trailing whitespace in terms.no.html Matt Jankowski 2017-04-16 08:34:03 -0400
  • 98eee269c8 Add puma worker killer Pete Keen 2017-04-16 10:13:42 -0400
  • 77d1447ac4 Add the licence key in package.json (#1914) Alda Marteau-Hardi 2017-04-16 16:08:11 +0200
  • 2c329f2b69 Fix translation related to "mute" (#1926) mshrtkch 2017-04-16 23:07:58 +0900
  • c2762fa498 Add missing Japanese translations (#1923) Kazuhiro NISHIYAMA 2017-04-16 23:07:45 +0900
  • 5fd556080c added remove queue settings Keiji Yoshimi 2017-04-16 22:40:14 +0900
  • 83d2ffd86d added remove queue Keiji Yoshimi 2017-04-16 22:33:26 +0900
  • 1c8ce94984 Add presence validation to Import alpaca-tc 2017-04-16 23:03:19 +0900
  • 9de2d95f3b Add README note about tagged releases Eugen Rochko 2017-04-16 16:05:53 +0200