Commit Graph

  • 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
  • f423cbc739 Update uglifier to version 3.2.0 Matt Jankowski 2017-04-09 14:53:15 -0400
  • 7f1e4162ec Update sidekiq-unique-jobs to version 5.0.0 Matt Jankowski 2017-04-09 07:11:19 -0400
  • 0b2faa40bd Update aws-sdk to version 2.9.6 Matt Jankowski 2017-04-09 07:10:59 -0400
  • ea444d2411 Update react-rails to version 1.11.0 Matt Jankowski 2017-04-07 10:22:19 -0400
  • d2119284b4 Update simple_form to version 3.4.0 Matt Jankowski 2017-04-07 10:16:44 -0400
  • 1e041ce3c7 Update jquery-rails to version 4.3.1 Matt Jankowski 2017-04-07 10:16:14 -0400
  • 1266d178c7 Update ruby-oembed to version 0.12.0 Matt Jankowski 2017-04-07 10:14:40 -0400
  • f9129cece0 Update i18n-tasks to version 0.9.13 Matt Jankowski 2017-04-07 10:13:49 -0400
  • d4da8f263a Update rack-cors to version 0.4.1 Matt Jankowski 2017-04-07 10:11:12 -0400
  • 47cd345d18 Update pghero to version 1.6.4 Matt Jankowski 2017-04-07 10:09:17 -0400
  • e1af9cca65 Update rspec-sidekiq to version 3.0.0 Matt Jankowski 2017-04-07 10:00:44 -0400
  • 4ceb20c79c Update sidekiq to version 4.2.10 Matt Jankowski 2017-04-07 09:59:41 -0400
  • 80bff134d5 Update httplog to version 0.99.2 Matt Jankowski 2017-04-07 09:58:43 -0400
  • b583798f6f Update http to version 2.2.1 Matt Jankowski 2017-04-07 09:58:30 -0400
  • ed134f1a45 Update hamlit-rails to version 0.2.0 Matt Jankowski 2017-04-07 09:58:15 -0400
  • 80c760fd84 Update fabrication to version 2.16.1 Matt Jankowski 2017-04-07 09:57:55 -0400
  • f60c1a30a3 Update aws-sdk to version 2.9.5 Matt Jankowski 2017-04-07 09:56:01 -0400
  • 29297ea7b3 Update faker to version 1.7.3 Matt Jankowski 2017-04-07 09:55:49 -0400
  • dbad82421f Update doorkeeper to version 4.2.5 Matt Jankowski 2017-04-07 09:55:30 -0400
  • bb4f69e828 Update rubocop to version 0.48.1 Matt Jankowski 2017-04-07 09:54:41 -0400
  • 6e38a13abb Update simple-navigation to version 4.0.5 Matt Jankowski 2017-04-07 09:53:11 -0400
  • 766506914b Update pry-rails to version 0.3.6 Matt Jankowski 2017-04-07 09:52:30 -0400
  • 1615c3de21 Update fuubar to version 2.2.0 Matt Jankowski 2017-04-07 09:43:54 -0400
  • 82a912a253 Update font-awesome-rails to version 4.7.0.1 Matt Jankowski 2017-04-07 09:39:24 -0400
  • 5c3490cd59 Update will_paginate to version 3.1.5 Matt Jankowski 2017-04-07 09:38:37 -0400
  • 5d9f475669 Update puma to version 3.8.2 Matt Jankowski 2017-04-07 09:38:03 -0400
  • 6707f2cb5e Update sass to version 3.4.23 Matt Jankowski 2017-04-07 09:37:33 -0400
  • 9735350434 Use ruby version 2.4.1 Matt Jankowski 2017-04-07 09:35:07 -0400
  • 02bfcb537c Update devise to version 4.2.1 Matt Jankowski 2017-04-07 09:32:41 -0400
  • b9d0f914fb Update webmock to version 2.3.2 Matt Jankowski 2017-04-07 09:31:00 -0400
  • 8da999d931 Update hashdiff to version 0.3.2 Matt Jankowski 2017-04-07 09:27:15 -0400
  • 1b445bf3cb Update uglifier to version 3.1.13 Matt Jankowski 2017-04-07 09:26:32 -0400
  • 3789868e14 Update simplecov to version 0.14.1 Matt Jankowski 2017-04-07 09:25:55 -0400
  • b41de3ffee Update oj to version 2.18.5 Matt Jankowski 2017-04-07 09:25:35 -0400
  • 72df867f75 Update terminal-table to version 1.7.3 Matt Jankowski 2017-04-07 09:24:48 -0400
  • 5529912ed4 Update tins to version 1.13.2 Matt Jankowski 2017-04-07 09:22:47 -0400
  • 8ca45a9d20 Update warden to version 1.2.7 Matt Jankowski 2017-04-07 09:22:26 -0400
  • 47db428248 Update tilt to version 2.0.7 Matt Jankowski 2017-04-07 09:22:02 -0400
  • 4115d9bc04 Update pg to version 0.20.0 Matt Jankowski 2017-04-07 09:21:25 -0400
  • ec27ea4a97 Update dotenv-rails to version 2.2.0 Matt Jankowski 2017-04-07 09:20:52 -0400