Commit Graph

  • fcc94e50f6 fix #1475: create external volume for postgresql database Eric Blade 2017-04-11 08:43:34 -0400
  • f53fb6aa66 Bypass boost confirm modal if alt is pressed blackle 2017-04-11 08:34:14 -0400
  • 22e1099efb Merge 94aa6be88f into a85d4473aa happycoloredbanana 2017-04-11 12:21:59 +0000
  • a85d4473aa Avoid user enumeration with devise paranoid mode (#1527) Yann GUERN 2017-04-11 14:21:15 +0200
  • c9b9225951 Adjust css for user detail page (#1463) Corey Dutson 2017-04-11 08:20:18 -0400
  • 3a5a124f1b Merge branch 'master' into master rysiekpl 2017-04-11 14:02:25 +0200
  • d2ab83cbab Merge 2a611aa318 into 11898a6461 zaclys 2017-04-11 12:00:09 +0000
  • c2d355cf7a Merge 86ead64d85 into 11898a6461 zaclys 2017-04-11 12:00:09 +0000
  • 6023bec38d Avoid user enumeration with devise paranoid mode Yann GUERN 2017-04-11 13:19:56 +0200
  • 94aa6be88f Vagrant should install Ruby version set in the rbenv version file happycoloredbanana 2017-04-11 14:13:16 +0300
  • 4e56449491 add missing strings Thomas Citharel 2017-04-11 12:28:58 +0200
  • cedde04e7b Imported/Added ja to addLocaleData 新都心(Neet Shin) 2017-04-11 15:29:26 +0530
  • dd5503cc19 Update devise.fr.yml fixing minor typos goofy-bz 2017-04-11 08:43:02 +0200
  • e9b8b86b2b Added "日本語" to HUMAN_LOCALES 新都心(Neet Shin) 2017-04-11 14:47:34 +0530
  • d6407713e3 Added :ja to available_locales 新都心(Neet Shin) 2017-04-11 14:46:15 +0530
  • 13f68f0d19 Added japanese translate locales 新都心(Neet Shin) 2017-04-11 14:33:55 +0530
  • 088d478cae Correct email regexp comment Yann GUERN 2017-04-11 09:57:40 +0200
  • d947c03e98 Open sidekiq and pghero admin pages in new tab Brad Urani 2017-04-11 00:32:58 -0700
  • dfd326a1a7 Merge db1d0a73fb into 11898a6461 Sadiq Saif 2017-04-11 06:30:26 +0000
  • 370fb0f3a3 Merge branch 'master' of https://github.com/JantsoP/mastodon Jantso Porali 2017-04-11 07:28:07 +0200
  • 5446c02213 Merge remote-tracking branch 'refs/remotes/tootsuite/master' Jantso Porali 2017-04-11 07:27:52 +0200
  • 9509383e9d update translation for issue #1515 Jantso Porali 2017-04-11 07:25:01 +0200
  • 1de175125e update translation according to issue #1515 Jantso Porali 2017-04-11 07:24:27 +0200
  • 11898a6461 Add Mastodon.tools (#1457) David Libeau 2017-04-11 05:30:40 +0200
  • ee6f5038f4 Merge branch 'master' into patch-1 Shel R 2017-04-10 23:30:16 -0400
  • 0c893528a5 views/about: move about_mastodon below site_description Alex Dunn 2017-04-10 20:03:43 -0700
  • 32658bb3de add Japanese user mail views pinfort 2017-04-11 12:00:46 +0900
  • bda8340dd6 Fix jsx errors, add images to modal pages, style modal pages Shel R 2017-04-10 22:55:27 -0400
  • 94edffd6d2 views/about: use Setting.site_title instead of hardcoding Alex Dunn 2017-04-08 19:11:44 -0700
  • f3c988d404 add ja.jsx pinfort 2017-04-11 11:47:57 +0900
  • 01e5447e35 Add boost confirm modal blackle 2017-04-10 22:28:52 -0400
  • 947fa53012 fix ja.yml pinfort 2017-04-11 11:29:29 +0900
  • 4843d13071 Merge branch 'master' into uploadtext Rachel H 2017-04-10 19:28:17 -0700
  • 3344dddeea Fix clear icon Rachel 2017-04-10 19:25:37 -0700
  • 83c4cd509f Add some missing strings Carlos Escobar 2017-04-10 21:25:27 -0500
  • 72b50f6f75 Allow using .env to configure database in development Rachel 2017-04-10 19:15:52 -0700
  • 6478475f20 fix some translates pinfort 2017-04-11 11:11:52 +0900
  • cc9f4928e4 streaming API: allow env overrides of development pg settings Alex Dunn 2017-04-10 19:10:10 -0700
  • 04f8b2b3b3 Cleanup CSS Rachel 2017-04-10 19:06:33 -0700
  • 92f2471fc1 agreements from spanish community Carlos Escobar 2017-04-10 21:00:39 -0500
  • fafa26b156 fix(*): ruby version was updated in .ruby-version but not Vagrant. Make them match Gavin Mogan 2017-04-10 18:57:09 -0700
  • b183e340fb fix japanese grammar of a translate Rieksee 2017-04-11 10:56:39 +0900
  • e349561a6c fix some translations Rieksee 2017-04-11 10:52:15 +0900
  • 99a6260bed Merge branch 'master' into css Rachel H 2017-04-10 18:42:00 -0700
  • d19849fb89 Allow export of mutes list Matt Jankowski 2017-04-10 21:27:11 -0400
  • c79a481e3f Merge pull request #3 from NeetShin/master pinfort 2017-04-11 10:38:05 +0900
  • cdd9c0dbe4 Fix broken mobile CSS and inconsistent margins Rachel 2017-04-10 18:34:06 -0700
  • 675089032f update ja.yml Rieksee 2017-04-11 10:37:16 +0900
  • 5dc4a4bb48 Update doorkeeper.ja.yml 新都心(Neet Shin) 2017-04-11 07:00:03 +0530
  • 802427eeef resolve conflict with tootsuite/master Carlos Escobar 2017-04-10 20:08:44 -0500
  • 82dcb67dfb resolve conflict with tootsuite/master Carlos Escobar 2017-04-10 20:05:28 -0500
  • 785f1fbccd Added Rust API library to list of API libraries. Aaron Power 2017-04-11 01:05:42 +0100
  • 31e6a05649 Improve emoji picker look Eugen Rochko 2017-04-11 01:59:20 +0200
  • 9ea693290f Add an env variable for SMTP ca certificate Florentin Raud 2017-04-11 00:30:23 +0100
  • 0911f124de Add a path to an existing ca certificate for SMTP Florentin Raud 2017-04-11 00:22:42 +0100
  • 5856843bcd Merge 647f64887d into 4ada50985a Shawn Khameneh 2017-04-10 23:14:46 +0000
  • 58d84e1c88 Merge b9f0d15b38 into 4ada50985a Lukas Fülling 2017-04-10 23:14:16 +0000
  • 4ada50985a Pagination improvements (#1445) Matt Jankowski 2017-04-10 19:11:41 -0400
  • 4a3e156b01 Merge branch 'master' into background-profiles Eugen 2017-04-11 00:40:00 +0200
  • a283786463 Add note about minimum docker-compose version (#1264) Effy Elden 2017-04-11 08:39:39 +1000
  • 12f72e1740 When avatar/header are GIF, generate static versions (#1428) Eugen 2017-04-11 00:38:58 +0200
  • b57eed4584 Remove order prior to .find_in_batches (#1470) Matt Jankowski 2017-04-10 18:38:34 -0400
  • f83729be3d [css] replace login box shadow with .wrapper background Alex Dunn 2017-04-08 20:14:09 -0700
  • 3672a799d4 Dev Tooling fixes (eslint/editorconfig) (#1398) Gavin Mogan 2017-04-10 15:36:03 -0700
  • 3fd5385e7b Add username as a title for mentions (#1385) Matthias Jouan 2017-04-11 00:35:35 +0200
  • d62710ffcf Add rake task to generate static avatars/headers from GIF ones, add test Eugen Rochko 2017-04-11 00:33:53 +0200
  • 772a2bbf84 Merge branch 'master' into master rysiekpl 2017-04-11 00:16:30 +0200
  • 39e4f35da2 Etyczny dizajn zbyt sarkastyczny, to będą założenia Michał 'rysiek' Woźniak 2017-04-11 00:15:02 +0200
  • d439855a6d Adds error message to mastodon:confirm_email task. (#1476) Ash Furrow 2017-04-10 18:13:08 -0400
  • 634ccc6b05 Merge branch 'master' of https://github.com/tootsuite/mastodon Luclu7 2017-04-10 23:52:14 +0200
  • 5aca6f10f0 Fix JS test Eugen Rochko 2017-04-10 23:51:32 +0200
  • 2810013b93 API param to exclude notification types from response (#1341) Eugen 2017-04-10 23:45:29 +0200
  • ebf5cecd34 Merge branch 'master' into master rysiekpl 2017-04-10 23:36:04 +0200
  • 5b8e810202 Fixes margin issue Ashley E 2017-04-10 16:32:24 -0500
  • c057eafaa7 Merge branch 'master' of https://github.com/tootsuite/mastodon root 2017-04-10 23:22:51 +0200
  • fd6295c942 Add mail validation on registration Yann 2017-04-10 23:13:45 +0200
  • 472a432725 Replace will_paginate with paginate in views Matt Jankowski 2017-04-10 12:14:01 -0400
  • 8b5f2b2047 Set kaminari options to match prior behavior Matt Jankowski 2017-04-10 12:13:50 -0400
  • b31125de16 Customize kaminari views to match prior styles Matt Jankowski 2017-04-10 12:12:44 -0400
  • 62c27e8282 Replace will_paginate.page_gap with pagination.truncate in i18n Matt Jankowski 2017-04-10 12:12:10 -0400
  • c2f5548f07 Use #page instead of #paginate in controllers Matt Jankowski 2017-04-10 10:51:29 -0400
  • 84569a4b81 Replace will_paginate with kaminari Matt Jankowski 2017-04-10 10:47:49 -0400
  • 997a632614 Remove order prior to .find_in_batches Matt Jankowski 2017-04-10 15:41:49 -0400
  • 0687ab8ae3 Clean up generation of account webfinger string (#1477) Matt Jankowski 2017-04-10 16:58:06 -0400
  • 978f88d050 Merge branch 'master' into rake-task-error-message Ash Furrow 2017-04-10 16:55:52 -0400
  • 68bae3a59d Merge branch 'master' into disable-heroku-spawn Ash Furrow 2017-04-10 16:55:41 -0400
  • 4a2af5bd60 Merge branch 'master' into heroku-docs Ash Furrow 2017-04-10 16:55:22 -0400
  • 7a678d8a21 Introduce Account#local_username_and_domain for consolidation Matt Jankowski 2017-04-10 16:26:29 -0400
  • 8fab77157c Consolidate webfinger string creation under Account#to_webfinger_s Matt Jankowski 2017-04-10 16:10:48 -0400
  • e7375ebd61 Merge 915c92dd74 into 64dbde0dbf Drew DeVault 2017-04-10 20:47:59 +0000
  • 64dbde0dbf Version bumps for ruby and misc gems (#1159) Matt Jankowski 2017-04-10 16:47:41 -0400
  • 012e9d3dfc Merge cd4b947aa6 into ae57b3a8c5 Dolf RATTMANN 2017-04-10 20:47:33 +0000
  • c8acadb50d Merge 03fe20acf0 into ae57b3a8c5 Carlos A. Escobar 2017-04-10 20:46:47 +0000
  • e658f3b3ad Merge 8f592e5378 into ae57b3a8c5 yeah 2017-04-10 20:45:21 +0000
  • 4214a0d97c Merge 810269b0ea into ae57b3a8c5 MastodonRussia 2017-04-10 20:45:20 +0000
  • 2c22f08bbf Merge branch 'master' into mj-versions Eugen 2017-04-10 22:44:21 +0200
  • 4c3b496672 Merge 93a630e918 into ae57b3a8c5 Nicolas Blanco 2017-04-10 20:42:27 +0000
  • ae57b3a8c5 Add more specific class names to notification divs (#1120) Chris Martin 2017-04-10 16:41:52 -0400
  • ac1ad00fcd
    Adds error message to mastodon:confirm_email task. Ash Furrow 2017-04-10 16:29:22 -0400
  • 0dbbc16c69 More SMTP customization (#1372) Alexander Mankuta 2017-04-10 22:48:30 +0300