Commit Graph

  • cd13856900 Merge branch 'osaka-master' into src/v.12_for_merge_to_osaka alarky 2017-04-18 21:54:36 +0900
  • 69f9f8bcd5 Fix oc.yml Koala Yeung 2017-04-18 20:03:51 +0800
  • 5ba72748ee Update ruby locale list (oc) Koala Yeung 2017-04-18 19:58:31 +0800
  • 246bbee97b Update javascript locale support (oc) Koala Yeung 2017-04-18 19:57:55 +0800
  • 4efd347622 Fix typo in oc.yml Koala Yeung 2017-04-18 19:39:15 +0800
  • 20c883987d Merge en.yml changes into oc.yml Koala Yeung 2017-04-18 19:38:22 +0800
  • f7a978626f Added oc.yml Quent-in 2017-04-17 15:25:17 +0200
  • 016974e079 Added simple_form.oc.yml Quent-in 2017-04-17 15:30:53 +0200
  • f4a8da64bb Added doorkeeper.oc.yml Quent-in 2017-04-17 15:29:53 +0200
  • 2ec6a62dc5 Added oc.jsx (Occitan translation) Quent-in 2017-04-17 15:28:34 +0200
  • 31336d63fa Add "Mastodon" to user agent ik 2017-04-18 19:44:32 +0900
  • a547ea7e7c Add bundle install jobs option Peranikov 2017-04-18 21:00:00 +0900
  • 89d29bd906 Add rate limits for logins and sign-ups by IP (5 in 5 minutes) Should be enough for normal attempts Eugen Rochko 2017-04-18 13:50:49 +0200
  • 75910abd8f Add hasMore field to account timeline (#2066) geta6 2017-04-18 20:10:49 +0900
  • b2bac46143 Merge branch 'master' into master Ratmir Karabut 2017-04-18 13:51:14 +0300
  • af5e0407ce Merge branch 'master' into feature/status-max-length Jérémy Achain 2017-04-18 12:04:42 +0200
  • fb8daf79b7 Merge branch 'feature/status-max-length' of github.com:pixocode/mastodon into feature/status-max-length pixocode@pixel 2017-04-18 12:03:07 +0200
  • e10a096f9f add localizations pixocode@pixel 2017-04-18 12:02:54 +0200
  • 1fc112746e Add hasMore field to account timeline geta6 2017-04-18 17:47:59 +0900
  • 04cd1157b6 after manually removing node-gyp as top level dependency Christoph Witzany 2017-04-18 06:47:18 +0000
  • 48e0e4a155 after yarn upgrade Christoph Witzany 2017-04-18 06:42:26 +0000
  • 202225f97d French translation update Olivier Humbert 2017-04-18 09:50:41 +0200
  • cf38871084 if this patch is accepted, whatlanguage gem is not needed. Keiji Yoshimi 2017-04-18 16:42:05 +0900
  • cca78c0bdc handle nil case Keiji Yoshimi 2017-04-18 14:47:31 +0900
  • 22a265f2f9 fallback default to 'en' Keiji Yoshimi 2017-04-18 14:39:49 +0900
  • f3d077ada9 whatlanguage gem cannot handle properly some languages (ex. ja, cn, ko). Keiji Yoshimi 2017-04-18 11:15:28 +0900
  • 6baef66199 fixed translation by feedback Keiji Yoshimi 2017-04-18 16:01:31 +0900
  • e8f6d09bfb translate onboarding modal to japanese Keiji Yoshimi 2017-04-18 12:26:39 +0900
  • 1e780b37c2 Make S3_ENABLED false as default zunda 2017-04-17 21:09:12 -1000
  • bded6c9e34 Merge branch 'master' into mine NoNameA 774 2017-04-18 15:35:38 +0900
  • b5979be276 uncomment out bind mount settings NoNameA 774 2017-04-18 15:33:45 +0900
  • abc4e876cd Add newrelic, airbrake tnantoka 2017-04-18 14:54:14 +0900
  • 2358b4ee4e Update storybook file autoload usagi.f@gmail.com 2017-04-18 14:53:04 +0900
  • 2952d80c39 Adding JSON view Wogan May 2017-04-18 03:56:41 +0000
  • f302633f24 Configure to persistance DB, REDIS tnantoka 2017-04-18 11:48:57 +0900
  • ab0d5e9be4 Replace web-domain to local-domain in uri 3846masa 2017-04-18 09:26:41 +0900
  • 7175794c04 Revert "Fix `./xmlns:author/xmlns:uri` when using `WEB_DOMAIN` env" 3846masa 2017-04-18 09:23:21 +0900
  • 93c13fe691 Merge branch 'patf-pause-gif' Eugen Rochko 2017-04-18 01:58:14 +0200
  • 42d54dc9ea Adjust visuals of non-autoplaying GIFV Eugen Rochko 2017-04-18 01:57:50 +0200
  • 57d784f1e4 Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif Eugen Rochko 2017-04-18 01:25:50 +0200
  • 16d50f60d1 Remove unused methods (#1730) Matt Jankowski 2017-04-17 19:21:55 -0400
  • 0e0347ea3c Merge branch 'pixiv-fix/cache_blocking' Eugen Rochko 2017-04-18 01:20:29 +0200
  • f5cd0b4956 Rename cache key to exclude_account_ids_for:id, adjust formatting Eugen Rochko 2017-04-18 01:14:02 +0200
  • 2fd0473aa1 Merge branch 'fix/cache_blocking' of git://github.com/pixiv/mastodon into pixiv-fix/cache_blocking Eugen Rochko 2017-04-18 01:09:57 +0200
  • f03fb6c0ae Add forgotten AtomSerializer spec (#2047) Eugen 2017-04-18 01:07:46 +0200
  • 53d79c4ff0 Add forgotten AtomSerializer spec Eugen Rochko 2017-04-18 01:07:10 +0200
  • 8d3412c90c Ignore /vendor/bundle (#1880) Marcin Cieślak 2017-04-18 01:02:50 +0200
  • 9cefb5731d Add FR locales to the onboarding modal (#1976) Damien Erambert 2017-04-17 16:02:02 -0700
  • 00a85f31ca Add simplified Chinese js translation (#2044) Mingye Wang 2017-04-17 19:01:32 -0400
  • 75bb836829 Add simplified Chinese js translation Mingye Wang 2017-04-17 18:24:35 -0400
  • 389f8f8249 Instance helper to replace site title helper (#2038) Matt Jankowski 2017-04-17 18:16:32 -0400
  • e1e15adf1d Updated, improved and fixed Dutch language strings (#2030) jeroenpraat 2017-04-18 00:16:03 +0200
  • 8cab155a9b hopefully now fixed jeroenpraat 2017-04-17 23:46:55 +0200
  • d674b1bd22 not needed jeroenpraat 2017-04-17 23:32:16 +0200
  • a28d3fa258 admin.reportsi jeroenpraat 2017-04-17 23:29:56 +0200
  • 1b49943a22 Coverage for Account.triadic_closures Matt Jankowski 2017-04-14 09:55:17 -0400
  • 83a8db8f61 Use interpolated query style in Account.triadic_closures Matt Jankowski 2017-04-14 09:55:06 -0400
  • 6cab212031 Add mastodon:users:admins task to list all admin emails Matt Jankowski 2017-04-14 09:36:50 -0400
  • be546f6ae3 Remove unused User.prolific scope Matt Jankowski 2017-04-13 16:58:07 -0400
  • 9e6346b7f2 Remove unused method Account#followers_domains Matt Jankowski 2017-04-13 16:55:31 -0400
  • fdb5dd8a4e Remove unused method #set_account_counters_maps from api controller Matt Jankowski 2017-04-13 16:50:47 -0400
  • 109cf72099 Remove unused method #set_counters_maps from api controller Matt Jankowski 2017-04-13 16:50:36 -0400
  • c998c6fae9 Use site_hostname helper in places that need local_domain value Matt Jankowski 2017-04-17 16:42:35 -0400
  • f52e1fe5c2 Add site_hostname helper method to wrap up local_domain value Matt Jankowski 2017-04-17 16:42:20 -0400
  • 37aa1a296d Remove newline in <title> tag Matt Jankowski 2017-04-17 16:33:20 -0400
  • a62b2535f8 Move site title helper to instance helper (name change only) Matt Jankowski 2017-04-17 16:24:51 -0400
  • f96f8d0176 Use .presence instead of ternary on site description for og: content (#2033) Matt Jankowski 2017-04-17 17:19:45 -0400
  • 8d66002a1c fix comma jeroenpraat 2017-04-17 23:10:41 +0200
  • 0fa182d27f Remove API authentication for public statuses (after review) happycoloredbanana 2017-04-16 15:31:30 +0300
  • a05e7582e4 optimized logo (#2020) Sam Hewitt 2017-04-17 15:49:51 -0400
  • ab353a0e98 Use .presence instead of ternary on site description for og: content Matt Jankowski 2017-04-17 15:40:21 -0400
  • f943b7fa74 This is what we call in Dutch 'the English disease' :-) jeroenpraat 2017-04-17 21:30:31 +0200
  • fc122e9d78 README tidy up (#2026) Matt Jankowski 2017-04-17 15:28:31 -0400
  • 597243e399 More improvements and additions - not complete yet, but most is there jeroenpraat 2017-04-17 21:17:43 +0200
  • dd4cc9930d Merge a7f2e09139 into 7d1e653ec1 Ash Furrow 2017-04-17 19:02:11 +0000
  • 7d1e653ec1 Fix import pt_br locale in mastodon.jsx (#2011) Andrey Blinov 2017-04-17 22:01:42 +0300
  • 3f55af1de4 Merge branch 'master' into master Ratmir Karabut 2017-04-17 21:55:00 +0300
  • 8045c467f6 Link to related tech Matt Jankowski 2017-04-17 14:41:33 -0400
  • 9910adc661 Merge e30e434c82 into 7b397b1452 Hugo Gameiro 2017-04-17 18:39:43 +0000
  • a8a7645241 Move local domain and host config to docs repo Matt Jankowski 2017-04-17 14:34:34 -0400
  • 7b397b1452 Return early from submit if no text. (#1962) Zac Anger 2017-04-17 12:30:38 -0600
  • 41c6701747 Move advice about tagged releases to docs repo Matt Jankowski 2017-04-17 14:29:28 -0400
  • 8fd6552bca French i18n-tasks missing fr (#2018) spf 2017-04-17 20:27:11 +0200
  • 6143042138 Move requirements to contributing doc Matt Jankowski 2017-04-17 14:19:00 -0400
  • 10281a9ce7 Updated with admin strings jeroenpraat 2017-04-17 20:17:03 +0200
  • 76e2f011dc Move tasks to docs repo Matt Jankowski 2017-04-17 14:16:31 -0400
  • f14d89561b Remove docker guide and put it in docs repo Matt Jankowski 2017-04-17 13:57:46 -0400
  • a2f0dc29da Return early from submit if no text. zacanger 2017-04-16 15:52:57 -0600
  • 4ed12cd89a Remove i18n_spec file (#2014) Matt Jankowski 2017-04-17 14:02:29 -0400
  • cc1361c149 Media controller specs (#2022) Matt Jankowski 2017-04-17 14:02:00 -0400
  • 15ec4ae07b Fix #1972, fix #1870 - Fix special characters in XML, add tests (#1988) Eugen 2017-04-17 19:58:54 +0200
  • e43071a2f9 Fix #1897 - Return reblogged: false on unreblog (was wrongly named variable) (#1989) Eugen 2017-04-17 19:58:38 +0200
  • 21a767dcfa Improve handling of HTTP_ACCEPT for webfinger (#2008) Matt Jankowski 2017-04-17 13:58:03 -0400
  • 3399dd7a66 Fix nil query_username (#2013) Tomohiro Suwa 2017-04-18 02:57:02 +0900
  • 822b7677bb Merge branch 'master' of https://github.com/Luclu7/7nw.eu Luclu7 2017-04-17 19:36:04 +0200
  • 666cdde70a Server side Luclu7 2017-04-17 19:35:45 +0200
  • 5592e68cdf Mail patch Luclu7 2017-04-17 19:28:01 +0200
  • eedac346fa Simplify methods in media controller Matt Jankowski 2017-04-17 13:23:56 -0400
  • 8447d030f5 Add MediaAttachment.attached scope Matt Jankowski 2017-04-17 13:21:23 -0400
  • 84dfc8bce1 Add spec for media controller Matt Jankowski 2017-04-17 13:21:08 -0400