about summary refs log tree commit diff
path: root/app/views
AgeCommit message (Collapse)Author
2017-05-07Fix locale key for account card (#2866)Yamagishi Kazutoshi
2017-05-06i18n: Updated Polish translation (#2832)m4sk1n
* 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>
2017-05-06Optimize follower_accounts and following_accounts (#2820)alpaca-tc
2017-05-06Added japanese version of terms of service and privacy policy (#2703)gentaro
* Added japanese version of terms of service and privacy policy * Fix typo * Add trasnlation for title. * Improve translation and update the date.
2017-05-04Fix language selector on preferences page (#2794)AA4ch1
2017-05-04Improve style for form in site settings (#2796)Yamagishi Kazutoshi
2017-05-04Replace best_in_place editor on admin settings page (#2789)Matt Jankowski
* 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
2017-05-03i18n: Update zh-CN [ Chinese (China) ] translations. (#2699)ヨイツの賢狼ホロ | 3rd style
* 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
2017-05-03Replace sprockets/browserify with Webpack (#2617)Eugen Rochko
* 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
2017-05-02Add option to disable two factor auth in admin accounts panel. (#2584)Kaylee
* 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!
2017-05-02Add admin area view partials for each record type (#2700)Matt Jankowski
2017-05-02Norwegian translation for email notifications (#2673)Audun Larsen
* 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
2017-05-02Fix subscription expiration condition (#2715)Yamagishi Kazutoshi
* Fix subscription expiration condition * dry and add spec
2017-05-02Make it possible to check Subscription that has expired (#2712)Yamagishi Kazutoshi
2017-05-02Add Hebrew interface translation. (#2573)Ira
* 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...
2017-05-01Italian translation (#2654)Giuseppe Pignataro
* 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
2017-05-01Filter on allowed user language preferences (#2361)Matt Jankowski
* 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
2017-04-28Fix API for Mastodon version (#2590)Yamagishi Kazutoshi
Fix #2589
2017-04-28Fix broken spec for about/links view partial (#2586)Matt Jankowski
2017-04-28Hide get started link when register closed (#2583)Yamagishi Kazutoshi
2017-04-28More controller specs (#2561)Matt Jankowski
* 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
2017-04-28Fix remote follow (#2547)Matt Jankowski
* Add coverage for remote_follow#new * Fix reference to authorize_follows/card partial
2017-04-28fix partial path in admin/reports (#2546)Patrick Figel
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.
2017-04-27Bump version, improve how version is stored for better commit history (#2526)Eugen Rochko
2017-04-27Added '(dev)' to the title in development mode (#2524)Ashley
* Added different title for dev * Changed indentation
2017-04-27OEmbed support for PreviewCard (#2337)Eugen Rochko
* OEmbed support for PreviewCard * Improve ProviderDiscovery code failure treatment * Do not crawl links if there is a content warning, since those don't display a link card anyway * Reset db schema * Fresh migrate * Fix rubocop style issues Fix #1681 - return existing access token when applicable instead of creating new * Fix test * Extract http client to helper * Improve oembed controller
2017-04-27Add ActivityPub Actor id to WebFinger JSON. (#2522)Evan Minto
2017-04-27Add spec coverage and refactor authorize_follows controller (#2505)Matt Jankowski
2017-04-26Update Russian translation (rebased) (#2503)Koala Yeung
* 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 * Update Russian translation * Fix merge conflicts Redid Works by @rkarabut
2017-04-26Red favicon for dev (#2470)Lindsey Bieda
* Set a dev specific favicon * Consistent spacing * Add trailing slash for consistency * Update to remove interpolation
2017-04-26Add media dimensions (#2448)Francis Chong
* Fixes #1985 - add migration AddMediaAttachmentMeta, which add meta field to media_attachments - before saving attachment, set file meta if needed - add meta in api * add spec * align the “size” format for image and video * fix code climate * fixes media_attachment_spec.rb
2017-04-25Login link for single user instances (#2393)STJrInuyasha
* Login link for single user instances * Flip the if statement around Fixes AuthorizationController tests
2017-04-25Change ActivityPub paging to match spec. Clean up ActivityPub outbox ↵Evan Minto
changes. (#2410) * Change ActivityPub paging to match spec. Clean up ActivityPub outbox changes. * Fix code style and test failures for OutboxController. * Attempt to fix CI errors.
2017-04-24Add an RTL stylesheet for Arabic i18n (#2378)Eugen
2017-04-24Fix flashes partial render error for controllers which don't inherit from ↵Matt Jankowski
application controller (#2400) * Add failing spec for oauth/authorized_applications controller * Use explicit reference to flashes partial from admin layout Because some of the controllers which use the admin layout do not inherit from application controller, this partial is not in their view path.
2017-04-24Report processing improvements (#2349)Effy Elden
* Expose media attachments on reported statuses directly * Comment out unused bulk report checkbox. Add title to report comment for viewing full comment. Add 'contents' column, with icons and numerical indicators to show the number of referenced statuses and media attachments in the report * Link account name on authorize_follow card back to account * Add localisation string for report_contents * Show new admin accounts card partial on report view. Apply simple_format to report comment so newlines are preserved. * Add new admin accounts card partial, for display quick useful admin stats (e.g. report history, moderation status). * Fix localized variable
2017-04-24Followers-only post federation (#2111)Eugen
* Make private toots get PuSHed to subscription URLs that belong to domains where you have approved followers * Authorized followers controller, stub for bulk action * Soft block in the background * Add simple test for new controller * Rename Settings::FollowersController to Settings::FollowerDomainsController, paginate results, rename "private" post setting to "followers-only", fix pagination style, improve post privacy preferences style, improve warning style * Extract compose form warnings into own container, show warning when posting to followers-only with unlocked account
2017-04-23Fixes problem with showing non-local accounts. (#2371)Ash Furrow
2017-04-23Add link for domain in land strip (#2306)ymmtmdk
* Add link for domain in land strip * Use root_path * Avoid repeating code
2017-04-23ActivityPub: Add basic, read-only support for Outboxes, Notes, and ↵Evan Minto
Create/Announce Activities (#2197) * Clean up collapsible components * Expose user Outboxes and AS2 representations of statuses * Save work thus far. * Fix bad merge. * Save my work * Clean up pagination. * First test working. * Add tests. * Add Forbidden error template. * Revert yarn.lock changes. * Fix code style deviations and use localized instead of hardcoded English text.
2017-04-23Admin UI for confirming users (#2245)Ash Furrow
* Shows confirmed status in list. * Adds ability to confirm users in admin UI. * Added new english translations. * Addresses feedback from #2245. * More feedback.
2017-04-23Clean up flash display in views (#2336)Matt Jankowski
* Add flashes partial to DRY up admin/auth layouts * Further consolidate flash messages
2017-04-22Add og:url tags (#2298)Wesley Ellis
* add og:url to stream_item view * add og:url and text to about/show * add og:url to profile, followers and follows pages
2017-04-22Add author/actor URI to the list of webfinger aliases (#2319)ThibG
This fixes outbound salmon requests to remote GNU Social instances
2017-04-22[WIP] Html lang on statuses (#2297)Matt Jankowski
* Add html lang attributes around statuses * Remove urls from language detection
2017-04-222FA controller cleanup (#2296)Matt Jankowski
* 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
2017-04-21Add Indonesian (Bahasa Indonesia / id) translation (#2200)Koala Yeung
* 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)
2017-04-21Use local_time gem for timezone replacement (#2174)Matt Jankowski
For the 'time ago' value of stream entry simple statuses and the timestamp value of detailed statuses - output their UTC value and use the browser timezone to convert locally.
2017-04-21Display remaining characters when editing display name and bio (#2219)Sebastian Morr
2017-04-21Add crossorigin="anonymous" to about (#2272)Yamagishi Kazutoshi