2693 Commits (005f1fd360ada23c6e35c6cc1fd06b7a4fe28c41)

 

All Branches   

Search

Author	SHA1	Message	Date
yhirano	005f1fd360	update gems (#2754)	8 years ago
ThibG	8d4e7504b1	Additional specs for URI handling (#2759)	8 years ago
Tomohiro Suwa	aa6a26a2d5	Correct Account model for rubocop (#2587) ... * Correct Account model for rubocop * Undo these changes	8 years ago
Matt Jankowski	d91ba3c8d0	Remove screenshot image (#2736)	8 years ago
Eugen Rochko	bafd22ecf4	Fix #2706 - Always respond with 200 to PuSH payloads (#2733) ... Fix #2196 - Respond with 201 when Salmon accepted, 400 when unverified Fix #2629 - Correctly handle confirm_domain? for local accounts Unify rules for extracting author acct from XML, prefer <email>, fall back to <name> + <uri> (see also #2017, #2172)	8 years ago
kawax	dd9d57300b	Vagrantfile: node 6 (#2752)	8 years ago
Matt Jankowski	8c5ad23b24	Language improvements, replace whatlanguage with CLD (#2753) ... * add failing en specs * add cld2 gem * Replace WhatLanguage with CLD	8 years ago
Quent-in	53384b0ffe	Update of simple_forum_oc (#2745) ... * Update of simple_forum_oc * Update simple_form.oc.yml	8 years ago
ヨイツの賢狼ホロ | 3rd style	1c469ca98b	i18n: Update zh-CN [ Chinese (China) ] translations. (#2699) ... * Update zh-CN translations. * Update doorkeeper.zh-CN.yml * Follow @Artoria2e5 's change advices. * forget mail for text format ...... * fix some changes * mail's html version ...... * https://github.com/tootsuite/mastodon/pull/2699#pullrequestreview-35982283 * a space..... * delete some unused keys	8 years ago
unarist	e61ecf4091	Add styles for small devices to .onboarding-modal (#2748)	8 years ago
Keiji Matsuzaki	90c00f075a	Added support parallel_tests (#2740) ... - Added new gem the `parallel_tests`. - Updated .travis.yml. - Improved scripts and environment variable.	8 years ago
jirayudech	38473f0aa0	Add Thai Language (#2598) ... * Create th.yml * Update th.yml * Update thai translation * update thai translation. * Update Thai translation * Update thai translation * Update thai thanslation * Update thai translation * Update th.yml * Update th.yml	8 years ago
esetomo	24a5d13d60	remove capistrano/faster_assets from Capfile (#2737)	8 years ago
kawax	383c0b7802	Show boosted user's avatar (#2518) ... * Show boosted user's avatar * add .status__avatar-boost * margin * apply to notifications too. * account__avatar-boost * Add inline prop to Avatar component * Add AvatarOverlay component * rename mixins.scss * move files for latest master * fixed for webpack	8 years ago
m4sk1n	bf8031e984	i18n: updated Polish translation (#2729) ... * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: Updated Polish translation * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>	8 years ago
Masafumi Otsune	ab307b816b	Update simple_form.ja.yml (#2746) ... "サーバー" in Japanese is "Server", so I modified it to instance according to English.	8 years ago
unarist	40562fd266	Fix width of .confirmation-modal on narrow screens (#2743)	8 years ago
Yamagishi Kazutoshi	5f9cb48882	Add Japanese translation for allowed languages (#2738) ... * Add Japanese translation for allowed languages * Remove duplicate expression words	8 years ago
Yamagishi Kazutoshi	2ab7dc9a55	Use URI.join for generate asset URL (#2741) ... * Use URI.join for generate asset URL * to String	8 years ago
Matt Jankowski	2b9bc9c154	Use puma config for Procfile.dev (#2735)	8 years ago
Eugen Rochko	f5bf5ebb82	Replace sprockets/browserify with Webpack (#2617) ... * Replace browserify with webpack * Add react-intl-translations-manager * Do not minify in development, add offline-plugin for ServiceWorker background cache updates * Adjust tests and dependencies * Fix production deployments * Fix tests * More optimizations * Improve travis cache for npm stuff * Re-run travis * Add back support for custom.scss as before * Remove offline-plugin and babili * Fix issue with Immutable.List().unshift(...values) not working as expected * Make travis load schema instead of running all migrations in sequence * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time	8 years ago
Akihiko Odaki	26bc591572	Allow to set CA file for SMTP (#2713)	8 years ago
Matt Jankowski	268dd32d76	Auth sign out (#2511) ... * Add a spec for signing out * Add spec showing that suspended user gets a 403 forbidden on sign out * Allow suspended account users to sign out	8 years ago
ThibG	bea97ea766	Add rspec to further specify FollowRemoteAccountService (#2414)	8 years ago
m4sk1n	03f3223d72	i18n: updated Polish translation (#2727) ... Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>	8 years ago
Kaylee	7880671f35	Add option to disable two factor auth in admin accounts panel. (#2584) ... * Add option to disable two factor auth in admin accounts panel. Closes #2578 * Add @mjankowski's suggestions. * Moves destroy actions behind User#disable_two_factor! * Adds spec coverage for Admin:TwoFactorAuthenticationsController and User#disable_two_factor!	8 years ago
Matt Jankowski	b5eec34230	Add admin area view partials for each record type (#2700)	8 years ago
Quent-in	2128682162	Creation of activerecord for OC (#2721) ... * Creation of activerecord for OC * Update activerecord.oc.yml	8 years ago
Audun Larsen	e68c0ce5f6	Norwegian translation for email notifications (#2673) ... * Create confirmation_instructions.no.html.erb * Create confirmation_instructions.no.text.erb * Create password_change.no.html.erb * Create password_change.no.text.erb * Create reset_password_instructions.no.html.erb * Create reset_password_instructions.no.text.erb * Translates html welcome email * Translates welcome email * Translates html password changed email * Translates password changed email * Translates html reset password email * Translates reset password email * Fixes typo in translation * Fixes typo in translation	8 years ago
Ash Furrow	54dddfe9b8	Darkens colour on stream entries meta. (#2616)	8 years ago
m4sk1n	aea3aff4e4	i18n: Updated Polish translation (#2686) ... #807	8 years ago
Yamagishi Kazutoshi	46943b64c6	Reset textarea height when press submit key (#2681) ... * Reset textarea height when press submit key * dry * DON'T NEED props	8 years ago
Eduardo Elias	302c0d2046	Language: update pt-BR (#2687)	8 years ago
hakoai	22b1a70274	Fix to completely hide NSFW-tagged images (#2724)	8 years ago
Yamagishi Kazutoshi	6f75c8451d	Fix subscription expiration condition (#2715) ... * Fix subscription expiration condition * dry and add spec	8 years ago
Yamagishi Kazutoshi	b9b78549f3	Make it possible to check Subscription that has expired (#2712)	8 years ago
Ira	438ce5809f	Add Hebrew interface translation. (#2573) ... * follow the instructions for registering the language as stated on the Tootsuite's docs. * Added translation strings from latest master Adding &rlm; characters to many strings that are misdirected in the interface. A tiny grammar fix Updates of Hebrew strings to v1.3.1 Hebrew translation of the mailer templates. Fix strings and a missing comma. Just discovered two string keys were updated. this should lay Travis' mind to rest at last. Remove mentions before counting characters to decide RTL ratio Fixes for PR #2573 updated strings for latest master Undo RTL counting, moved out to another branch for future consideration...	8 years ago
Drew Gates	f485fa31f3	grammar fixes (#2695) ... “such as” should be used instead of “like” under imports->preface. Reworded imports->preface and recovery_instructions for better flow.	8 years ago
Stephen Burgess	34ae4cf511	fix(boost-icon): Align center for Firefox (#2690)	8 years ago
yhirano	298796cc7b	annotate models (#2697) ... * add annotate to Gemfile * rails g annotate:install * configure annotate_models * add schema info to models * fix rubocop to add frozen_string_literal	8 years ago
Matt Jankowski	a4859446ab	Coverage for remote follows (#2694) ... * Add coverage for create with empty acct value * Add coverage for create with webfinger failure * Add coverage for create with webfinger providing bad values * Add coverage for create when webfinger is good * Add coverage for session[:remote_follow] having data * Simplify how remote follow pulls acct from session * Remote follow behaves more like model * Move the discovery portions of remote follow out of controller * Check for suspended accounts	8 years ago
Matt Jankowski	7bffd16024	Error responses cleanup (#2692) ... * Use respond_with_error for forbidden errors * Wrap up common error code into single method	8 years ago
Giuseppe Pignataro	2bd46f442d	Italian translation (#2654) ... * Added Italian Translation of the following files: Changes to be committed: new file: app/views/user_mailer/confirmation_instructions.it.html.erb new file: app/views/user_mailer/confirmation_instructions.it.text.erb new file: app/views/user_mailer/password_change.it.html.erb new file: app/views/user_mailer/password_change.it.text.erb new file: app/views/user_mailer/reset_password_instructions.it.html.erb new file: app/views/user_mailer/reset_password_instructions.it.text.erb * Added italian translation Changes to be committed: new file: config/locales/activerecord.it.yml	8 years ago
Stephen Burgess	11b706acdf	fix(scrolling): Center for large screen w/o breaking horiz scroll (#2682)	8 years ago
Stephen Burgess	33b9e8d461	fix(dropdowns): Allow for dropdowns to fill full column (#2684) ... * fix(dropdowns): Allow for dropdowns to fill full column When the text inside a dropdown is longer than it is for English, the text is truncated which can result in a less-than-usable experience for languages such as German with longer words. This commit addresses the following: * Allow the dropdown to expand to the entire width of the column based on the length of the text in the dropdown * Align active dropdown arrow in relation to the trigger rather than the dropdown * Show the right hand side of the dropdown which was previously hidden (could not see border radius) * Ensure the three places dropdowns of status, account, and emoji appear well in Chrome, Firefox, Safari * fix(emoji-dropdown): Restore emoji dropdown caret	8 years ago
Matt Jankowski	f025cc6782	Filter on allowed user language preferences (#2361) ... * Naive approached to timeline filtering * Convert allowed_languages into a db column * Allow users to choose languages to see statuses in * Style list items as two columns * Add a hint to explain language filtering preference	8 years ago
yhirano	3988f2dade	Fix Rubocop offences (#2630) ... * disable Bundler/OrderedGems * fix rubocop Lint/UselessAssignment * fix rubocop Style/BlockDelimiters * fix rubocop Style/AlignHash * fix rubocop Style/AlignParameters, Style/EachWithObject * fix rubocop Style/SpaceInLambdaLiteral	8 years ago
Yamagishi Kazutoshi	1899cf5f04	Detect extension for preview card (#2679) ... * Detect extension for preview card * next	8 years ago
Matt Jankowski	5259319cf5	Reports spec for media attachments, clean up method (#2660) ... * Add coverage for Report#media_attachments * Direct query on media attachment	8 years ago
mecab	b83bc0ae64	Add postgres/redis folder to .dockerignore (#2659)	8 years ago