2246 Commits (df4ff9a8e13d776e1670c232655db0275a353a0f)

 

All Branches   

Search

Author	SHA1	Message	Date
Eugen Rochko	41c697fd81	Merge branch 'master' of git://github.com/matteoaquila/mastodon into matteoaquila-master	8 years ago
Eugen	c5afe573da	Fix drag & drop overlay not appearing on firefox (#1721)	8 years ago
Eugen	485310a43c	Make browserify respect changes in node_modules for asset compilation (#1722)	8 years ago
Matteo Aquila	9aae9ae40c	Update devise.it.yml	8 years ago
Matteo Aquila	1fb125b630	Update devise.it.yml	8 years ago
Eugen	057567d548	Make boost modal off by default (#1719)	8 years ago
Yusuke Abe	169c68a739	Add filename extension to paperclip (#1718)	8 years ago
Matt Jankowski	9f182346d7	Use english in reported by translation (#1713)	8 years ago
spf	a58c935c3d	Fr missing strings (#1708) ... * Fix missing translation for username already taken * fr - note too long translation	8 years ago
Thomas Citharel	c0c56db0fa	Translate admin (#1702) ... * 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	8 years ago
James Moore	d9dc0fe84e	smtp delivery type fix (#1556) ... * delivery fix # Conflicts: # config/environments/production.rb * added stub in .env file * reordered and added a comment	8 years ago
Alyssa Ross	55b56e3f95	terms: remove redundant words (#1578) ... "at least X" and "X or older" have identical meanings. Using both together feels a little jarring.	8 years ago
R Tucker	c4d39b1b3d	quick typo fix in en.jsx: Rejec -> Reject (#1701)	8 years ago
Eugen	ac54da9394	Fix #1220, fix #1671 - Hook up comment box to the Redux comment value (#1699) ... Fix username styling regression introduced in #1063 Fix report screen background regression introduced in #1415	8 years ago
Eugen	043862f411	Fix #1609, fix #1628 - Revert #1397 (#1700) ... 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	8 years ago
Eugen	9e5c1c487e	Apply `i18n-tasks normalize` to locales (#1696)	8 years ago
INAGAKI Hiroshi	5619099564	translation: Fix comment out issue in en.jsx (#1698)	8 years ago
Koala Yeung	ce80d0b0a9	Fix minor jslint issue (#1697) ... * Undefined propType in react component `ColumnSettings`. Add proper PropTypes definition.	8 years ago
Eugen Rochko	6327f69cab	Merge branch 'blackle-videolightbox'	8 years ago
Eugen Rochko	5f8155482a	Add overlay style to buttons, continue video after expanding it	8 years ago
Matteo Aquila	efcf9448da	Update settings_helper.rb	8 years ago
Eugen Rochko	e70b84b1dc	Merge branch 'videolightbox' of git://github.com/blackle/mastodon into blackle-videolightbox	8 years ago
Lukas Burk	d7a4e8739a	Ignore postgres/redis folder from docker-compose (#1645)	8 years ago
Rachel H	9362700137	Convert emoji shortnames when sending status (#1666)	8 years ago
Koala Yeung	1206627c59	Add Dutch translation (nl) (#1682) ... * 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	8 years ago
Isabelle Knott	edefcfcf42	Fix issue where 'sensitive content click to show' item takes up whole screen on public view (#1692)	8 years ago
Matt Jankowski	b330d1f000	Organize coverage dirs (#1695) ... * Add `Presenters` group to SimpleCov configuration * Move validators to app/validators, add to simplecov config	8 years ago
Eugen	1a5a54eb4b	Merge branch 'master' into master	8 years ago
Isabelle Knott	447b8bc44e	Do not show media attachment as og:image if it was marked as NSFW (#1693)	8 years ago
Matt Jankowski	093879c177	Fix language export variables (#1689) ... * Fix naming of JS locale constants * Improve the translation instructions re: const names	8 years ago
Matteo Aquila	d2c20936f3	Merge remote-tracking branch 'origin/master'	8 years ago
Matteo Aquila	0220f3a171	Update application.rb	8 years ago
Matteo Aquila	905a4faa1c	Update settings_helper.rb	8 years ago
Matteo Aquila	5355b7d930	Update settings_helper.rb	8 years ago
Matteo Aquila	aec2458d81	Merge remote-tracking branch 'tootsuite/master'	8 years ago
Matt Jankowski	4fe5e04ea4	Fix csv export coverage in export spec (#1691)	8 years ago
Matteo Aquila	3f42ad7d1a	Rename simple_form.it.yml to config/locales/simple_form.it.yml	8 years ago
Matteo Aquila	f7c466c8d8	Rename devise.it.yml to config/locales/devise.it.yml	8 years ago
Matteo Aquila	245b9cb4ba	Rename doorkeeper.it.yml to config/locales/doorkeeper.it.yml	8 years ago
Matteo Aquila	9275f92972	Rename it.yml to config/locales/it.yml	8 years ago
Matteo Aquila	4a6d3bac86	Merge pull request #1 from tootsuite/master ... update	8 years ago
blackle	00cc3066a2	Allow video to be expanded into lightbox	8 years ago
YOSHIOKA Eiichiro	a57d30c680	[l10n] ja: update missing Japanese translations (#1687)	8 years ago
Musee U	467d32fce3	[l10n] ja: update missing Japanese translations (#1684)	8 years ago
Koala Yeung	8aadb7b0b2	Exclude javascript locale file from dup check (#1677) ... * Exclude javascript locale files form Code Climate's duplication engine. It is silly to have duplication check with locale files. They are supposed to look similar. * Prevent unnecessary blocking for translation updates (like #1661)	8 years ago
Matteo Aquila	79546799af	Added Italian language (it) (#1679)	8 years ago
May Kittens Devour Your Soul	90d0018fd5	Adds Croatian language [Hrvatski] (#1000) ... * Create simple.form.hr.yml * Create hr.yml * Update hr.yml * Update hr.yml * Create doorkeeper.hr.yml * Create devise.hr.yml	8 years ago
Eugen	1a12fd14d4	Merge branch 'master' into master	8 years ago
Hugo Gameiro	282bb55c3c	fix Portuguese translation (#1661) ... * update portuguese translation added the missing fields and improved the translation * pt translations fix * improve last translation commit * fix damn quotes	8 years ago
新都心(Neet Shin)	0e4479bb3a	Update Japanese translation files (#1640) ... * [l10n] ja: Improve Japanese Translations * ja: about: Fix highlighting * ja: Update Translations * ja: Translate admin settings Signed-off-by: lindwurm <lindwurm.q@gmail.com> * Update ja.jsx * Update doorkeeper.ja.yml * Update ja.yml * Update ja.jsx * Update ja.jsx	8 years ago