Commit Graph

  • 3406154d33 Simplify de-dupe of exact match Matt Jankowski 2017-04-14 11:38:27 -0400
  • 4ba8120769 Extract methods for local and remote results Matt Jankowski 2017-04-14 11:32:56 -0400
  • 9c64df996b Simplify local vs remote and account isoliation Matt Jankowski 2017-04-14 11:32:12 -0400
  • eb3fa5ef5a Extract methods for local and remote results Matt Jankowski 2017-04-14 11:29:56 -0400
  • 96e6a10154 Isolate exact_match method Matt Jankowski 2017-04-14 11:18:21 -0400
  • e85cde294f Isolate query username and domain methods Matt Jankowski 2017-04-14 11:17:59 -0400
  • fdeb50002e Start to refactor account search service Matt Jankowski 2017-04-14 11:02:53 -0400
  • 4c45e0cbc6 Coverage for account being provided Matt Jankowski 2017-04-14 10:55:51 -0400
  • a6ba0139ec Coverage of resolve option Matt Jankowski 2017-04-14 10:43:11 -0400
  • f7dc985290 Spec to check that exact matches are not duped Matt Jankowski 2017-04-14 09:30:16 -0400
  • 049b2b4179 Coverage for calling local vs remote find based on domain presence Matt Jankowski 2017-04-14 09:27:31 -0400
  • 3dde856fb1 Coverage for hashtag query Matt Jankowski 2017-04-14 07:14:16 -0400
  • b3c2d94084 Begin coverage for account search service Matt Jankowski 2017-04-14 07:13:33 -0400
  • bb525940d3 Merge 1f11830237 into 120a37a197 Matt Jankowski 2017-04-15 00:50:13 +0000
  • 120a37a197 Add translations for zh-TW (Taiwan) (#1794) Shouko Yu 2017-04-15 08:49:43 +0800
  • ec9999cdfe Update Traditional Chinese, HK (zh-HK) translation (#1759) Koala Yeung 2017-04-15 08:48:30 +0800
  • 810df44cd8 Revert "f" Luclu7 2017-04-15 02:46:03 +0200
  • e806d3c3f0 Update nl.yml (#1764) Fjoerfoks 2017-04-15 02:45:46 +0200
  • 134c4a19e0 Merge branch 'master' into patch-2 Eugen 2017-04-15 02:45:37 +0200
  • 4ba6acd518 Update nl.jxs (#1766) Fjoerfoks 2017-04-15 02:44:33 +0200
  • 061922b38c Update devise.fr.yml (#1792) Olivier Humbert 2017-04-15 02:44:10 +0200
  • 5d8d827436 Update Russian translation (#1733) Ratmir Karabut 2017-04-15 03:43:51 +0300
  • def6607430 aeris patch Luclu7 2017-04-15 02:43:11 +0200
  • cde1f37d93 Use site title on tags#show page (#1802) Matt Jankowski 2017-04-14 20:37:20 -0400
  • 89707ad0ac add basic microformats tests (#1803) Ben Roberts 2017-04-14 20:37:00 -0400
  • 4bebeb27d3 More Norwegian translations (#1805) Thor Harald Johansen 2017-04-15 02:33:37 +0200
  • ef879a8839 Send initial state in a <script type="application/json"> tag (#1806) Joachim Viide 2017-04-15 03:32:42 +0300
  • 124a058988 Merge 960c7577d7 into 9240ca6cef sem schilder 2017-04-15 00:31:21 +0000
  • 9240ca6cef Mispelling & minor fixes (#1814) Darío Hereñú 2017-04-14 21:31:16 -0300
  • 619817d29e Remove unused will_paginate.page_gap key from i18n (#1815) Matt Jankowski 2017-04-14 20:30:55 -0400
  • 0655f16cc1 [css] reduce spacing between text elements on about pages (#1510) Alex Dunn 2017-04-14 17:29:32 -0700
  • ade004b5ee Polish translation (needs more love though) (#807) rysiekpl 2017-04-15 02:22:46 +0200
  • 7609593e48 Add REDIS_DB env variable to configure Redis database (#1366) Les Orchard 2017-04-14 20:21:13 -0400
  • a9529d3b4b Allow running mastodon on a different domain as the one used for identifying users (#1267) ThibG 2017-04-15 02:15:46 +0200
  • 37f997a42c Use site title on tags#show page Matt Jankowski 2017-04-14 15:53:48 -0400
  • 0cf6c4487a Merge branch 'master' of https://github.com/tootsuite/mastodon Luclu7 2017-04-15 02:14:52 +0200
  • 39f7d1fb84 f Luclu7 2017-04-15 02:14:48 +0200
  • d7e16249e8 Remove unused will_paginate.page_gap key from i18n Matt Jankowski 2017-04-14 14:44:03 -0400
  • 99b36aacb6 Merge branch 'master' into master wxcafé 2017-04-15 02:14:37 +0200
  • 1f11830237 wip Matt Jankowski 2017-04-14 14:31:19 -0400
  • 6a70da24d9 Add filtering to admin/users page Matt Jankowski 2017-04-14 14:30:37 -0400
  • 4927d3bc06 Add User.unconfirmed scope Matt Jankowski 2017-04-14 14:30:27 -0400
  • 278b3f6b4c Rename admin/accounts helper to admin/filter helper Matt Jankowski 2017-04-14 14:30:11 -0400
  • b7dccb3a1c Add a UserFilter class Matt Jankowski 2017-04-14 14:13:24 -0400
  • 59d0e3a661 Add admin/users show page with basic details Matt Jankowski 2017-04-14 13:49:02 -0400
  • b408b1ae6f Add simple index view Matt Jankowski 2017-04-14 13:41:16 -0400
  • fdf1346bca Add nav to point to users in admin Matt Jankowski 2017-04-14 13:40:47 -0400
  • e0dee2c451 Add an admin/users controller with index and show actions Matt Jankowski 2017-04-14 13:21:10 -0400
  • ca258dee20 Merge 2987531118 into 0d2910478a furoshiki 2017-04-15 00:12:23 +0000
  • 2979fb2ae9 Merge 5274399d1d into 0d2910478a sem schilder 2017-04-15 00:12:23 +0000
  • 0d2910478a Use image too in docker-compose (#1109) Pierre Ozoux 2017-04-15 01:07:59 +0100
  • 5ab0ffc6c8 Custom Paperclip path. (#778) Valentin Lorentz 2017-04-15 02:07:21 +0200
  • 9be382923e Mispelling & minor fixes Darío Hereñú 2017-04-14 21:05:44 -0300
  • 8482f67caf update Node to 6.x LTS (#1228) Alex Dunn 2017-04-14 17:05:41 -0700
  • 337de7dc8b Merge branch 'master' into node-version Eugen 2017-04-15 02:04:14 +0200
  • 5954fd3d3c Merge 2d94d8a431 into fe8dd58bc1 Patrick Figel 2017-04-14 23:52:13 +0000
  • 218f96e3c4 Merge fe8dd58bc1 into e5d5ea9715 m33m33 2017-04-14 23:23:57 +0000
  • fe8dd58bc1 Add list of muted user to UI and Getting Started (#1799) Patrick Figel 2017-04-15 01:23:49 +0200
  • 92cd207c50 Introduce capybara and first feature spec (#1801) Chad Pytel 2017-04-14 19:21:02 -0400
  • 460bf10d2d Rubocop link for Sublime Text Darío Hereñú 2017-04-14 20:15:54 -0300
  • f5cd138323 Improve i18n chooser (#1804) Matt Jankowski 2017-04-14 19:12:39 -0400
  • 3d979418d6 Merge branch 'master' into smtp_no_auth wxcafé 2017-04-15 01:08:49 +0200
  • 6902e0307b
    Assume that SMTP_LOGIN and SMTP_PASSWORD will be blank if we set SMTP_AUTH_METHOD to none Miguel Jacq 2017-04-15 09:06:11 +1000
  • e5d5ea9715 Add animations to onboarding pager changes, improve wording and styling Eugen Rochko 2017-04-15 00:06:54 +0200
  • e64279798f Merge remote-tracking branch 'upstream/master' Thor H. Johansen 2017-04-14 22:40:56 +0200
  • 47f51cd932 More Norwegian translations. Better terminology. Thor H. Johansen 2017-04-14 22:39:56 +0200
  • 0cdcefb515 Clean up default_locale method Matt Jankowski 2017-04-14 16:37:18 -0400
  • 4a673d804e Use a more accurate locale when supplied by browser headers Matt Jankowski 2017-04-14 16:35:49 -0400
  • 8c93919ad1 Send initial state in a <script type="application/json"> tag Joachim Viide 2017-04-14 23:35:33 +0300
  • 246ecd962e Add locale spec with failing locale plus region check Matt Jankowski 2017-04-14 16:32:52 -0400
  • 02749c7c1f Fix default language in ProcessFeedService Eugen Rochko 2017-04-14 22:32:31 +0200
  • a9ed898b62 add basic microformats tests Ben Roberts 2017-04-14 16:08:41 -0400
  • b71571fa82 Add on followers/following pages; use static images MKody 2017-04-14 21:38:09 +0200
  • bac254e22a Introduce capybara and first feature spec Chad Pytel 2017-04-14 14:49:36 -0400
  • c94d6ca1a9 Merge remote-tracking branch 'origin/master' into background-profiles MKody 2017-04-14 21:23:55 +0200
  • d765e85a74 Add list of muted user to UI and Getting Started Patrick Figel 2017-04-14 21:16:59 +0200
  • ad4c9171b2 Merge branch 'master' into arabic ButterflyOfFire 2017-04-14 19:53:01 +0100
  • e250a986fc Update application.rb ButterflyOfFire 2017-04-14 19:48:14 +0100
  • 3577164b13 Add translations for zh-TW (Taiwan) shouko 2017-04-15 01:59:07 +0800
  • ceb06c2de5 Update doorkeeper.fr.yml Olivier Humbert 2017-04-14 19:45:08 +0200
  • 1679f1421b Don't try to install fsevents on Linux (hides warning noise). zacanger 2017-04-14 11:30:25 -0600
  • 1188f21999 Merge branch 'master' of https://github.com/tootsuite/mastodon Luclu7 2017-04-14 19:29:31 +0200
  • 5f68090f89 d Luclu7 2017-04-14 19:29:28 +0200
  • 64326578c5 Merge branch 'master' into enhancement/jsx-a11y Zac Anger 2017-04-14 11:28:27 -0600
  • d0f8684c8d Update devise.fr.yml Olivier Humbert 2017-04-14 19:22:14 +0200
  • 066bdb21a6 Merge 85cb5a2961 into 66ea015a01 Expenses 2017-04-14 17:11:30 +0000
  • 66ea015a01 Remove current directory from PATH (#1779) Kazuhiro NISHIYAMA 2017-04-15 02:10:38 +0900
  • 1616cf98a1 Add missing Japanese translations (#1785) Kazuhiro NISHIYAMA 2017-04-15 02:10:12 +0900
  • 5aae6384ff Fix Japanese translation for remote_follow (#1771) Takayuki KUSANO 2017-04-15 02:09:52 +0900
  • 83139d081f alphabetically order gemfile Ben Roberts 2017-04-14 12:33:26 -0400
  • df1bd985cb not sure why code climate cares about gem file order, but ok Ben Roberts 2017-04-14 12:28:32 -0400
  • 37528227f5 adds basic microformats tests as suggested by @HongPong in #965 Ben Roberts 2017-04-14 12:14:54 -0400
  • 4ebb3eff2a Add missing Japanese translations Kazuhiro NISHIYAMA 2017-04-15 01:06:52 +0900
  • 03538c8682 Set OTP_SECRET in test enviroment Patrick Figel 2017-04-14 17:30:27 +0200
  • a3d39b87fb Merge branch 'master' into feature/status-max-length Jérémy Achain 2017-04-14 17:29:05 +0200
  • 03ba72263a Remove current directory from PATH Kazuhiro NISHIYAMA 2017-04-15 00:08:40 +0900
  • 5fb711b7c2 Merge branch 'master' into enhancement/jsx-a11y Zac Anger 2017-04-14 08:58:43 -0600
  • 748f34864d Make the rake mastodon:users:clear task properly clear out unconfirmed users Before it cleared out user records only (e-mail, password) without freeing up the associated username (account record). Furthermore, since these records have no dependent records (due to no user activity) they can be deleted quickly with delete_all instead of destroy Eugen Rochko 2017-04-14 16:45:36 +0200
  • bc628bc949 lel Luclu7 2017-04-14 16:28:05 +0200
  • 68d8adc621 Add language detection via WhatLanguage and (de)serialization of it through Atom Eugen Rochko 2017-04-14 16:03:55 +0200