Commit graph

  • 5c414c98e2 Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699) Eugen 2017-04-13 19:36:41 +0200
  • ac54da9394 Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699) Eugen 2017-04-13 19:36:41 +0200
  • 5f9cd9b246 Fix #1609, fix #1628 - Revert #1397 (#1700) Eugen 2017-04-13 19:23:36 +0200
  • 043862f411 Fix #1609, fix #1628 - Revert #1397 (#1700) Eugen 2017-04-13 19:23:36 +0200
  • 553dc8dbb5 Apply i18n-tasks normalize to locales (#1696) Eugen 2017-04-13 19:18:32 +0200
  • 9e5c1c487e Apply i18n-tasks normalize to locales (#1696) Eugen 2017-04-13 19:18:32 +0200
  • 8c3b5c99e6 translation: Fix comment out issue in en.jsx (#1698) INAGAKI Hiroshi 2017-04-14 00:11:18 +0900
  • 5619099564 translation: Fix comment out issue in en.jsx (#1698) INAGAKI Hiroshi 2017-04-14 00:11:18 +0900
  • 698406f076 Fix minor jslint issue (#1697) Koala Yeung 2017-04-13 23:10:48 +0800
  • ce80d0b0a9 Fix minor jslint issue (#1697) Koala Yeung 2017-04-13 23:10:48 +0800
  • 314e3dba6c Merge branch 'blackle-videolightbox' Eugen Rochko 2017-04-13 17:01:52 +0200
  • 6327f69cab Merge branch 'blackle-videolightbox' Eugen Rochko 2017-04-13 17:01:52 +0200
  • a148a3900e Add overlay style to buttons, continue video after expanding it Eugen Rochko 2017-04-13 17:01:09 +0200
  • 5f8155482a Add overlay style to buttons, continue video after expanding it Eugen Rochko 2017-04-13 17:01:09 +0200
  • f9a42acd0d Update settings_helper.rb Matteo Aquila 2017-04-13 16:16:39 +0200
  • efcf9448da Update settings_helper.rb Matteo Aquila 2017-04-13 16:16:39 +0200
  • 0744eb8838 Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox Eugen Rochko 2017-04-13 16:14:11 +0200
  • e70b84b1dc Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox Eugen Rochko 2017-04-13 16:14:11 +0200
  • be7f1b7ecb Ignore postgres/redis folder from docker-compose (#1645) Lukas Burk 2017-04-13 16:04:20 +0200
  • d7a4e8739a Ignore postgres/redis folder from docker-compose (#1645) Lukas Burk 2017-04-13 16:04:20 +0200
  • a6515aeea8 Convert emoji shortnames when sending status (#1666) Rachel H 2017-04-13 07:03:45 -0700
  • 9362700137 Convert emoji shortnames when sending status (#1666) Rachel H 2017-04-13 07:03:45 -0700
  • ff826c68eb Add Dutch translation (nl) (#1682) Koala Yeung 2017-04-13 22:02:23 +0800
  • 1206627c59 Add Dutch translation (nl) (#1682) Koala Yeung 2017-04-13 22:02:23 +0800
  • 5c3705f4f7 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 -0400
  • 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 -0400
  • 49c3000d62 Organize coverage dirs (#1695) Matt Jankowski 2017-04-13 10:00:31 -0400
  • b330d1f000 Organize coverage dirs (#1695) Matt Jankowski 2017-04-13 10:00:31 -0400
  • e02486edab Merge branch 'master' into master Eugen 2017-04-13 16:00:20 +0200
  • 1a5a54eb4b Merge branch 'master' into master Eugen 2017-04-13 16:00:20 +0200
  • 79cefa3739 Do not show media attachment as og:image if it was marked as NSFW (#1693) Isabelle Knott 2017-04-13 09:59:43 -0400
  • 447b8bc44e Do not show media attachment as og:image if it was marked as NSFW (#1693) Isabelle Knott 2017-04-13 09:59:43 -0400
  • 38c0a6fee2 Fix language export variables (#1689) Matt Jankowski 2017-04-13 09:59:12 -0400
  • 093879c177 Fix language export variables (#1689) Matt Jankowski 2017-04-13 09:59:12 -0400
  • f756a96056 Merge remote-tracking branch 'origin/master' Matteo Aquila 2017-04-13 15:33:53 +0200
  • d2c20936f3 Merge remote-tracking branch 'origin/master' Matteo Aquila 2017-04-13 15:33:53 +0200
  • b57c52c7e7 Update application.rb Matteo Aquila 2017-04-13 15:33:45 +0200
  • 0220f3a171 Update application.rb Matteo Aquila 2017-04-13 15:33:45 +0200
  • e891a97787 Update settings_helper.rb Matteo Aquila 2017-04-13 15:32:31 +0200
  • 905a4faa1c Update settings_helper.rb Matteo Aquila 2017-04-13 15:32:31 +0200
  • 3ace439512 Update settings_helper.rb Matteo Aquila 2017-04-13 15:31:38 +0200
  • 5355b7d930 Update settings_helper.rb Matteo Aquila 2017-04-13 15:31:38 +0200
  • 20b56f3511 Merge remote-tracking branch 'tootsuite/master' Matteo Aquila 2017-04-13 15:30:04 +0200
  • aec2458d81 Merge remote-tracking branch 'tootsuite/master' Matteo Aquila 2017-04-13 15:30:04 +0200
  • 3beb0c0bef Fix csv export coverage in export spec (#1691) Matt Jankowski 2017-04-13 09:29:30 -0400
  • 4fe5e04ea4 Fix csv export coverage in export spec (#1691) Matt Jankowski 2017-04-13 09:29:30 -0400
  • 9410b7cbc6 Rename simple_form.it.yml to config/locales/simple_form.it.yml Matteo Aquila 2017-04-13 15:28:30 +0200
  • 3f42ad7d1a Rename simple_form.it.yml to config/locales/simple_form.it.yml Matteo Aquila 2017-04-13 15:28:30 +0200
  • 3281686b5c Rename devise.it.yml to config/locales/devise.it.yml Matteo Aquila 2017-04-13 15:28:15 +0200
  • f7c466c8d8 Rename devise.it.yml to config/locales/devise.it.yml Matteo Aquila 2017-04-13 15:28:15 +0200
  • 125657117b Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml Matteo Aquila 2017-04-13 15:27:56 +0200
  • 245b9cb4ba Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml Matteo Aquila 2017-04-13 15:27:56 +0200
  • c1e2949b86 Rename it.yml to config/locales/it.yml Matteo Aquila 2017-04-13 15:27:37 +0200
  • 9275f92972 Rename it.yml to config/locales/it.yml Matteo Aquila 2017-04-13 15:27:37 +0200
  • 4e4817ec8e Merge pull request #1 from tootsuite/master Matteo Aquila 2017-04-13 15:23:20 +0200
  • 4a6d3bac86 Merge pull request #1 from tootsuite/master Matteo Aquila 2017-04-13 15:23:20 +0200
  • 924a6d7cd8 Allow video to be expanded into lightbox blackle 2017-04-13 09:04:18 -0400
  • 00cc3066a2 Allow video to be expanded into lightbox blackle 2017-04-13 09:04:18 -0400
  • c8af1e96a5 [l10n] ja: update missing Japanese translations (#1687) YOSHIOKA Eiichiro 2017-04-13 21:39:14 +0900
  • a57d30c680 [l10n] ja: update missing Japanese translations (#1687) YOSHIOKA Eiichiro 2017-04-13 21:39:14 +0900
  • a3019ede5a [l10n] ja: update missing Japanese translations (#1684) Musee U 2017-04-13 04:40:58 -0700
  • 467d32fce3 [l10n] ja: update missing Japanese translations (#1684) Musee U 2017-04-13 04:40:58 -0700
  • 79763fa14c Exclude javascript locale file from dup check (#1677) Koala Yeung 2017-04-13 19:40:25 +0800
  • 8aadb7b0b2 Exclude javascript locale file from dup check (#1677) Koala Yeung 2017-04-13 19:40:25 +0800
  • 17913dd648 Added Italian language (it) (#1679) Matteo Aquila 2017-04-13 13:39:00 +0200
  • 79546799af Added Italian language (it) (#1679) Matteo Aquila 2017-04-13 13:39:00 +0200
  • 81b05262f5 Adds Croatian language [Hrvatski] (#1000) May Kittens Devour Your Soul 2017-04-13 13:38:44 +0200
  • 90d0018fd5 Adds Croatian language [Hrvatski] (#1000) May Kittens Devour Your Soul 2017-04-13 13:38:44 +0200
  • 280fc877e3 Merge branch 'master' into master Eugen 2017-04-13 13:26:16 +0200
  • 1a12fd14d4 Merge branch 'master' into master Eugen 2017-04-13 13:26:16 +0200
  • 990bbacb93 fix Portuguese translation (#1661) Hugo Gameiro 2017-04-13 12:25:34 +0100
  • 282bb55c3c fix Portuguese translation (#1661) Hugo Gameiro 2017-04-13 12:25:34 +0100
  • 67ed9d8f18 Update Japanese translation files (#1640) 新都心(Neet Shin) 2017-04-13 16:53:45 +0530
  • 0e4479bb3a Update Japanese translation files (#1640) 新都心(Neet Shin) 2017-04-13 16:53:45 +0530
  • 5a7354ef00 Update Russian translation (#1570) Ratmir Karabut 2017-04-13 14:23:23 +0300
  • af7e880df5 Update Russian translation (#1570) Ratmir Karabut 2017-04-13 14:23:23 +0300
  • 651b89199a Fix #624 - Add localization for Bulgarian (#645) Svetlozar Todorov 2017-04-13 14:16:28 +0300
  • aa7bf1515c Fix #624 - Add localization for Bulgarian (#645) Svetlozar Todorov 2017-04-13 14:16:28 +0300
  • 16204ba91f Use input type number for Two-factor code (#1683) Daijiro Wachi 2017-04-13 13:13:17 +0200
  • 4f781b17cc Use input type number for Two-factor code (#1683) Daijiro Wachi 2017-04-13 13:13:17 +0200
  • d8789124ae Clean up well-known routes/controllers (#1649) Matt Jankowski 2017-04-13 07:09:07 -0400
  • 137100dcf3 Clean up well-known routes/controllers (#1649) Matt Jankowski 2017-04-13 07:09:07 -0400
  • 26ea2f70bd Admin accounts controller cleanup (#1664) Matt Jankowski 2017-04-13 07:04:23 -0400
  • 3a9eb81a80 Admin accounts controller cleanup (#1664) Matt Jankowski 2017-04-13 07:04:23 -0400
  • 0a6cfca260 Settings export refactor (#1646) Matt Jankowski 2017-04-13 07:02:02 -0400
  • 0e39cc6a35 Settings export refactor (#1646) Matt Jankowski 2017-04-13 07:02:02 -0400
  • 94ff16be71 Update javascript English translation files and some defaultValue (#1676) Koala Yeung 2017-04-13 18:57:41 +0800
  • faefd8ec8f Update javascript English translation files and some defaultValue (#1676) Koala Yeung 2017-04-13 18:57:41 +0800
  • 3d100a7902 Added Italian language (it) matteoaquila 2017-04-13 11:47:03 +0200
  • a18fd491b9 Added Italian language (it) matteoaquila 2017-04-13 11:47:03 +0200
  • 68e1307371 Clear spoiler when replying to toot that doesn't also have a spoiler (#1662) Isabelle Knott 2017-04-12 21:17:34 -0400
  • 96715d9af5 Clear spoiler when replying to toot that doesn't also have a spoiler (#1662) Isabelle Knott 2017-04-12 21:17:34 -0400
  • bcf45f1783 Remove pending specs for methods that dont exist (#1658) Matt Jankowski 2017-04-12 20:51:13 -0400
  • f24daa399b Remove pending specs for methods that dont exist (#1658) Matt Jankowski 2017-04-12 20:51:13 -0400
  • 168265c708 Smoother scrolling on older iOS devices (#1654) tom 2017-04-12 20:50:56 -0400
  • af96e71883 Smoother scrolling on older iOS devices (#1654) tom 2017-04-12 20:50:56 -0400
  • 4df3f306fe Fix tests issue introduced in #1607 (#1639) Eugen 2017-04-13 02:17:40 +0200
  • 5dc73339ae Fix tests issue introduced in #1607 (#1639) Eugen 2017-04-13 02:17:40 +0200
  • d898b8d958 Adjustments to the Norwegian translation (#1648) Thor Harald Johansen 2017-04-13 02:17:26 +0200
  • ccaf3dbc5a Adjustments to the Norwegian translation (#1648) Thor Harald Johansen 2017-04-13 02:17:26 +0200