| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2017-04-14 | Fix Japanese translation for remote_follow (#1771) | Takayuki KUSANO | |
| Current remote_follow.acct translation inappropriate. Users may input their own acccount. So fix the wording. | |||
| 2017-04-14 | Add title attribute to URLs in statuses (#1755) | Luc Didry | |
| Since URLs in statuses are truncated, it would be pleasant to see the full URL when hovering the URL (like on twitter, yes). | |||
| 2017-04-14 | Fix invalid byte sequence issue in nl.jsx (#1751) | Matt Jankowski | |
| 2017-04-14 | Change usage of gsub to delete, as per Code Climate/Rubocop recommendation ↵ | Effy Elden | |
| (#1753) | |||
| 2017-04-14 | Remove .keep in models (#1748) | 西小倉宏信 | |
| 2017-04-14 | Include pkg-config as a gem dependency. (#1717) | Bryce Chidester | |
| The pkg-config gem was necessary in order for nokogiri to find the system libraries when building on OpenBSD. Closes #1637 Signed-off-by: Bryce Chidester <bryce@cobryce.com> | |||
| 2017-04-14 | Use landmark regions on columns (#1732) | JP DeVries | |
| Closes mastodon#1720 | |||
| 2017-04-14 | Admin reports controller improvements (#1714) | Matt Jankowski | |
| * Simplify admin/reports controller filtering for index * Rename parameter to resolved * Fix issue where reports view could not access filter_link_to * Add coverage for admin/reports controller * DRY up resolution of related reports for target account * Clean up admin/reports routes * Add Report#statuses method * DRY up current account action taken params * Rubocop styles | |||
| 2017-04-14 | Implementing Subresource Integrity (#1729) | maxypy | |
| * Add sprockets-rails to Gemfile * Add sprockets-rails to Gemfile.lock * Update show.html.haml * Update index.html.haml * Update admin.html.haml * Update auth.html.haml * Update embedded.html.haml * Update public.html.haml | |||
| 2017-04-14 | Fix getting started commands out of order (#1737) | Ian Kelling | |
| In current order, docker-compose build results in ERROR: Couldn't find env file: /a/hopt/mastodon/.env.production | |||
| 2017-04-14 | Modify ActionMailer configuration to default to ENV['LOCAL_DOMAIN'] if ↵ | Effy Elden | |
| ENV['SMTP_DOMAIN'] is not set. The previous fallback, config.x.local_domain, is undefined when the code is called. (#1745) | |||
| 2017-04-13 | Merge branch 'matteoaquila-master' | Eugen Rochko | |
| 2017-04-13 | Fix italian translation | Eugen Rochko | |
| 2017-04-13 | Merge branch 'master' of git://github.com/matteoaquila/mastodon into ↵ | Eugen Rochko | |
| matteoaquila-master | |||
| 2017-04-13 | Fix drag & drop overlay not appearing on firefox (#1721) | Eugen | |
| 2017-04-13 | Make browserify respect changes in node_modules for asset compilation (#1722) | Eugen | |
| 2017-04-13 | Update devise.it.yml | Matteo Aquila | |
| 2017-04-13 | Update devise.it.yml | Matteo Aquila | |
| 2017-04-13 | Make boost modal off by default (#1719) | Eugen | |
| 2017-04-13 | Add filename extension to paperclip (#1718) | Yusuke Abe | |
| 2017-04-13 | Use english in reported by translation (#1713) | Matt Jankowski | |
| 2017-04-13 | Fr missing strings (#1708) | spf | |
| * Fix missing translation for username already taken * fr - note too long translation | |||
| 2017-04-13 | Translate admin (#1702) | Thomas Citharel | |
| * Translate the domain_block panel Signed-off-by: Thomas Citharel <tcit@tcit.fr> * Translate PubSubHubbub section Signed-off-by: Thomas Citharel <tcit@tcit.fr> * translate account section and correct typos * move reports translation & translate sidebar Signed-off-by: Thomas Citharel <tcit@tcit.fr> * normalize l18n | |||
| 2017-04-13 | smtp delivery type fix (#1556) | James Moore | |
| * delivery fix # Conflicts: # config/environments/production.rb * added stub in .env file * reordered and added a comment | |||
| 2017-04-13 | terms: remove redundant words (#1578) | Alyssa Ross | |
| "at least X" and "X or older" have identical meanings. Using both together feels a little jarring. | |||
| 2017-04-13 | quick typo fix in en.jsx: Rejec -> Reject (#1701) | R Tucker | |
| 2017-04-13 | Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699) | Eugen | |
| Fix username styling regression introduced in #1063 Fix report screen background regression introduced in #1415 | |||
| 2017-04-13 | Fix #1609, fix #1628 - Revert #1397 (#1700) | Eugen | |
| When transmitting data in a HTML-encoded element like <content type="html" />, relying on newlines being preserved is not wise, since HTML by itself does not care for newlines - it cares for <p> and <br> Additional fix: reset NSFW toggle after sending toot | |||
| 2017-04-13 | Apply `i18n-tasks normalize` to locales (#1696) | Eugen | |
| 2017-04-13 | translation: Fix comment out issue in en.jsx (#1698) | INAGAKI Hiroshi | |
| 2017-04-13 | Fix minor jslint issue (#1697) | Koala Yeung | |
| * Undefined propType in react component `ColumnSettings`. Add proper PropTypes definition. | |||
| 2017-04-13 | Merge branch 'blackle-videolightbox' | Eugen Rochko | |
| 2017-04-13 | Add overlay style to buttons, continue video after expanding it | Eugen Rochko | |
| 2017-04-13 | Update settings_helper.rb | Matteo Aquila | |
| 2017-04-13 | Merge branch 'videolightbox' of git://github.com/blackle/mastodon into ↵ | Eugen Rochko | |
| blackle-videolightbox | |||
| 2017-04-13 | Ignore postgres/redis folder from docker-compose (#1645) | Lukas Burk | |
| 2017-04-13 | Convert emoji shortnames when sending status (#1666) | Rachel H | |
| 2017-04-13 | Add Dutch translation (nl) (#1682) | Koala Yeung | |
| * Dutch language files for Ruby code * Created RoR translation ymls: * config/locales/devise.nl.yml * config/locales/doorkeeper.nl.yml * config/locales/nl.yml * config/locales/simple_form.nl.yml * Modified RoR config and helper * app/helpers/settings_helper.rb * config/application.rb * Dutch language javascript locale * Created javascript locale files: * app/assets/javascripts/components/locales/index.jsx * app/assets/javascripts/components/locales/nl.jsx * Reference the newly created locale files: * app/assets/javascripts/components/containers/mastodon.jsx * Fix syntax error in locale file (nl) * Fix missing translate in js locale (nl) * Convert all ruby Dutch locale (nl) file to utf8 Fix yml conversion issues. * Fix duplicated key in devise.nl.yml * Fix indentation error in doorkeeper.nl.yml | |||
| 2017-04-13 | Fix issue where 'sensitive content click to show' item takes up whole screen ↵ | Isabelle Knott | |
| on public view (#1692) | |||
| 2017-04-13 | Organize coverage dirs (#1695) | Matt Jankowski | |
| * Add `Presenters` group to SimpleCov configuration * Move validators to app/validators, add to simplecov config | |||
| 2017-04-13 | Merge branch 'master' into master | Eugen | |
| 2017-04-13 | Do not show media attachment as og:image if it was marked as NSFW (#1693) | Isabelle Knott | |
| 2017-04-13 | Fix language export variables (#1689) | Matt Jankowski | |
| * Fix naming of JS locale constants * Improve the translation instructions re: const names | |||
| 2017-04-13 | Merge remote-tracking branch 'origin/master' | Matteo Aquila | |
| 2017-04-13 | Update application.rb | Matteo Aquila | |
| 2017-04-13 | Update settings_helper.rb | Matteo Aquila | |
| 2017-04-13 | Update settings_helper.rb | Matteo Aquila | |
| 2017-04-13 | Merge remote-tracking branch 'tootsuite/master' | Matteo Aquila | |
| 2017-04-13 | Fix csv export coverage in export spec (#1691) | Matt Jankowski | |
| 2017-04-13 | Rename simple_form.it.yml to config/locales/simple_form.it.yml | Matteo Aquila | |
 |
index : mastodon | |
| Plural Café fork of Mastodon/Glitch Social |
| about summary refs log tree commit diff |