440 Commits (9240ca6cefdec25574f329b70438c4fa4571a1e4)

Author	SHA1	Message	Date
Thomas Citharel	327a6e166f	Update french locale (#1525) ... * Update devise.fr.yml fixing minor typos * add missing strings * Fix a translation and add translation for devise part Signed-off-by: Thomas Citharel <tcit@tcit.fr>	9 years ago
pinfort	6f5268b02d	Add Japanese translation (#1552) ... * add device.ja.yml * update device.ja.yml * add file simple_form.ja.yml * 👍Added doorkeeper.ja.yml * add ja.yml * Update doorkeeper.ja.yml fixed url to uri * update ja.yml * fix some translations * fix japanese grammar of a translate * fix some translates * fix ja.yml * add ja.jsx * add Japanese user mail views * Added japanese translate locales * Added :ja to available_locales こっちも * Added "日本語" to HUMAN_LOCALES * Imported/Added ja to addLocaleData * update ja.jsx	9 years ago
jukper	4964433190	Revised finnish translation (#1537)	9 years ago
Jantso Porali	9e3c4fd2d7	Update language files (#1516) ... * update faq with default language * update translation for about page * update Minio config Thanks to @Gargon for helping me. I hope this will help others as well * update import and export translation * translate emails to finnish * add finnish translation for emails * add finnish translation for emails * add finnish translation * add missing dot * update finnish language to emails * add finnish translation for emails * add dot and fix typo * updated some minor typos * remove language change due breaking emails And by dev request * updated minio config by dev request * updated about page translation * fix for Amazon S3/Minio instance setups If you were using S3 or Minio for your files, this will fix the Import issue :) * update translation according to issue #1515 See issue #1515 * update translation for issue #1515 see issue #1515	9 years ago
Eugen Rochko	2a7602cad4	Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master	9 years ago
blackle	06444bf050	Allow user to disable the boost confirm dialog in preferences	9 years ago
Yann GUERN	a85d4473aa	Avoid user enumeration with devise paranoid mode (#1527)	9 years ago
Matt Jankowski	4ada50985a	Pagination improvements (#1445) ... * Replace will_paginate with kaminari * Use #page instead of #paginate in controllers * Replace will_paginate.page_gap with pagination.truncate in i18n * Customize kaminari views to match prior styles * Set kaminari options to match prior behavior * Replace will_paginate with paginate in views	9 years ago
Matt Jankowski	64dbde0dbf	Version bumps for ruby and misc gems (#1159) ... * Update rspec-rails to version 3.5.2 * Update addressable to version 2.5.1 * Update autoprefixer-rails to version 6.7.7.1 * Update bullet to version 5.5.1 * Update domain_name to version 0.5.20170404 * Update letter_opener_web to version 1.3.1 * Upate redis-rails to version 5.0.2 * Update active_record_query_trace to version 1.5.4 * Update capistrano-rails to version 1.2.3 * Update dotenv-rails to version 2.2.0 * Update pg to version 0.20.0 * Update tilt to version 2.0.7 * Update warden to version 1.2.7 * Update tins to version 1.13.2 * Update terminal-table to version 1.7.3 * Update oj to version 2.18.5 * Update simplecov to version 0.14.1 * Update uglifier to version 3.1.13 * Update hashdiff to version 0.3.2 * Update webmock to version 2.3.2 * Update devise to version 4.2.1 * Use ruby version 2.4.1 * Update sass to version 3.4.23 * Update puma to version 3.8.2 * Update will_paginate to version 3.1.5 * Update font-awesome-rails to version 4.7.0.1 * Update fuubar to version 2.2.0 * Update pry-rails to version 0.3.6 * Update simple-navigation to version 4.0.5 * Update rubocop to version 0.48.1 * Update doorkeeper to version 4.2.5 * Update faker to version 1.7.3 * Update aws-sdk to version 2.9.5 * Update fabrication to version 2.16.1 * Update hamlit-rails to version 0.2.0 * Update http to version 2.2.1 * Update httplog to version 0.99.2 * Update sidekiq to version 4.2.10 * Update rspec-sidekiq to version 3.0.0 * Update pghero to version 1.6.4 * Update rack-cors to version 0.4.1 * Update i18n-tasks to version 0.9.13 * Update ruby-oembed to version 0.12.0 * Update jquery-rails to version 4.3.1 * Update simple_form to version 3.4.0 * Update react-rails to version 1.11.0 * Update aws-sdk to version 2.9.6 * Update sidekiq-unique-jobs to version 5.0.0 * Update uglifier to version 3.2.0	9 years ago
Alexander Mankuta	0dbbc16c69	More SMTP customization (#1372) ... * Allow SMTP auth method customization * Add SMTP openssl_verify_mode option support Allows one use self-signed certs with their SMTP server. * Add SMTP enable_starttls_auto option support	9 years ago
Ratmir Karabut	9043b32183	Add Russian translation (ru) (#1023) ... * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency	9 years ago
R Tucker	8bfdbf0aa6	Add comment to settings.yml to nudge admins towards editing values via Web UI (#1289) ... * Put a useful message for new admins on /about/more I totally failed to realize this file was just defaults. I think this message would be a good default for people like me. * Revert default site description, expand comment This will keep setup-related stuff from leaking into public views, while still hopefully keeping over-eager admins from editing this file unnecessarily before RTFMing. (e.g., me)	9 years ago
David Celis	d4fe6cd2bf	Allow users to update their Account in the API (#1179) ... * Allow users to update their Account in the API It would be nice for API clients to be able to allow users to update their accounts without having to wrap Mastodon in a web view. This patch adds an API endpoint to let users submit a PATCH for their account. Signed-off-by: David Celis <me@davidcel.is> * Add /api/v1/accounts/update_credentials to the API docs Signed-off-by: David Celis <me@davidcel.is>	9 years ago
Olivier Humbert	082bef3027	French translation update (#1271) ... * Update confirmation_instructions.fr.html.erb consistency across the French translation * Update consistency across the French translation * Update fr.yml a bunch of consistency across the French translation + a few typos * Update doorkeeper.fr.yml consistency across the French translation (punctuation)	9 years ago
spf	e6b48a7048	French typo (#1257) ... * French typo * Datetime french translation	9 years ago
Matt Jankowski	e5282e4ec0	Clean up about page (#1282) ... * Add InstancePresenter to expose site details * Clean up about controller, use instance presenter	9 years ago
Matt Jankowski	71706f21c2	Ignore implied formats for catch all route requests (#1340) ... A request to `/test` would show the custom 404 page, but a request to `/test.test` would return a 404 with an empty body. This change ignores the format on incoming catch all route requests, so that the html 404 page is returned on these requests.	9 years ago
Eugen	d5a675099a	Add env variable to disable prepared statements (#1293)	9 years ago
Ash Furrow	c3e7bac1cc	Allows setting log level in env variable (#1290) ... * Allows setting log level in env variable. * Made changes based on feedback in #1290.	9 years ago
Eugen	9acdb166e8	Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278) ... * Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled TOTP secret is not shown again after 2FA is enabled * Clean up	9 years ago
Thomas Citharel	41f8fde83e	Update french translation (#1148) ... Add french translation for emails sent Signed-off-by: Thomas Citharel <tcit@tcit.fr> Add non-breaking spaces Signed-off-by: Thomas Citharel <tcit@tcit.fr> changes and fixes to the nbsps Signed-off-by: Thomas Citharel <tcit@tcit.fr> French update a few fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr> fixes Signed-off-by: Thomas Citharel <tcit@tcit.fr>	9 years ago
Sebastian Hübner	f860eb7d71	Fixed two translation errors (#1139) ... Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx	9 years ago
Korbinian	8f9a11b642	Update simple_form.de.yml (#971)	9 years ago
Jantso Porali	01d8003867	Updated about page in Finnish language (#1170) ... * update faq with default language * update translation for about page * update Minio config Thanks to @Gargon for helping me. I hope this will help others as well * update import and export translation * translate emails to finnish * add finnish translation for emails * add finnish translation for emails * add finnish translation * add missing dot * update finnish language to emails * add finnish translation for emails * add dot and fix typo * updated some minor typos * remove language change due breaking emails And by dev request * updated minio config by dev request * updated about page translation	9 years ago
Olivier Humbert	ed3dfd0bee	French translation update (#1188) ... * Update fr.yml one typo fix * Update simple_form.fr.yml one translation consistency	9 years ago
Shel R	fef478781d	Merge branch 'master' into master	9 years ago
Chad Pytel	ad5ddd5e95	Use I18n for media attachment validation errors ... These are currently user facing errors, but are not localized. This adds the ability for these messages to be localized.	9 years ago
Eugen	0adee18d73	Merge branch 'master' into feature-customized-default-locale	9 years ago
Jantso Porali	786e6f94b9	Update Finnish translations, add sample Minio config (#954)	9 years ago
Eugen Rochko	e3a3422a65	Allow setting of default language through config ... Setting of locale in controller extracted to Localized concern, the doorkeeper authorized applications controller moved under custom namespace with inclusion of Localized, which resolves the "it sometimes appears in a different random language" bug	9 years ago
Eugen	1c351709bc	Force UTF8 encoding on generated XML (#1140)	9 years ago
André Lewin	bf7cefa516	Merge branch 'master' into master	9 years ago
Eugen Rochko	29ffe1cad3	Make sure Rabl is using Oj	9 years ago
Jantso Porali	837030db98	updated blocking translation	9 years ago
Jantso Porali	deb001bba8	updated two-way auth and preferences translation	9 years ago
Jantso Porali	d3bf0307db	updated translation for about page	9 years ago
JantsoP	20b53e6add	Merge branch 'master' into master	9 years ago
JantsoP	3ec221d3b7	updated reblog to boost translation ... Since it is that :D	9 years ago
JantsoP	473e4f7813	udpdated display_name translation	9 years ago
JantsoP	b845ef395d	updated reblog translation	9 years ago
Eugen Rochko	667ffafef8	Fix spec	9 years ago
Eugen	086a88f3bb	Merge pull request #863 from Eychics/master ... Add closed_registrations message on French language	9 years ago
Eugen	e76dd52b08	Merge pull request #818 from JantsoP/master ... Updated Finnish Translation	9 years ago
Eugen	c12214963e	Merge pull request #866 from kklleemm/patch-1 ... Fix typos on french translations	9 years ago
Eugen	aa8dacbc8a	Merge pull request #792 from chapeaumeinfreund/master ... Updated and fixed german orthography	9 years ago
Eugen	ce524cbb49	Merge pull request #790 from chapeaumeinfreund/patch-1 ... Updated and fixed german orthography	9 years ago
Eugen	117b22e905	Merge pull request #852 from peterkeen/email-whitelist-817 ... [#817] Add email whitelist	9 years ago
Eugen	57466d542b	Merge pull request #805 from nevillepark/master ... Changed "reblogs" to "boosts"	9 years ago
Clément D	350958babf	Fix typos on french translations	9 years ago
Thibaut (Eychics)	9a5d6e9715	Add closed_registrations message on French language	9 years ago
Pete Keen	e9a6da6bc7	[#817] Add email whitelist ... This adds the ability to filter user signup with a whitelist instead of or in addition to a blacklist. Fixes #817	9 years ago
Eugen Rochko	5f54981846	New admin setting: open/close registrations, with custom message, from the admin UI	9 years ago
JantsoP	db4a41cf58	Merge branch 'master' into master	9 years ago
JantsoP	dc89fc17cc	updated translation	9 years ago
Neville Park	ce1ca28594	Changed "reblogs" to "boosts"	9 years ago
axolotl	0700521ef3	added Esperanto (eo)	9 years ago
Eugen Rochko	98a93aa07e	Fix norwegian translation being malformed	9 years ago
Korbinian	ec8029a955	Updated and fixed orthography	9 years ago
Korbinian	7dd5ba42a3	Updated and fixed german orthography	9 years ago
Eugen Rochko	b7c1b12367	Make default admin UI page reports. Add admin UI for creating a domain block	9 years ago
Christopher Kolstad	5cb011b66b	Add Norwegian locale	9 years ago
JantsoP	65d667dc6c	another typo. fuck me	9 years ago
JantsoP	d3fde60297	fixed an sneaky peaky tpy	9 years ago
JantsoP	85a8b62ca2	add finnish translation ... add finnish translation	9 years ago
JantsoP	97803600ed	add finnish translation ... add finnish translation	9 years ago
JantsoP	bfa99981e5	Merge branch 'master' into master	9 years ago
JantsoP	6501ffdadc	add finnish translation ... add finnish translation	9 years ago
JantsoP	b0f4c9b91f	finnish translation ... finnish translation	9 years ago
JantsoP	f9b4f30de6	updated final translation ... updated final translation	9 years ago
JantsoP	87854745e9	Create new translation file ... Still in progress. Should be done shortly	9 years ago
Angristan	c97fc5c1f4	Improve french translation	9 years ago
Valentin Lorentz	fbcba65f81	Improve French translation ... Fix typos and typography. Make vocabulary and grammar more uniform.	9 years ago
Eugen	61894582b8	Merge pull request #746 from eramdam/feature/improve-french-locales ... Feature/improve french locales (again)	9 years ago
Damien Erambert	71cf9d0608	Fix typo in simple_form.fr.yml	9 years ago
Damien Erambert	5e45982ed9	Improve translation of data import in fr.yml	9 years ago
Damien Erambert	b829460b4a	Better translation for revoked token in doorkeeper.fr.yml	9 years ago
Damien Erambert	65e6a00817	Fix date format in doorkeeper.fr.yml	9 years ago
Eugen	48cb2dccd2	Merge pull request #741 from eramdam/feature/improve-french-locales ... Improve/add some French locales	9 years ago
Eugen Rochko	5b12624847	Add proper error page for request timeouts	9 years ago
Damien Erambert	cb1989cbd8	Add locale in devise.fr.yml	9 years ago
Damien Erambert	03d676faa8	Add french translation for "scopes" in doorkeeper.fr.yml	9 years ago
Damien Erambert	9e26af264e	Fix small typo in doorkeeper.fr.yml	9 years ago
Damien Erambert	f9f6098e22	Complete localization of in simple_form.fr.yml	9 years ago
Damien Erambert	2c881e6717	Improve french locales on the backend (WIP)	9 years ago
Eugen Rochko	5e26295e06	Fix #700 - hide spoilers on static pages	9 years ago
Eugen Rochko	e8875c6046	Import feature for following/blocking lists (addresses #62, #177, #201, #454)	9 years ago
Eugen Rochko	f864fee116	Fix up some localizations	9 years ago
leopku	d5d5afff9c	🌐 add simplified chinese language	9 years ago
leopku	fc9bbdfd34	🚧 chinese translation WIP	9 years ago
leopku	349c6cfa2b	🌐 add chinese language file	9 years ago
leopku	c46843c65c	🔧 S3 protocol from ENV ... add support for reading S3 protocol from ENV also add S3_HOSTNAME in .env.production.sample	9 years ago
Eugen Rochko	d6ed2eb512	Prettier account and stream entry URLs	9 years ago
Eugen Rochko	05cf086766	New API method: /api/v1/search ... Returns accounts, statuses, hashtags arrays	9 years ago
Eugen Rochko	8803ca9efe	Improved landing page	9 years ago
Eugen Rochko	6b1db5c2b2	Add landing strip	9 years ago
Eugen Rochko	56d998cbdb	Export follow/block lists as CSV	9 years ago
Eugen Rochko	2816b1bf8e	Federate header images, fix open-uri http->https redirection error	9 years ago
shel	38dceb3bf7	Promote Apps (#670) ... "Various apps are available" is now a hyperlink	9 years ago
Eugen Rochko	6be7bde243	Fix #525 - Add instance information API	9 years ago
Eugen	e245115f47	Merge branch 'master' into mastodon-site-api	9 years ago