Commit Graph

  • e68b801024 Add Admin::BaseController to wrap admin area Matt Jankowski 2017-04-10 15:05:18 -0400
  • 7ca6df944c Merge branch 'master' of https://github.com/tootsuite/mastodon Luclu7 2017-04-10 21:14:02 +0200
  • 8a27f53a5f Merge 4e19d54e66 into 1be6aa0c7f Lynn Cyrin 2017-04-10 19:12:49 +0000
  • b8c376b750 Merge 7c624fe3b5 into 1be6aa0c7f Yann GUERN 2017-04-10 19:12:09 +0000
  • 1be6aa0c7f Fix references to "v1" API (#1460) Alexsander Akers 2017-04-10 21:11:59 +0200
  • a8ef11251c Adjust css for user detail page Corey Dutson 2017-04-10 14:58:50 -0400
  • 087ca3009b Adjust background of emoji panel (#1461) Corey Dutson 2017-04-10 14:56:14 -0400
  • f6cc049b87 Update boost tooltip according to status type Yann 2017-04-10 20:48:05 +0200
  • c6a600bc61 Adjust background of emoji panel Corey Dutson 2017-04-10 14:41:04 -0400
  • 49f318e383 Style fix Josh McNamee 2017-04-10 19:37:23 +0100
  • a08aa606fb Fix references to "v1" API Alexsander Akers 2017-04-10 20:34:52 +0200
  • 73d27a3dd6 Added noagendasocial.com Craig Damlo 2017-04-10 11:03:51 -0700
  • 20cbea71b4 Add Mastodon.tools David Libeau 2017-04-10 20:02:17 +0200
  • 36cf665b0f Added protocol to example Josh McNamee 2017-04-10 18:53:58 +0100
  • 4b50d55820 Edited full_asset_path for CDN_HOST Josh McNamee 2017-04-10 18:50:12 +0100
  • 54a0b33c36 Merge pull request #5 from tootsuite/master Hugo Gameiro 2017-04-10 18:30:02 +0100
  • 0ff0e8e44e add ja.yml Rieksee 2017-04-11 02:14:41 +0900
  • 7c624fe3b5 Search by username and domain in admin accounts Yann 2017-04-10 18:52:21 +0200
  • c5200fb561 Merge pull request #2 from NeetShin/master pinfort 2017-04-11 01:47:34 +0900
  • 2797f9f1c0 👍Added doorkeeper.ja.yml 新都心(Neet Shin) 2017-04-10 22:00:43 +0530
  • 5d6e41322d Update List-of-Mastodon-instances.md tuxx 2017-04-10 18:28:58 +0200
  • 31e6c16065 responsive columns tomamplius 2017-04-10 18:03:36 +0200
  • 558bd9923b Merge pull request #1 from in9lude/master pinfort 2017-04-11 00:56:37 +0900
  • bb65c44b46 Merge branch 'master' of https://github.com/pinfort/mastodon freed0ming 2017-04-11 00:42:49 +0900
  • 99addfccbc add file simple_form.ja.yml freed0ming 2017-04-11 00:39:43 +0900
  • ef4faa3b6a Remove headers that are already set by Rails when desirable. Valentin Lorentz 2017-04-10 17:16:38 +0200
  • 5ba63a0b05 update device.ja.yml Rieksee 2017-04-10 23:37:17 +0900
  • af47c2aaeb add device.ja.yml Rieksee 2017-04-10 23:30:55 +0900
  • db7c7d1af1 Improve scrolling behaviour (#1415) Jessica Stokes 2017-04-11 00:27:30 +1000
  • cf44fb3048 Fix #1097 When onClick is falsy, do not make status content clickable Stephen Burgess 2017-04-10 09:13:36 -0500
  • 2a72ca7717 Merge dcd91b2431 into 42fb4faa0f Rachel H 2017-04-10 13:44:14 +0000
  • d92b09f399
    Allow typing a toot while an image uploads Jessica Stokes 2017-04-10 23:30:33 +1000
  • 6b1e285902 When avatar/header are GIF, generate static versions. Account API returns "avatar"/"avatar_static", "header"/"header_static" Static version is the same as original for other cases Web UI de-animates avatars in toots, lists of users Eugen Rochko 2017-04-10 15:21:25 +0200
  • a1db9a047f Merge branch 'master' into disable-heroku-spawn Ash Furrow 2017-04-10 08:26:57 -0400
  • 7e0ea3f7bc
    Updated limitations. Ash Furrow 2017-04-10 08:26:04 -0400
  • efeac124c0 Merge branch 'master' into heroku-docs Ash Furrow 2017-04-10 08:24:47 -0400
  • d973ca225e Merge 6ed7c9b087 into 42fb4faa0f BrunoSpy 2017-04-10 11:15:09 +0000
  • e3374728c1 Merge adc5907844 into 42fb4faa0f StefOfficiel 2017-04-10 11:14:28 +0000
  • 37e1b8469a Merge f836b1738d into 42fb4faa0f Ash 2017-04-10 11:12:29 +0000
  • f316593a92 Toolbar icons accessible names JP DeVries 2017-04-10 13:03:47 +0200
  • 42fb4faa0f Fix icon and emoji sizes (#1403) Ram Lmn 2017-04-10 16:32:09 +0530
  • 9bb398ee91 Minor clarifications (#1386) Ryan Freebern 2017-04-10 07:01:43 -0400
  • 9043b32183 Add Russian translation (ru) (#1023) Ratmir Karabut 2017-04-10 13:52:06 +0300
  • 959e358da2 Merge ef45f32b53 into e30bbb1cb0 Nico Van Belle 2017-04-10 10:50:55 +0000
  • 4b876a66a5 Merge b5637a28dd into e30bbb1cb0 MastodonRussia 2017-04-10 10:49:43 +0000
  • e30bbb1cb0 Fix for Import issue from URL (#1416) Jantso Porali 2017-04-10 12:49:34 +0200
  • 614b14655a Set column to fluid units Nicolas Hoffmann 2017-04-10 12:40:27 +0200
  • 925abf6c45 fix for Amazon S3/Minio instance setups Jantso Porali 2017-04-10 12:40:26 +0200
  • d4be28a24b Merge branch 'master' of https://github.com/JantsoP/mastodon Jantso Porali 2017-04-10 12:38:44 +0200
  • fbc4c263cb Merge remote-tracking branch 'refs/remotes/tootsuite/master' Jantso Porali 2017-04-10 12:38:36 +0200
  • 79d7e88156
    Move clear column button styling to css Jessica Stokes 2017-04-10 20:22:16 +1000
  • a865364700
    Replace column margin with padding Jessica Stokes 2017-04-10 20:22:06 +1000
  • 8eb36b4158
    Add SMTP enable_starttls_auto option support Alexander Mankuta 2017-04-10 11:45:39 +0300
  • a5886f660f
    Add SMTP openssl_verify_mode option support Alexander Mankuta 2017-04-10 11:44:42 +0300
  • c952ce87fb
    Allow SMTP auth method customization Alexander Mankuta 2017-04-09 13:59:09 +0300
  • 635726f322 Fix icon and emoji sizes Ram Lmn 2017-04-10 13:48:33 +0530
  • 8bdf02812c Add search to emoji picker (#1395) Gavin Mogan 2017-04-10 00:58:09 -0700
  • 5bbf255955 Keep newlines in xml Rachel 2017-04-09 22:52:55 -0700
  • 85ff12dd42 Add editorconfig file so everyones editor will be setup to follow the same standards Gavin Mogan 2017-04-09 23:14:51 -0700
  • dc0f6774d9 eslint ignore the same as git ignore. allows for eslint . Gavin Mogan 2017-04-09 22:55:39 -0700
  • a34b757ddc fix eslint errors about inconsitent returns Gavin Mogan 2017-04-09 22:53:59 -0700
  • 4fa38c5f62 Add eslint to dev dependancies so it gets installed for the repo Gavin Mogan 2017-04-09 22:52:39 -0700
  • bdf9b3c9f8 Add search to emoji picker Gavin Mogan 2017-04-09 22:48:13 -0700
  • b5637a28dd 1 MastodonRussia 2017-04-10 08:16:05 +0300
  • 6ece59e9d0 no spaces MastodonRussia 2017-04-10 08:12:17 +0300
  • 0e11c6f70f I dont understand what need codeclimate( MastodonRussia 2017-04-10 08:09:32 +0300
  • cc321807d7 Fix typo in doc. Valentin Lorentz 2017-04-10 07:02:09 +0200
  • 25530c94c0 + Tab correction MastodonRussia 2017-04-10 07:59:48 +0300
  • c02fedbb69 Delete Tab MastodonRussia 2017-04-10 07:48:05 +0300
  • c30bfc7118 Merge remote-tracking branch 'refs/remotes/tootsuite/master' into RussianLanguage MastodonRussia 2017-04-10 07:45:27 +0300
  • c454d63eb4 Focus textarea when text is inserted Rachel 2017-04-08 23:54:39 -0700
  • f836b1738d - Make columns fill screen for large displays Ash Levy 2017-04-09 22:15:27 -0400
  • 7bc18ef9b0 Update Production-guide.md Robert Henderson 2017-04-09 18:15:56 -0700
  • a1092bf6c3 Minor clarifications Ryan Freebern 2017-04-09 20:52:13 -0400
  • 1c8c8398ca Add username as a title for mentions Matthias Jouan 2017-04-10 02:18:50 +0200
  • 1ac2f62863
    Added reserved usernames from mastodon issue 1355 Nick Gerakines 2017-04-09 18:45:23 -0400
  • 647f64887d Update List-of-Mastodon-instances.md Shawn Khameneh 2017-04-09 17:40:07 -0500
  • fa0d9eb753
    Added support for configurable reserved usernames Nick Gerakines 2017-04-09 18:32:44 -0400
  • 8a39a8f065 Make name of language on english? MastodonRussia 2017-04-10 01:31:20 +0300
  • 8f26e30a1f Edit nginx config to add extra security headers. Valentin Lorentz 2017-04-10 00:27:36 +0200
  • fb99fe30ae Fix the wording for better consistency Ratmir Karabut 2017-04-10 01:19:35 +0300
  • ae37b7f735 Define volume for postgres storage Lukas Burk 2017-04-10 00:16:55 +0200
  • 90060e56b5 Changed the order in the list of languages MastodonRussia 2017-04-10 01:16:24 +0300
  • f14a816192 Fix a missing comma Ratmir Karabut 2017-04-10 01:13:39 +0300
  • b2515e8938 Remove changes in some system files MastodonRussia 2017-04-10 01:05:30 +0300
  • 82b8ca6470 1 MastodonRussia 2017-04-10 00:45:40 +0300
  • ac7fe93070 1 MastodonRussia 2017-04-10 00:41:16 +0300
  • e8dcd00033 1 MastodonRussia 2017-04-10 00:38:46 +0300
  • f8dd29c3b0 off-by-one-again Alex McGivern 2017-04-09 22:31:21 +0100
  • 1ab936d405 1 MastodonRussia 2017-04-10 00:28:39 +0300
  • 47b2829b65 off-by-one Alex McGivern 2017-04-09 22:23:04 +0100
  • a87c79b97d 1 MastodonRussia 2017-04-10 00:13:59 +0300
  • 933e9269d1 1 MastodonRussia 2017-04-10 00:09:54 +0300
  • 0d652f784b Merge branch 'master' into patch-1 Saphirine 2017-04-09 23:09:13 +0200
  • 1f23d013a6 Merge pull request #4 from tootsuite/master Hugo Gameiro 2017-04-09 22:07:06 +0100
  • a991def34a 1 MastodonRussia 2017-04-10 00:03:50 +0300
  • 3ba3c6e40c fixed nil comparison Alex McGivern 2017-04-09 21:56:19 +0100
  • 3ad693aeac Fix Style to pass codeclimate Naouak 2017-04-09 22:55:21 +0200
  • bad0f51da5 Merge c601c6d050 into 93db265be7 palindromordnilap 2017-04-09 20:55:18 +0000
  • b9f0d15b38 I changed the domain Lukas Fülling 2017-04-09 22:38:32 +0200