Commit Graph

  • 9e3c4fd2d7 Update language files (#1516) Jantso Porali 2017-04-11 21:41:29 +0200
  • 89e8e110c8 Imports controller errors (#1553) Matt Jankowski 2017-04-11 15:40:14 -0400
  • d0a3e033b4 updated max_users check to work with InstancePresenter Alex McGivern 2017-04-11 20:39:47 +0100
  • 07fb4a11d8 Refactor ImportWorker Matt Jankowski 2017-04-11 14:02:44 -0400
  • 4a84d6b4c8 Fix broken imports Matt Jankowski 2017-04-11 12:15:14 -0400
  • b253b1b799 Add failing spec for settings/imports#create Matt Jankowski 2017-04-11 12:06:09 -0400
  • a6d33785d5 Add spec for settings/imports controller Matt Jankowski 2017-04-11 12:03:08 -0400
  • 4cf0f9a15d Merge branch 'master' of https://github.com/tootsuite/mastodon Alex McGivern 2017-04-11 20:35:55 +0100
  • 9f7ea77d0c Merge branch 'master' of github.com:tootsuite/mastodon Eugen Rochko 2017-04-11 21:30:48 +0200
  • 5f74397ef0 Merge branch 'blackle-master' Eugen Rochko 2017-04-11 21:30:34 +0200
  • 960181fd99 Fix look of the modals Eugen Rochko 2017-04-11 21:24:17 +0200
  • 76c1e586b1 Avoid re-fetching webfinger info in tests unless otherwise specified Thibaut Girka 2017-04-09 17:37:35 +0200
  • 6815da9a82 Do not refresh existing remote account details more than once a day Thibaut Girka 2017-04-09 16:44:02 +0200
  • a01f231fce Refactor changes Thibaut Girka 2017-04-09 12:21:59 +0200
  • f39174c427 Fix syntax error Ratmir Karabut 2017-04-11 22:13:46 +0300
  • 269dd2d856 Lay out pages 2 through 5, add images, style modals (#1509) Shel R 2017-04-11 15:12:38 -0400
  • c7b22ab281 Arrange Russian setting alphabetically Ratmir Karabut 2017-04-11 22:12:13 +0300
  • 0028833b7e Merge pull request #6 from tootsuite/master Hugo Gameiro 2017-04-11 20:09:37 +0100
  • 8d614818be Update Russian translation Ratmir Karabut 2017-04-11 22:04:49 +0300
  • c570e1daf8 fix p-summary for content warning posts Ben Roberts 2017-04-11 14:50:16 -0400
  • 2a7602cad4 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master Eugen Rochko 2017-04-11 20:43:56 +0200
  • a47a20a703 Merge branch 'master' of https://github.com/tootsuite/mastodon Luclu7 2017-04-11 20:41:45 +0200
  • 0cfc923319 Fix #1535 - #1372 set a wrong default on :openssl_verify_mode Eugen Rochko 2017-04-11 20:39:57 +0200
  • 1348c7e68e DRYing out icon code JP DeVries 2017-04-11 20:21:14 +0200
  • 2b0cb7da42 reordered and added a comment James Moore 2017-04-11 11:20:21 -0700
  • a39f6dc294 Fix git merge error Yann GUERN 2017-04-11 20:07:36 +0200
  • 559cec2d79 added stub in .env file James Moore 2017-04-11 11:04:51 -0700
  • 1a930b9717 Merge remote-tracking branch 'upstream/master' Ben Roberts 2017-04-11 14:00:36 -0400
  • 47aacb773b Better background-photo.jpeg (#1560) Komic 2017-04-11 19:51:13 +0200
  • 0f8a3153fa Merge remote-tracking branch 'upstream/master' into feature-admin-create-user-account Yann GUERN 2017-04-11 19:49:45 +0200
  • 9fcf9925db Better background-photo.jpeg Komic 2017-04-11 19:41:14 +0200
  • 89f3cf08b6 Merge branch 'master' into master Ben Roberts 2017-04-11 13:38:40 -0400
  • 9ea26415e8 Re-fetch remote users we aren't subscribed to. Thibaut Girka 2017-04-09 09:52:30 +0200
  • 874d2b15a5 Refresh local info for remote accounts when webfinger returns new values Thibaut Girka 2017-04-09 09:05:10 +0200
  • 82d9336114 Increase breakpoint size for bio on account show (#1559) Matt Jankowski 2017-04-11 13:35:06 -0400
  • e60286a344 Remove unused methods from StreamEntriesHelper (#1365) Matt Jankowski 2017-04-11 13:32:02 -0400
  • 53850bce93 Remove unused AtomBuilderHelper (#1364) Matt Jankowski 2017-04-11 13:31:22 -0400
  • 5a29748b07 Increase breakpoint size for bio on account show Matt Jankowski 2017-04-11 13:22:43 -0400
  • 71f867e879 Add hover animation to emojis in picker Eugen Rochko 2017-04-11 19:20:26 +0200
  • 9a441977e6 Fix a translation and add translation for devise part Thomas Citharel 2017-04-11 19:08:57 +0200
  • 8d52a75c11 delivery fix James Moore 2017-04-11 09:48:09 -0700
  • 50fc4abd4f Remove unused methods from StreamEntriesHelper Matt Jankowski 2017-04-09 15:42:55 -0400
  • a377ddc31a Remove unused AtomBuilderHelper Matt Jankowski 2017-04-09 15:10:01 -0400
  • 1236529e39 Moving docs to tootsuite/documentation (#1550) Eugen 2017-04-11 18:03:02 +0200
  • f0fc3a1ff8 Update fr.jsx goofy-bz 2017-04-11 17:54:35 +0200
  • 5cfedd1b42 Moving docs to tootsuite/documentation Eugen Rochko 2017-04-11 17:54:20 +0200
  • 8c5fc3b7cb Merge remote-tracking branch 'upstream/master' into feature-admin-create-user-account Yann GUERN 2017-04-11 17:42:45 +0200
  • ca5d87994a Fix #1491 - Fix broken notifications, broken Link header parsing for exclude_types Eugen Rochko 2017-04-11 17:29:08 +0200
  • 529a2edded Merge branch 'master' into master pinfort 2017-04-12 00:23:58 +0900
  • b244a4ae8d Manually add user from admin interface Yann GUERN 2017-04-11 17:20:04 +0200
  • df16b33e06 minimized svg logo Julien Deswaef 2017-04-11 11:13:54 -0400
  • 4aa8158f2f Merge pull request #4 from NeetShin/master pinfort 2017-04-12 00:11:27 +0900
  • c3170bc404 update ja.jsx pinfort 2017-04-12 00:06:29 +0900
  • c597bfb718 Merge eed2b8d83d into b723ee73fc Riley Kyeden 2017-04-11 15:02:39 +0000
  • eed2b8d83d Add bit of text to docs to see how this works. Riley Kyeden 2017-04-11 10:52:11 -0400
  • 9f8dbf000d Merge 064bc0442b into b723ee73fc Komic 2017-04-11 14:27:44 +0000
  • 144f4355e9 Merge 64659a0f4d into b723ee73fc Florian Roméo 2017-04-11 14:27:44 +0000
  • a4d4d882c9 Merge 14d2d7a89e into b723ee73fc kadiix 2017-04-11 14:27:43 +0000
  • 400a6bc0a3 Merge 2d584dc086 into b723ee73fc FlorianFun 2017-04-11 14:27:42 +0000
  • 8f4a1e211a Merge 8024c265c1 into b723ee73fc Corey Mohler 2017-04-11 14:27:42 +0000
  • 0b451e5447 Merge 933d143baa into b723ee73fc Sadiq Saif 2017-04-11 14:27:42 +0000
  • 9c2c95aae2 Merge 4a2af5bd60 into b723ee73fc Ash Furrow 2017-04-11 14:27:29 +0000
  • 344093f913 Merge ef4faa3b6a into b723ee73fc Valentin Lorentz 2017-04-11 14:27:27 +0000
  • 133f9233ca Merge 7bc18ef9b0 into b723ee73fc Robert Henderson 2017-04-11 14:27:27 +0000
  • 2b375556c9 Merge 5d6e41322d into b723ee73fc tuxx 2017-04-11 14:22:02 +0000
  • 05e2f6c35d Merge 73d27a3dd6 into b723ee73fc Craig Damlo 2017-04-11 14:22:02 +0000
  • 1a6ea457fc Merge remote-tracking branch 'upstream/master' Jukka Peranto 2017-04-11 17:17:36 +0300
  • 06444bf050 Allow user to disable the boost confirm dialog in preferences blackle 2017-04-11 10:10:16 -0400
  • 93664c7580 Merge 785f1fbccd into b723ee73fc Aaron Power 2017-04-11 14:05:16 +0000
  • b723ee73fc Add (commented) volume in docker-compose && Mitigating the HTTPoxy Vulnerability (#1253) Valentin Ouvrard 2017-04-12 01:04:56 +1100
  • 65cf940346 Revised finnish translation Jukka Peranto 2017-04-11 16:59:21 +0300
  • 98fefe8498 Add a way to bind streaming service to localhost adding Environment="BIND=127.0.0.1" to systemd service maudin 2017-04-11 15:42:10 +0200
  • 85f32c710d Merge 57dfeb1b0e into c35bda0551 Mykola Bilokonsky 2017-04-11 13:07:37 +0000
  • b78a821ed7 Merge ae37b7f735 into c35bda0551 Lukas Burk 2017-04-11 13:07:35 +0000
  • ca5bfb2d62 Merge fcc94e50f6 into c35bda0551 Eric Blade 2017-04-11 13:06:21 +0000
  • c35bda0551 fix(*): ruby version was updated in .ruby-version but not Vagrant. Make them match (#1502) Gavin Mogan 2017-04-11 06:06:07 -0700
  • eb5a63b8b0 Merge 2aadf735af into a85d4473aa Wonderfall 2017-04-11 13:02:43 +0000
  • 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