tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 4445ebdad2 Fix getting started commands out of order (#1737) Ian Kelling 2017-04-14 01:04:19 -08:00
  • c019b0acfd Modify ActionMailer configuration to default to ENV['LOCAL_DOMAIN'] if ENV['SMTP_DOMAIN'] is not set. The previous fallback, config.x.local_domain, is undefined when the code is called. (#1745) Effy Elden 2017-04-14 19:02:25 +10:00
  • 7447e7a2ea Merge branch 'matteoaquila-master' Eugen Rochko 2017-04-13 22:26:54 +02:00
  • c8be05a4a7 Fix italian translation Eugen Rochko 2017-04-13 22:26:32 +02:00
  • 41c697fd81 Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master Eugen Rochko 2017-04-13 22:25:07 +02:00
  • c5afe573da Fix drag & drop overlay not appearing on firefox (#1721) Eugen 2017-04-13 22:21:34 +02:00
  • 485310a43c Make browserify respect changes in node_modules for asset compilation (#1722) Eugen 2017-04-13 22:21:20 +02:00
  • 9aae9ae40c Update devise.it.yml Matteo Aquila 2017-04-13 22:09:47 +02:00
  • 1fb125b630 Update devise.it.yml Matteo Aquila 2017-04-13 22:06:19 +02:00
  • 057567d548 Make boost modal off by default (#1719) Eugen 2017-04-13 21:53:59 +02:00
  • 169c68a739 Add filename extension to paperclip (#1718) Yusuke Abe 2017-04-14 04:52:56 +09:00
  • 9f182346d7 Use english in reported by translation (#1713) Matt Jankowski 2017-04-13 15:49:46 -04:00
  • a58c935c3d Fr missing strings (#1708) spf 2017-04-13 21:49:34 +02:00
  • c0c56db0fa Translate admin (#1702) Thomas Citharel 2017-04-13 21:49:07 +02:00
  • d9dc0fe84e smtp delivery type fix (#1556) James Moore 2017-04-13 10:51:49 -07:00
  • 55b56e3f95 terms: remove redundant words (#1578) Alyssa Ross 2017-04-13 18:50:19 +01:00
  • c4d39b1b3d quick typo fix in en.jsx: Rejec -> Reject (#1701) R Tucker 2017-04-13 13:37:04 -04:00
  • ac54da9394 Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699) Eugen 2017-04-13 19:36:41 +02:00
  • 043862f411 Fix #1609, fix #1628 - Revert #1397 (#1700) Eugen 2017-04-13 19:23:36 +02:00
  • 9e5c1c487e Apply i18n-tasks normalize to locales (#1696) Eugen 2017-04-13 19:18:32 +02:00
  • 5619099564 translation: Fix comment out issue in en.jsx (#1698) INAGAKI Hiroshi 2017-04-14 00:11:18 +09:00
  • ce80d0b0a9 Fix minor jslint issue (#1697) Koala Yeung 2017-04-13 23:10:48 +08:00
  • 6327f69cab Merge branch 'blackle-videolightbox' Eugen Rochko 2017-04-13 17:01:52 +02:00
  • 5f8155482a Add overlay style to buttons, continue video after expanding it Eugen Rochko 2017-04-13 17:01:09 +02:00
  • efcf9448da Update settings_helper.rb Matteo Aquila 2017-04-13 16:16:39 +02:00
  • e70b84b1dc Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox Eugen Rochko 2017-04-13 16:14:11 +02:00
  • d7a4e8739a Ignore postgres/redis folder from docker-compose (#1645) Lukas Burk 2017-04-13 16:04:20 +02:00
  • 9362700137 Convert emoji shortnames when sending status (#1666) Rachel H 2017-04-13 07:03:45 -07:00
  • 1206627c59 Add Dutch translation (nl) (#1682) Koala Yeung 2017-04-13 22:02:23 +08:00
  • edefcfcf42 Fix issue where 'sensitive content click to show' item takes up whole screen on public view (#1692) Isabelle Knott 2017-04-13 10:00:56 -04:00
  • b330d1f000 Organize coverage dirs (#1695) Matt Jankowski 2017-04-13 10:00:31 -04:00
  • 1a5a54eb4b Merge branch 'master' into master Eugen 2017-04-13 16:00:20 +02:00
  • 447b8bc44e Do not show media attachment as og:image if it was marked as NSFW (#1693) Isabelle Knott 2017-04-13 09:59:43 -04:00
  • 093879c177 Fix language export variables (#1689) Matt Jankowski 2017-04-13 09:59:12 -04:00
  • d2c20936f3 Merge remote-tracking branch 'origin/master' Matteo Aquila 2017-04-13 15:33:53 +02:00
  • 0220f3a171 Update application.rb Matteo Aquila 2017-04-13 15:33:45 +02:00
  • 905a4faa1c Update settings_helper.rb Matteo Aquila 2017-04-13 15:32:31 +02:00
  • 5355b7d930 Update settings_helper.rb Matteo Aquila 2017-04-13 15:31:38 +02:00
  • aec2458d81 Merge remote-tracking branch 'tootsuite/master' Matteo Aquila 2017-04-13 15:30:04 +02:00
  • 4fe5e04ea4 Fix csv export coverage in export spec (#1691) Matt Jankowski 2017-04-13 09:29:30 -04:00
  • 3f42ad7d1a Rename simple_form.it.yml to config/locales/simple_form.it.yml Matteo Aquila 2017-04-13 15:28:30 +02:00
  • f7c466c8d8 Rename devise.it.yml to config/locales/devise.it.yml Matteo Aquila 2017-04-13 15:28:15 +02:00
  • 245b9cb4ba Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml Matteo Aquila 2017-04-13 15:27:56 +02:00
  • 9275f92972 Rename it.yml to config/locales/it.yml Matteo Aquila 2017-04-13 15:27:37 +02:00
  • 4a6d3bac86 Merge pull request #1 from tootsuite/master Matteo Aquila 2017-04-13 15:23:20 +02:00
  • 00cc3066a2 Allow video to be expanded into lightbox blackle 2017-04-13 09:04:18 -04:00
  • a57d30c680 [l10n] ja: update missing Japanese translations (#1687) YOSHIOKA Eiichiro 2017-04-13 21:39:14 +09:00
  • 467d32fce3 [l10n] ja: update missing Japanese translations (#1684) Musee U 2017-04-13 04:40:58 -07:00
  • 8aadb7b0b2 Exclude javascript locale file from dup check (#1677) Koala Yeung 2017-04-13 19:40:25 +08:00
  • 79546799af Added Italian language (it) (#1679) Matteo Aquila 2017-04-13 13:39:00 +02:00
  • 90d0018fd5 Adds Croatian language [Hrvatski] (#1000) May Kittens Devour Your Soul 2017-04-13 13:38:44 +02:00
  • 1a12fd14d4 Merge branch 'master' into master Eugen 2017-04-13 13:26:16 +02:00
  • 282bb55c3c fix Portuguese translation (#1661) Hugo Gameiro 2017-04-13 12:25:34 +01:00
  • 0e4479bb3a Update Japanese translation files (#1640) 新都心(Neet Shin) 2017-04-13 16:53:45 +05:30
  • af7e880df5 Update Russian translation (#1570) Ratmir Karabut 2017-04-13 14:23:23 +03:00
  • aa7bf1515c Fix #624 - Add localization for Bulgarian (#645) Svetlozar Todorov 2017-04-13 14:16:28 +03:00
  • 4f781b17cc Use input type number for Two-factor code (#1683) Daijiro Wachi 2017-04-13 13:13:17 +02:00
  • 137100dcf3 Clean up well-known routes/controllers (#1649) Matt Jankowski 2017-04-13 07:09:07 -04:00
  • 3a9eb81a80 Admin accounts controller cleanup (#1664) Matt Jankowski 2017-04-13 07:04:23 -04:00
  • 0e39cc6a35 Settings export refactor (#1646) Matt Jankowski 2017-04-13 07:02:02 -04:00
  • faefd8ec8f Update javascript English translation files and some defaultValue (#1676) Koala Yeung 2017-04-13 18:57:41 +08:00
  • a18fd491b9 Added Italian language (it) matteoaquila 2017-04-13 11:47:03 +02:00
  • 96715d9af5 Clear spoiler when replying to toot that doesn't also have a spoiler (#1662) Isabelle Knott 2017-04-12 21:17:34 -04:00
  • f24daa399b Remove pending specs for methods that dont exist (#1658) Matt Jankowski 2017-04-12 20:51:13 -04:00
  • af96e71883 Smoother scrolling on older iOS devices (#1654) tom 2017-04-12 20:50:56 -04:00
  • 5dc73339ae Fix tests issue introduced in #1607 (#1639) Eugen 2017-04-13 02:17:40 +02:00
  • ccaf3dbc5a Adjustments to the Norwegian translation (#1648) Thor Harald Johansen 2017-04-13 02:17:26 +02:00
  • 1ea662963f Use shift+click instead of alt+click to bypass boost dialog (#1638) Isabelle Knott 2017-04-12 20:15:45 -04:00
  • bd834add56 Fix visuals introduced in #1463 (#1634) Eugen 2017-04-12 20:54:49 +02:00
  • 9966bd27c2 [l10n] ja: Improve Japanese Translations (#1631) lindwurm 2017-04-13 03:41:50 +09:00
  • b0ab632531 Fix missing compose box when viewport width is exactly 1024px (#1632) Isabelle Knott 2017-04-12 14:40:03 -04:00
  • e1264bbd92 Added norwegian version of terms of service and privacy policy (#1625) Knut Erik 2017-04-12 20:28:56 +02:00
  • 38e24a699b fix Japanese translation (#1623) pinfort 2017-04-13 03:19:38 +09:00
  • bf3e56b8ad Fix incorrect notation in simple_form.ja.yml (#1620) Manato Kameya 2017-04-13 03:19:27 +09:00
  • 9b698bf448 Update fr.jsx (#1551) goofy-bz 2017-04-12 20:11:09 +02:00
  • 0254ee9795 significant improvement in microformats markup (#1063) Ben Roberts 2017-04-12 14:04:33 -04:00
  • e32edd247f Update fr.yml (#1600) CgX 2017-04-12 19:56:09 +02:00
  • dab9b5bd3a locale-fr: fix typo (#1603) karlyeurl 2017-04-12 19:54:16 +02:00
  • e17b5b228d Improve docker update instructions (#1619) Eugen 2017-04-12 19:34:40 +02:00
  • c4baa9fb6b vector (svg) logo with correct inner shape and colors (#1362) Julien Deswaef 2017-04-12 13:10:52 -04:00
  • c2a31b8032 Fix target blank on "open_in_web" link (#1612) David Libeau 2017-04-12 19:09:58 +02:00
  • 9e63bf446e Request documentation (#1616) Shel R 2017-04-12 12:27:33 -04:00
  • c44a700252 Quick best practice cleanup of views/helpers (#1546) Matt Jankowski 2017-04-12 12:24:18 -04:00
  • aa90798386 Webfinger resource to extract username from resource string (#1607) Matt Jankowski 2017-04-12 12:22:38 -04:00
  • 0930ce5560 Focus textarea when text is inserted (#1320) Rachel H 2017-04-12 09:21:07 -07:00
  • 7f0a865b05 Allow import/export of mutes list (#1541) Matt Jankowski 2017-04-12 12:20:44 -04:00
  • 08fce08217 Add unit tests for https://github.com/tootsuite/mastodon/pull/1574 (#1584) Henry Smith 2017-04-12 17:16:59 +02:00
  • 3064ef96a1 Added missing Spanish translations strings (#1292) Carlos A. Escobar 2017-04-12 10:16:40 -05:00
  • ee69ece7b5 [web] Moving docs link to tootsuite/documentation (#1581) lindwurm 2017-04-13 00:13:19 +09:00
  • d90d23699c Make Reporting admin section translatable (#1549) Thomas Citharel 2017-04-12 17:11:49 +02:00
  • 1f5ff46fd9 Working translation for Norwegian. (#1611) Thor Harald Johansen 2017-04-12 17:07:51 +02:00
  • 13528f50c3 Params compact deprecation warning (#1580) Matt Jankowski 2017-04-12 10:12:56 -04:00
  • dd1ae3b109 Simplify the way the embed view is created (#1590) Matt Jankowski 2017-04-12 10:12:42 -04:00
  • b352a8e5d4 Default to json type for webfinger requests (#1583) Matt Jankowski 2017-04-12 10:03:37 -04:00
  • fd102059aa Clean up stylesheet organization (#1591) Matt Jankowski 2017-04-12 10:01:59 -04:00
  • 323671a653 Silence more scope order warnings (#1604) Matt Jankowski 2017-04-12 09:58:08 -04:00
  • b155e6ccf5 Fix issue with intermittent api/v1/notifications failure (#1606) Matt Jankowski 2017-04-12 09:53:55 -04:00
  • f16b9a4928 Fix redirect link on Tuning.md (#1595) Christopher Su 2017-04-12 03:40:37 -07:00
  • 24eb45425e Add Traditional Chinese, Hong Kong translation (zh-HK) (#1544) Koala Yeung 2017-04-12 14:50:50 +08:00
  • 3442bc0ea3 update Docker section of README (#1231) Eric Blade 2017-04-11 19:14:56 -04:00