mastodon

Commit Graph

Author	SHA1	Message	Date
Matt Jankowski	8f4b7c1820	Filter languages with opt out (#3175 ) * Remove allowed_languages and add filtered_languages * Use filtered_languages instead of allowed_languages	8 years ago
ButterflyOfFire	8ed3fa1693	Update reset_password_instructions.ar.html.erb (#3163 ) Forgot to translate this string :p. Now Done !	8 years ago
Eugen Rochko	f1ab70649b	Add buttons to block and unblock domain (#3127 ) * Add buttons to block and unblock domain * Relationship API now returns "domain_blocking" status for accounts, rename "block entire domain" to "hide entire domain", fix unblocking domain, do not block notifications from domain-blocked-but-followed people, do not send Salmons to domain blocked users * Add test * Personal domain blocks shouldn't affect Salmon after all, since in this direction of communication the control is very thin when it comes to public stuff. Best stay consistent and not affect federation in this way * Ignore followers and follow request from domain blocked folks, ensure account domain blocks are not created for empty domain, and avoid duplicates in validation * Purge followers when blocking domain (without soft-blocks, since they are useless here) * Add tests, fix local timeline being empty when having any domain blocks	8 years ago
Matt Jankowski	d2542dcec0	Use stylesheet_pack_tag in embedded layout, avoids pipeline deprecation warning (#3123 )	8 years ago
Eugen Rochko	76449df903	Fix character counter not updating for bio (#3101 )	8 years ago
Eugen Rochko	226c9836e4	Add reset button to admin accounts search, improve looks a little (#3100 )	8 years ago
alpaca-tc	b397f69633	Render translated view (#3093 )	8 years ago
alpaca-tc	e89e4355eb	Add filter to AccountFilter (#2968 )	8 years ago
spla	a51c8074df	Add catalan language (#3084 ) * Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225	8 years ago
Hiroaki Ninomiya	cb50ecdb07	chore(landing_strip): hide signup path unless the instance allows registration. (#3055 )	8 years ago
Akihiko Odaki	85c9496340	Introduce common JavaScript file (#2981 ) * Create common chunk rather than vendor chunk vendor chunk is a set of modules provided by external vendors, but now we can have a chunk as a set of modules shared by multiple entry points, which could be more efficent than having vendor chunk. * Start rails-ujs in common.js This is used by /settings/two_factor_authentication.	8 years ago
Eugen Rochko	d0dd9eb5b5	Feature conversations muting (#3017 ) * Add <ostatus:conversation /> tag to Atom input/output Only uses ref attribute (not href) because href would be the alternate link that's always included also. Creates new conversation for every non-reply status. Carries over conversation for every reply. Keeps remote URIs verbatim, generates local URIs on the fly like the rest of them. * Conversation muting - prevents notifications that reference a conversation (including replies, favourites, reblogs) from being created. API endpoints /api/v1/statuses/:id/mute and /api/v1/statuses/:id/unmute Currently no way to tell when a status/conversation is muted, so the web UI only has a "disable notifications" button, doesn't work as a toggle * Display "Dismiss notifications" on all statuses in notifications column, not just own * Add "muted" as a boolean attribute on statuses JSON For now always false on contained reblogs, since it's only relevant for statuses returned from the notifications endpoint, which are not nested Remove "Disable notifications" from detailed status view, since it's only relevant in the notifications column * Up max class length * Remove pending test for conversation mute * Add tests, clean up * Rename to "mute conversation" and "unmute conversation" * Raise validation error when trying to mute/unmute status without conversation	8 years ago
Stephen Burgess	4bd0488a77	feat(count): Just yml count syntax to provide different rule for 1 (#2685 ) Update all translation forms that use this "counter" element.	8 years ago
Shunsuke Michii	89210781cb	Fix og:url. (#3031 )	8 years ago
beatrix	3dcb5fa28f	Revert HTML CW changes (#3020 ) * selectively Revert "Fix regressions from #2683 (#2970)" This reverts commit `72698bc3b4`. * Revert "Handle hashtags in spoiler_texts (partial fix for #699) (#2683)" This reverts commit `e2491680e6`.	8 years ago
Eugen Rochko	72698bc3b4	Fix regressions from #2683 (#2970 ) * Fix regressions from #2683 Properly format spoiler text HTML, while keeping old logic for blankness intact Process hashtags and mentions in spoiler text Format spoiler text for Atom Change "show more" toggle into a button instead of anchor Fix style regression on dropdowns for detailed statuses * Fix lint issue * Convert spoiler text to plaintext in desktop notifications	8 years ago
R Tucker	e2491680e6	Handle hashtags in spoiler_texts (partial fix for #699 ) (#2683 ) * services: scan spoiler_text for hashtags (#699) * views: link hashtags from spoiler_texts This covers linking hashtags from within the spoiler text on the server-generated pages. * services: fix string concat going into hashtag RE Cleaner Ruby syntax, may handle immutable strings better	8 years ago
Quent-in	fed585e3f4	i18n mailer files for Occitan language (#2924 ) * Create reset_password_instructions.oc.html.erb * Create reset_password_instructions.oc.text.erb * Create password_change.oc.html.erb * Create password_change.oc.text.erb * Create confirmation_instructions.oc.html.erb * Create confirmation_instructions.oc.text.erb	8 years ago
jeroenpraat	406229d927	Updating and extending Dutch strings (#2930 ) * Update nl * Update nl * Update nl * Create confirmation_instructions.nl.html.erb * Create confirmation_instructions.nl.text.erb * Create password_change.nl.html.erb * Create password_change.nl.text.erb * Create reset_password_instructions.nl.html.erb * Create reset_password_instructions.nl.text.erb	8 years ago
Yamagishi Kazutoshi	459bbfa4b2	Prevent selection of unacceptable Content-Type files (#2910 ) * Prevent selection of unacceptable Content-Type files * replace hard code * media_attachments accept content-types in initial state	8 years ago
ButterflyOfFire	7140def5c9	Update simple_form.ar.yml (#2908 ) * Update simple_form.ar.yml Added missing strings that were introduced to simple_form.ar.yml and completing translation. * Create confirmation_instructions.ar.html.erb * Create confirmation_instructions.ar.text.erb * Create password_change.ar.html.erb * Create password_change.ar.text.erb * Create reset_password_instructions.ar.text.erb * Create reset_password_instructions.ar.html.erb	8 years ago
Koala Yeung	cbd673601c	Add Thai langauge (#2903 ) * Updated Thai language * locale: remove unused translation in Thai * locale: add Thai to settings menu and application * locale: fix activerecord.th.yml format	8 years ago
yhirano	48594b18e6	Added haml-lint and fix warnings (#2773 ) * add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint	8 years ago
Özcan Zafer AYAN	983593ddf4	Add Turkish yml file (#2878 ) * Add Turkish yml file * Add translation files for Turkish * Deleted click_to_edit key and val Deleted click_to_edit: Düzenlemek için ilgili ayara tıklayınız line	8 years ago
Yamagishi Kazutoshi	f000673599	Remove local_time gem, and add similar (#2875 )	8 years ago
Ira	ee1486a7de	i18n: Update Hebrew interface translation. (#2880 ) * 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
Yamagishi Kazutoshi	6c678b7472	Fix locale key for account card (#2866 )	8 years ago
m4sk1n	fd1e29c3f8	i18n: Updated Polish translation (#2832 ) * i18n: updated Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net> * i18n: completed Polish translation Signed-off-by: Marcin Mikołajczak <m4sk1n@vivaldi.net>	8 years ago
alpaca-tc	ddc34feb58	Optimize follower_accounts and following_accounts (#2820 )	8 years ago
gentaro	dacdfec973	Added japanese version of terms of service and privacy policy (#2703 ) * Added japanese version of terms of service and privacy policy * Fix typo * Add trasnlation for title. * Improve translation and update the date.	8 years ago
AA4ch1	a50a87457e	Fix language selector on preferences page (#2794 )	8 years ago
Yamagishi Kazutoshi	566e0a772d	Improve style for form in site settings (#2796 )	8 years ago
Matt Jankowski	2bd132d458	Replace best_in_place editor on admin settings page (#2789 ) * Remove best_in_place * Replace best_in_place usage with rails helpers * Move admin/settings#index to #edit action * Remove click_to__edit from i18n	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
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
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
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
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
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
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
Yamagishi Kazutoshi	298d28af51	Fix API for Mastodon version (#2590 ) Fix #2589	8 years ago
Matt Jankowski	9262f6968b	Fix broken spec for about/links view partial (#2586 )	8 years ago
Yamagishi Kazutoshi	01c206326f	Hide get started link when register closed (#2583 )	8 years ago
Matt Jankowski	9566893cc9	More controller specs (#2561 ) * Add render_views in more places * Delegate methods from account to user with allow nil true, so that admin accounts show view renders when missing a user * Use actual account instances in authorize follow controller spec	8 years ago
Matt Jankowski	9736753985	Fix remote follow (#2547 ) * Add coverage for remote_follow#new * Fix reference to authorize_follows/card partial	8 years ago
Patrick Figel	074e9612a2	fix partial path in admin/reports (#2546 ) In #2505, the authorize_follow views were renamed to authorize_follows. This change was not applied in the show view of admin/reports, which causes a 500 when reports are viewed.	8 years ago
Eugen Rochko	b48c9013aa	Bump version, improve how version is stored for better commit history (#2526 )	8 years ago

1 2 3 4 5 ...

420 Commits (c2f70829d9dc1afcc4bbad4aadb21e5053e1fb71)