Commits · v1.1.2 · Mastoq / Monster · GitLab

Apr 13, 2017
- Merge branch 'matteoaquila-master' · 7447e7a2
  Eugen Rochko authored Apr 13, 2017
  
  View commits for tag v1.1.2 v1.1.2
  7447e7a2
- Fix italian translation · c8be05a4
  Eugen Rochko authored Apr 13, 2017
  
  c8be05a4
- Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master · 41c697fd
  Eugen Rochko authored Apr 13, 2017
  
  41c697fd
- Fix drag & drop overlay not appearing on firefox (#1721) · c5afe573
  Eugen Rochko authored Apr 13, 2017
  
  c5afe573
- Make browserify respect changes in node_modules for asset compilation (#1722) · 485310a4
  Eugen Rochko authored Apr 13, 2017
  
  485310a4
- Update devise.it.yml · 9aae9ae4
  Matteo Aquila authored Apr 13, 2017
  
  9aae9ae4
- Update devise.it.yml · 1fb125b6
  Matteo Aquila authored Apr 13, 2017
  
  1fb125b6
- Make boost modal off by default (#1719) · 057567d5
  Eugen Rochko authored Apr 13, 2017
  
  057567d5
- Add filename extension to paperclip (#1718) · 169c68a7
  chansuke authored Apr 14, 2017 and Eugen Rochko committed Apr 13, 2017
  
  169c68a7
- Use english in reported by translation (#1713) · 9f182346
  Matt Jankowski authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  
  9f182346
- Fr missing strings (#1708) · a58c935c
  SpF authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  a58c935c
- Translate admin (#1702) · c0c56db0
  Thomas Citharel authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  c0c56db0
- smtp delivery type fix (#1556) · d9dc0fe8
  James Moore authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  d9dc0fe8
- terms: remove redundant words (#1578) · 55b56e3f
  Alyssa Ross authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  55b56e3f
- quick typo fix in en.jsx: Rejec -> Reject (#1701) · c4d39b1b
  R Tucker authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  
  c4d39b1b
- Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699) · ac54da93
  Eugen Rochko authored Apr 13, 2017
  ac54da93
- Fix #1609, fix #1628 - Revert #1397 (#1700) · 043862f4
  Eugen Rochko authored Apr 13, 2017
  043862f4
- Apply `i18n-tasks normalize` to locales (#1696) · 9e5c1c48
  Eugen Rochko authored Apr 13, 2017
  
  9e5c1c48
- translation: Fix comment out issue in en.jsx (#1698) · 56190995
  INAGAKI Hiroshi authored Apr 14, 2017 and Eugen Rochko committed Apr 13, 2017
  
  56190995
- Fix minor jslint issue (#1697) · ce80d0b0
  Koala Yeung authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  ce80d0b0
- Merge branch 'blackle-videolightbox' · 6327f69c
  Eugen Rochko authored Apr 13, 2017
  
  6327f69c
- Add overlay style to buttons, continue video after expanding it · 5f815548
  Eugen Rochko authored Apr 13, 2017
  
  5f815548
- Update settings_helper.rb · efcf9448
  Matteo Aquila authored Apr 13, 2017
  
  efcf9448
- Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox · e70b84b1
  Eugen Rochko authored Apr 13, 2017
  
  e70b84b1
- Ignore postgres/redis folder from docker-compose (#1645) · d7a4e873
  Lukas Burk authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  
  d7a4e873
- Convert emoji shortnames when sending status (#1666) · 93627001
  Rachel H authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  
  93627001
- Add Dutch translation (nl) (#1682) · 1206627c
  Koala Yeung authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  1206627c
- Fix issue where 'sensitive content click to show' item takes up whole screen on public view (#1692) · edefcfcf
  Blackle Mori authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  
  edefcfcf
- Organize coverage dirs (#1695) · b330d1f0
  Matt Jankowski authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  b330d1f0
- Merge branch 'master' into master · 1a5a54eb
  Eugen Rochko authored Apr 13, 2017
  
  1a5a54eb
- Do not show media attachment as og:image if it was marked as NSFW (#1693) · 447b8bc4
  Blackle Mori authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  
  447b8bc4
- Fix language export variables (#1689) · 093879c1
  Matt Jankowski authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  093879c1
- Merge remote-tracking branch 'origin/master' · d2c20936
  Matteo Aquila authored Apr 13, 2017
  
  d2c20936
- Update application.rb · 0220f3a1
  Matteo Aquila authored Apr 13, 2017
  
  0220f3a1
- Update settings_helper.rb · 905a4faa
  Matteo Aquila authored Apr 13, 2017
  
  905a4faa
- Update settings_helper.rb · 5355b7d9
  Matteo Aquila authored Apr 13, 2017
  
  5355b7d9
- Merge remote-tracking branch 'tootsuite/master' · aec2458d
  Matteo Aquila authored Apr 13, 2017
  
  aec2458d
- Fix csv export coverage in export spec (#1691) · 4fe5e04e
  Matt Jankowski authored Apr 13, 2017 and Eugen Rochko committed Apr 13, 2017
  
  4fe5e04e
- Rename simple_form.it.yml to config/locales/simple_form.it.yml · 3f42ad7d
  Matteo Aquila authored Apr 13, 2017
  
  3f42ad7d
- Rename devise.it.yml to config/locales/devise.it.yml · f7c466c8
  Matteo Aquila authored Apr 13, 2017
  
  f7c466c8