Commit Graph

  • 037003223c Merge pull request #7 from pinfort/translate-selfwork pinfort 2017-04-12 20:25:24 +0900
  • 4e2cf10ce0 Merge branch 'translate' into translate-selfwork pinfort 2017-04-12 20:25:14 +0900
  • 1ea486100c 再度変更 pinfort 2017-04-12 20:21:34 +0900
  • 0163821174 戻しきれてなかった pinfort 2017-04-12 20:18:57 +0900
  • 857dda3d58 一回戻す pinfort 2017-04-12 20:16:26 +0900
  • 639885a350 Merge branch 'master' into master Ratmir Karabut 2017-04-12 14:08:27 +0300
  • 139d1df9bf いいねをお気に入りに統一 pinfort 2017-04-12 20:08:10 +0900
  • 0c90bf9e10 Merge branch 'master' of https://github.com/tootsuite/mastodon Luclu7 2017-04-12 13:04:20 +0200
  • fd55207989 cc Luclu7 2017-04-12 13:04:15 +0200
  • 05e9d93a99 freeの訳修正 pinfort 2017-04-12 20:02:23 +0900
  • fde50f32b6 Revert "ミスったので戻す" pinfort 2017-04-12 19:58:24 +0900
  • 00be7a748a ミスったので戻す pinfort 2017-04-12 19:55:29 +0900
  • 7dd0970d82 Insert instance in registration emails and improve them a bit Thomas Citharel 2017-04-12 12:52:34 +0200
  • b4e1e06503 revertでミスったので戻す pinfort 2017-04-12 19:51:33 +0900
  • 616005569f Revert "freeの訳修正" pinfort 2017-04-12 19:44:34 +0900
  • f16b9a4928 Fix redirect link on Tuning.md (#1595) Christopher Su 2017-04-12 03:40:37 -0700
  • 2ee4ce79e5 Revert "いいねをお気に入りに統一" pinfort 2017-04-12 19:38:28 +0900
  • 568d5cccfa いいねをお気に入りに統一 pinfort 2017-04-12 19:33:01 +0900
  • 565658a605 freeの訳修正 pinfort 2017-04-12 19:32:33 +0900
  • 2d95bef89c Translate site setting section Thomas Citharel 2017-04-12 12:08:48 +0200
  • 68df2003b2 Make error pages translatable and translate them in english and french Thomas Citharel 2017-04-12 10:53:36 +0200
  • 65885fd6d2 Make subject of emails translatable and improve french translation Thomas Citharel 2017-04-11 18:33:07 +0200
  • 846e5d67a8 Merge pull request #6 from pinfort/translate-selfwork pinfort 2017-04-12 19:11:12 +0900
  • f723ac2deb Make Reporting admin section translatable Thomas Citharel 2017-04-11 17:41:22 +0200
  • 929e766cb6 fix translations 翻訳の誤りの修正と改善 pinfort 2017-04-12 19:10:03 +0900
  • cf4d23284e Merge remote-tracking branch 'upstream/master' update master pinfort 2017-04-12 18:43:45 +0900
  • e1c9a351ea Update fr.yml CgX 2017-04-12 11:34:56 +0200
  • 7a1903cdf7 Merge branch 'master' into skylight Eugen Rochko 2017-04-12 11:28:37 +0200
  • 3df4437d9f Fix devise translations Svetlozar Todorov 2017-04-10 06:26:54 +0300
  • ce80b1c09f Add devise translations Svetlozar Todorov 2017-04-09 19:54:43 +0300
  • e456570afc Add rest of translations to bg.jsx Svetlozar Todorov 2017-02-23 22:41:17 +0200
  • f8f70899bf Add a bunch of translations to bg.jsx Svetlozar Todorov 2017-02-20 13:58:04 +0200
  • d53fb116bd Add translation files and declarations for Bulgarian Svetlozar Todorov 2017-02-18 15:43:23 +0200
  • b74507ada0 Merge branch 'master' into feature-reserved-usernames Eugen 2017-04-12 10:48:58 +0200
  • 3c885cb564 adding required attribute to input.search__input JP DeVries 2017-04-12 10:24:10 +0200
  • b2ec7c472e Search Form A11Y JP DeVries 2017-04-12 00:08:20 +0200
  • edcb625079 further updates to Docker instructions in README and docker-compose.yml Eric Blade 2017-04-12 03:14:36 -0400
  • 022913bc14
    Add note in .env.production.sample about SMTP settings for servers where no auth is required Miguel Jacq 2017-04-12 17:19:44 +1000
  • 24eb45425e Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544) Koala Yeung 2017-04-12 14:50:50 +0800
  • 4c4f9a210a
    Allow using an SMTP server without authentication (e.g Postfix relay on the same host) by setting SMTP_LOGIN and SMTP_AUTH_METHOD to 'none' Miguel Jacq 2017-04-12 16:17:31 +1000
  • 42ba119957 Resort language selection box alphabetically Koala Yeung 2017-04-12 13:18:24 +0800
  • 58bb5dac3a Sort application.rb locale with alphabetical order Koala Yeung 2017-04-12 13:17:14 +0800
  • 28c9e1c54e Open sidekiq and pghero admin pages in new tabs Brad Urani 2017-04-11 22:14:56 -0700
  • 1856ac0c30 Rearrange language references in mastodon.jsx Koala Yeung 2017-04-12 12:50:19 +0800
  • 0e7cff9fbd Fix redirect link on Tuning.md Christopher Su 2017-04-11 21:30:37 -0700
  • e228b0b02b Added Chinese Traditional Hong Kong (zh-HK) for JS Koala Yeung 2017-04-11 22:51:29 +0800
  • 71d856cbf1 Added Chinese Traditional Hong Kong (zh-HK) for Ruby Koala Yeung 2017-04-11 17:57:12 +0800
  • 94530540d5 CSS Variables for Sass $colors JP DeVries 2017-04-12 01:51:48 +0200
  • 8fdd6ac073 Merge 529a2edded into 3442bc0ea3 新都心(Neet Shin) 2017-04-11 23:40:36 +0000
  • 3442bc0ea3 update Docker section of README (#1231) Eric Blade 2017-04-11 19:14:56 -0400
  • 06a10ef98d Add mask-icon (#1572) Dale Price 2017-04-11 17:49:03 -0500
  • b33424ff88 Add unit tests for https://github.com/tootsuite/mastodon/pull/1574 Henry Smith 2017-04-12 00:19:20 +0200
  • 7f0c056265 Merge branch 'master' into master Eric Blade 2017-04-11 18:24:35 -0400
  • 9b8fb91d74 [web] Moving docs link to tootsuite/documentation lindwurm 2017-04-12 06:49:41 +0900
  • 40bdf43297 Change default log level in production from :debug to :info for less I/O (#1579) Eugen 2017-04-11 23:28:23 +0200
  • 1cd9773631 Change default log level in production from :debug to :info for less I/O Eugen Rochko 2017-04-11 23:27:34 +0200
  • 9c6eae2fb6 terms: remove redundant words Alyssa Ross 2017-04-11 22:24:34 +0100
  • 8ead070b94 Improve emoji picker look (#1493) Eugen 2017-04-11 23:23:34 +0200
  • ac7fb25492 Merge pull request #7 from tootsuite/master Hugo Gameiro 2017-04-11 21:57:31 +0100
  • b22b2cbfac Fix #1491 - Fix broken notifications, broken Link header parsing for exclude_types (#1548) Eugen 2017-04-11 22:53:58 +0200
  • 2f2b84bfbb Add task in order to delete unconfirmed users (older than 2days) (#1571) d0p1 2017-04-11 22:51:17 +0200
  • 5cdd2c2414 Fix #1535 - #1372 set a wrong default on :openssl_verify_mode (#1563) Eugen 2017-04-11 22:49:53 +0200
  • 6c5c88f8ac capistrano: link robots.txt Alex Dunn 2017-04-11 07:20:59 -0700
  • a71421267a fix lint problems Alex McGivern 2017-04-11 21:29:16 +0100
  • 2bf72e724b Merge branch 'master' of https://github.com/tootsuite/mastodon Luclu7 2017-04-11 22:15:17 +0200
  • 5998dea1ed Add REDIS_DB env variable to configure Redis database Les Orchard 2017-04-09 18:26:29 +0000
  • 8b4b6e019f change 7 days to 2 d0p1 2017-04-11 21:59:00 +0200
  • 92ee05e7d6 Merge branch 'master' of https://github.com/tootsuite/mastodon Alex McGivern 2017-04-11 21:01:35 +0100
  • 3ddd936b03 Refactor exports controller (#1567) Matt Jankowski 2017-04-11 16:00:43 -0400
  • 211f79a113 Merge branch 'master' of https://github.com/tootsuite/mastodon Luclu7 2017-04-11 21:59:38 +0200
  • 1921c5416b Fix console error when scrolling a column with no scrollable content (#1574) Henry Smith 2017-04-11 21:58:28 +0200
  • 40337adbd5 Merge d19849fb89 into fc47c1d00e Matt Jankowski 2017-04-11 19:57:56 +0000
  • fc47c1d00e [about] Moving docs link to tootsuite/documentation (#1573) lindwurm 2017-04-12 04:57:05 +0900
  • 327a6e166f Update french locale (#1525) Thomas Citharel 2017-04-11 21:54:40 +0200
  • e5a7b6d261 Merge branch 'master' into move_docs_link lindwurm 2017-04-12 04:53:27 +0900
  • 6f5268b02d Add Japanese translation (#1552) pinfort 2017-04-12 04:52:09 +0900
  • 11a964bbc6 [about] Moving docs link to tootsuite/documentation lindwurm 2017-04-12 04:44:47 +0900
  • 317d3c2cad Move settings/export to more restful routes Matt Jankowski 2017-04-11 15:23:12 -0400
  • 5807107609 Simplify settings/exports controller methods Matt Jankowski 2017-04-11 15:12:57 -0400
  • f2419d8ba1 Use Export class in settings/exports controller Matt Jankowski 2017-04-11 15:05:18 -0400
  • 14d7296c4f Add model to handle exports Matt Jankowski 2017-04-11 15:03:34 -0400
  • aec56b36a8 Remove deprecated render :text in favor of send_data for csv downloads Matt Jankowski 2017-04-11 14:37:27 -0400
  • ff1a014feb Add coverage for download export actions Matt Jankowski 2017-04-11 14:34:23 -0400
  • b495ba866e Remove unused @account variable from settings/exports controller Matt Jankowski 2017-04-11 14:29:24 -0400
  • 4673b6a030 Add basic coverage for settings/exports controller Matt Jankowski 2017-04-11 14:27:17 -0400
  • 08dc3fbd18 Fix console error when scrolling a column with no scrollable content Henry Smith 2017-04-11 21:45:03 +0200
  • dafdd0b383 Merge branch 'master' into translate Eugen 2017-04-11 21:44:26 +0200
  • 085457f502 add task in order to delete unconfirmed user d0p1 2017-04-11 21:42:02 +0200
  • 4964433190 Revised finnish translation (#1537) jukper 2017-04-11 22:41:40 +0300
  • 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