517 Commits (fe43991d02b67a650a8ad60ec48d156b6e4e963a)

Author	SHA1	Message	Date
Matt Jankowski	67dea31b0f	2FA controller cleanup (#2296) ... * Add spec coverage for settings/two_factor_auth area * extract setup method for qr code * Move otp required check to before action * Merge method only used once * Remove duplicate view * Consolidate creation of @codes for backup * Move settings/2fq#recovery_codes to settings/recovery_codes#create * Rename settings/two_factor_auth#disable to #destroy * Add coverage for the otp required path on 2fa#show * Clean up the recovery codes list styles * Move settings/two_factor_auth to settings/two_factor_authentication * Reorganize the settings two factor auth area Updated to use a flow like: - settings/two_factor_authentication goes to a #show view which has a button either enable or disable 2fa on the account - the disable button turns off the otp requirement for the user - the enable button cycles the user secret and redirects to a confirmation page - the confirmation page is a #new view which shows the QR code for user - that page posts to #create which verifies the code, and creates the recovery codes - that create action shares a view with a recovery codes controller which can be used separately to reset codes if needed	8 years ago
Ashley	05ac28f3e4	Added API for single notification dismissal (#2251) ... * Added API backend for notification dismissal * Added render statement * Changed statement	8 years ago
Akihiko Odaki	0f852c6f74	Do not set port for puma if it is bound to unix socket (#2289) ... Setting port after binding a unix socket puma listen to both of an unix socket and TCP/IP, which is not a desired behavior.	8 years ago
Yamagishi Kazutoshi	1948f9e767	Remove deprecated features at React v15.5 (#1905) ... * Remove deprecated features at React v15.5 - [x] React.PropTypes - [x] react-addons-pure-render-mixin - [x] react-addons-test-utils * Uncommented out & Add browserify_rails options * re-add react-addons-shallow * Fix syntax error from resolve conflicts * follow up 59a77923b3	8 years ago
Eduardo Elias	27ea2a88c1	Language: Missing keys for pt and pt-BR (#2277)	8 years ago
Akihiko Odaki	16cd648181	Allow to listen Unix socket (#2085) ... * Allow puma to listen Unix socket * streaming: Show the whole listening address instead of the port Port is not always appropriate (e.g. Unix socket) * streaming: Close server before exiting This change especially allows to remove Unix socket before exiting.	8 years ago
Yamagishi Kazutoshi	53b21ac1cd	Add Japanese translation for display name and bio counter (#2275) ... * Add Japanese translation for display name and bio counter * Remove dep key	8 years ago
Eduardo Elias	e4550811b2	Language: Update missing key for pt and pt-BR (#2276)	8 years ago
Eduardo Elias	704846a258	Fix: missing : for language (#2274)	8 years ago
Koala Yeung	935aecdc32	Add Indonesian (Bahasa Indonesia / id) translation (#2200) ... * add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * add Indonesian (Bahasa Indonesia) translation add id.jsx add translations on email views add devise.id.yml add doorkeeper.id.yml add id.yml add simple_form.id.yml update id locale on mastodon.jsx, index.jsx, settings_helper.rb, and application.rb * fix InvalidLocaleData on a string * fix InvalidLocaleData on a string * Fix language keys in Indonesian ruby locale (id) Use "id" instead of "en" as object keys. * Removed obsoleted translation (id)	8 years ago
Koala Yeung	1714f08d75	Add Ido (io) translation (#2202) ... * Add Ido (io) translation * Fix mastodon.jsx for io reference There is no react-intl support for io. Removed the references.	8 years ago
Sebastian Morr	74c474a652	Display remaining characters when editing display name and bio (#2219)	8 years ago
jeroenpraat	d2dc31a74a	Ruby time format fixed (#2259)	8 years ago
Ash Furrow	a0ed88a99b	Adds version to about/more and API (#2181) ... * Adds version. * Cleans up code. * Removes standalone endpoint and adds version to instance endpoint. * Addresses feedback from #2181.	8 years ago
May Kittens Devour Your Soul	25d2853db2	Croatian language updates & fixes (#2203) ... * Update hr.jsx * Update and rename simple.form.hr.yml to simple_form.hr.yml fixed file name * Update hr.yml * Update hr.yml	8 years ago
Ash Furrow	6c34eafe02	Enables the Polish translation. (#2235)	8 years ago
jeroenpraat	bbff431e3a	Updated Dutch strings and added Dutch onboarding modal strings (#2243) ... * A bit of more explanation * Update nl.yml * That's more elegant * More consistent and adding missing translation * Update * Update * Added Dutch onboarding modal strings	8 years ago
Mingye Wang	3b342be2f2	Initial overhaul at zh-CN YML translations (#2242) ... This commit provides a heavy proofreading of zh-CN translations, and mainly draws from the zh-HK source when a translation is found too incoherent. Translating directly from en is used when zh-HK translation is not available. This commit also completes the tweet-toot (choo-choo, actually) for zh-cn introduced in #2044. Some minor copyediting, as well as additional en translations, has been fed back into zh-hk text.	8 years ago
Ash Furrow	66b39ccaed	Removes timestamp from URLs. (#2185)	8 years ago
Miguel Jacq	b79ba3db8a	Send nil for SMTP_LOGIN or SMTP_PASSWORD if it was left blank in the envfile, otherwise Ruby still attempts auth even if SMTP_AUTH_METHOD is none (#2180)	8 years ago
alpaca-tc	2c0d756ad9	Extract error messages to locale file (#2162)	8 years ago
Alex Dunn	35bdacba7a	capistrano: link robots.txt (#1576) ... Related to #1533.	8 years ago
tmyt	6c83fec971	Make configuarable s3_permissions for paperclip (#2139)	8 years ago
Yamagishi Kazutoshi	8b8e140c71	Change to switch signature version for Amazon S3 (#2124)	8 years ago
Matt Jankowski	8bac0350d1	Restful refactor of accounts/ routes (#2133) ... * Add routing specs for accounts followers and following actions * Use more restful route naming for public account follow pages Moves two actions: - accounts#followers to accounts/follower_accounts#index - accounts#following to accounts/following_accounts#index Adds routing spec to ensure prior URLs are preserved.	8 years ago
Isao Sugimoto	0a850a8edb	update simple_form.ja.yml (follow for #1991) (#2113)	8 years ago
Isao Sugimoto	71f5cf12d2	update ja.yml (follow for #2106) (#2109)	8 years ago
Michel	9d8bf4ea42	Update fr.yml (#2107) ... Just updated some values. Best regards, cyweo	8 years ago
Eugen	96268e76e6	Fix wording on admin instances view, fix typos in language detector spec (#2106)	8 years ago
Eugen	e09ab2c0bd	Fix #1642, fix #1912 - Dictate content-type file extension (#2078) ... * Fix #1642, fix #1912 - Previous change (#1718) did not modify how original file was saved on upload * Fix for when file is missing	8 years ago
Isao Sugimoto	0d6c1e9cba	missing translate ja.yml (#2100)	8 years ago
Eugen	ff5baa5349	Add rate limits for logins and sign-ups by IP (5 in 5 minutes) (#2079) ... * Add rate limits for logins and sign-ups by IP (5 in 5 minutes) Should be enough for normal attempts * Add rate limit for forgotten password form as well	8 years ago
Matt Jankowski	55e1503522	Instances list in admin (#2095) ... * Add admin/instances index action * Add link to instances admin page * View lists instances * Instances, grouped by domain, ordered by count * Use Account.remote scope * Extract method: Account.by_domain_accounts	8 years ago
Matt Jankowski	66d8f99a30	Admin reports with accounts (#2092) ... * Add a ReportFilter class * Add reports and targeted_reports relationships to Account * Use ReportFilter from admin/reports controller * Link to admin/reports filtered views from admin account show view * Add indexes to reports.account_id and reports.target_account_id	8 years ago
Olivier Humbert	ee919bedd6	French translation update (#2063) ... fixes	8 years ago
Koala Yeung	0a1b024600	Add Occitan (oc) translation (#2077) ... * Added oc.yml * Added `config/locales/oc.yml`. Translated in General Occitan (Quent-in). * Added oc.jsx (Occitan translation) * Written in General Occitan (lengadocian) * Added `app/assets/javascripts/components/locales/oc.js` * Added doorkeeper.oc.yml * Added `config/locales/doorkeeper.oc.yml` (Quent-in) * Added simple_form.oc.yml * Added `config/locales/simple_form.oc.yml` (Quent-in). * Merge en.yml changes into oc.yml Added new strings for translations * Fix typo in oc.yml * Update javascript locale support (oc) * Update ruby locale list (oc) * Fix oc.yml * Remove obsoleted translations * Moved old translation of `reports` to `admin.reports`	8 years ago
Ratmir Karabut	50ed72767d	Update Russian translation (#1967) ... * Add Russian translation (ru) * Fix a missing comma * Fix the wording for better consistency * Update Russian translation * Arrange Russian setting alphabetically * Fix syntax error * Update Russian translation * Fix formatting error * Update Russian translation * Update Russian translation * Update ru.jsx * Fix syntax error * Remove two_factor_auth.warning (appears obsolete) * Add missing strings in ru.yml A lot of new strings translated, especially for the newly added admin section * Fix translation consistency	8 years ago
Eugen Rochko	57d784f1e4	Merge branch 'pause-gif' of git://github.com/patf/mastodon into patf-pause-gif	8 years ago
jeroenpraat	e1e15adf1d	Updated, improved and fixed Dutch language strings (#2030) ... * Fixed some words * Improved and more consistent * Fixes and a bit less 'je' * Improved and more consistent * Another round of improvements and consistency * More improvements and less 'je' * Update * Updated with admin strings * More improvements and additions - not complete yet, but most is there * This is what we call in Dutch 'the English disease' :-) * fix comma * admin.reportsi * not needed * hopefully now fixed	8 years ago
spf	8fd6552bca	French i18n-tasks missing fr (#2018)	8 years ago
Matt Jankowski	21a767dcfa	Improve handling of HTTP_ACCEPT for webfinger (#2008) ... This change includes: - Improve the spec coverage for incoming request to the webfinger action - For requests without an accept header (ie, what a browser might look like), return a JSON response. - For requests with an explicit format of xml or json, return that format. - For requests using an accept header, return that format. Also adds failing spec showing webfinger does not return xml, which covers the issue described in: https://github.com/tootsuite/mastodon/issues/1983	8 years ago
IWAI, Masaharu	f8546ad5a2	Update Japanese translation (#1993) ... Sync text for toot form	8 years ago
Brad Urani	e813810e03	Open sidekiq and pghero admin pages in new browser tabs (#1596) ... * Open sidekiq and pghero admin pages in new tabs * Add missing comma	8 years ago
Patrick Figel	ffb99325ca	Add gif auto-play/pause preference ... This introduces a new per-user preference called "Auto-play animated GIFs", which is enabled by default. When a user disables this setting, gifs in toots become click-to-play. Previews of animated gifs were changed to display the video play button so that users can distinguish them from regular images. This setting also affects account avatars in the detailed account view, which was changed to use the same hover-to-play mechanism that is used for animated avatars in timelines. Fixes #1652	8 years ago
Miguel Jacq	e9eaf9e33c	Allow using an SMTP server without authentication (#1597) ... * Allow using an SMTP server without authentication (e.g Postfix relay on the same host) by setting SMTP_LOGIN and SMTP_AUTH_METHOD to 'none' * Add note in .env.production.sample about SMTP settings for servers where no auth is required * Assume that SMTP_LOGIN and SMTP_PASSWORD will be blank if we set SMTP_AUTH_METHOD to none	8 years ago
Hugo Gameiro	6685106daa	Add Brazilian Portuguese and fix European Portuguese (#1966) ... * update portuguese translation added the missing fields and improved the translation * pt translations fix * improve last translation commit * fix damn quotes * add pt_br to index.jsx * add pt-BR to import index.jsx * add pt-BR to mastodon.jsx * add pt-BR to settings_helper.rb * add pt-BR to application.rb * order alphabetically pt.jsx * create pt-BR.jsx * Create devise.pt-BR.yml * language improvements to devise.pt.yml * created doorkeeper.pt-BR.yml * fixes to doorkeeper.pt.yml * create pt-BR.yml * improvements to pt.yml * Create simple_form.pt-BR.yml * Improvements to simple_form.pt.yml * improvements to pt.yml	8 years ago
May Kittens Devour Your Soul	8ad6722eea	Create hr.jsx (#1945) ... * Create hr.jsx Start of Croatian translation * Update settings_helper.rb * Update application.rb * Update application.rb * Update index.jsx	8 years ago
Toshiyuki Takahashi	be6cabb315	Improved Japanese translation in ja.yml (#1981)	8 years ago
Ingo Blechschmidt	78bdfc4589	Fix tiny typo (#1956)	8 years ago
Yamagishi Kazutoshi	5e94643058	Fix minor typo in Japanese translation "保村" -> "保存" (#1968)	8 years ago