about summary refs log tree commit diff
path: root/app/views
AgeCommit message (Collapse)Author
2017-09-20Pinned toots; embedskibigo!
2017-09-10Merge tag 'v1.6.0' into sync/upstreamDavid Yip
2017-09-10Default follows for new users (#4871)Eugen Rochko
When a new user confirms their e-mail, bootstrap their home timeline by automatically following a set of accounts. By default, all local admin accounts (that are unlocked). Can be customized by new admin setting (comma-separated usernames, local and unlocked only)
2017-09-09Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4David Yip
Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss
2017-09-09Merge tag 'v1.6.0rc3' into sync/upstreamDavid Yip
2017-09-09Merge branch 'origin/master' into sync/upstreamDavid Yip
Conflicts: app/javascript/mastodon/components/status_list.js app/javascript/mastodon/features/notifications/index.js app/javascript/mastodon/features/ui/components/modal_root.js app/javascript/mastodon/features/ui/components/onboarding_modal.js app/javascript/mastodon/features/ui/index.js app/javascript/styles/about.scss app/javascript/styles/accounts.scss app/javascript/styles/components.scss app/presenters/instance_presenter.rb app/services/post_status_service.rb app/services/reblog_service.rb app/views/about/more.html.haml app/views/about/show.html.haml app/views/accounts/_header.html.haml config/webpack/loaders/babel.js spec/controllers/api/v1/accounts/credentials_controller_spec.rb
2017-09-09i10n minors changes for 1.6 (#4867)Quent-in
* wrong preposition + typo * wrong preposition + typo * Typo * Typo * minor changes * minor changes
2017-09-09Scrollable tables in settings pages (#4857)Lynx Kotoura
* Scrollable tables in settings pages * Add space before curly brace
2017-09-08Fix language filter codes (#4841)Eugen Rochko
* Fix language filter codes CLD3 returns BCP-47 language identifier, filter settings expect identifiers in the ISO 639-1 format. Convert between formats, and exclude duplicate languages from filter choices (zh-CN->zh) * Fix zh name
2017-09-07i10n OC / FR update Pinned toots (#4842)Quent-in
* Added column.pins New strings * Added column.pins * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb * Update password_change.oc.html.erb * Update password_change.oc.text.erb * Update reset_password_instructions.oc.html.erb * Update reset_password_instructions.oc.text.erb * Update confirmation_instructions.oc.html.erb * Update confirmation_instructions.oc.text.erb
2017-09-05Adjust status embeds (#4808)Lynx Kotoura
* Adjust status embeds Adjust styles of embed code. Adjust styles of embed pages. Fix overflow of embed-modal. * Remove trailing whitespace * Using width from the variable
2017-09-04Fix #4551 - Use correct syntax for content preloading (#4798)Eugen Rochko
2017-09-02Adjust settings pages (#4765)Lynx Kotoura
* views: Adjust heading positions * Adjust settings pages Adjust label. Adjust tables. Adjust admin/reports/* pages. Fix 2FA QR code style for narrow devices. Widen several pages. Increase contrast. * Remove trailing whitespace
2017-09-02Fix profile page when use system's font (#4774)Yamagishi Kazutoshi
2017-09-02Add link to 'noscript' message (#4561)m4sk1n
* Add link to 'noscript' message Signed-off-by: Marcin Mikołajczak <me@m4sk.in> * remove indent
2017-09-01Use system's default font on non web UI pages (#4553)Yamagishi Kazutoshi
* Use system's default font on non web UI pages * Remove import for Redirect
2017-08-30Update status embeds (#4742)Eugen Rochko
- Use statuses controller for embeds instead of stream entries controller - Prefer /@:username/:id/embed URL for embeds - Use /@:username as author_url in OEmbed - Add follow link to embeds which opens web intent in new window - Use redis cache in development - Cache entire embed
2017-08-27Shorten display of large numbers on public profiles (#4711)Eugen Rochko
2017-08-26Fix missing at-sign (regression from #4688) (#4705)Yamagishi Kazutoshi
2017-08-25Change timezone of the datetime to what browser specifies (#4688)Yamagishi Kazutoshi
2017-08-25Add label for application scopes (#4691)Yamagishi Kazutoshi
* Add label for application scopes * hint
2017-08-25Pinned statuses (#4675)Eugen Rochko
* Pinned statuses * yarn manage:translations
2017-08-23Use checkboxes for application scope setting (#4671)nullkal
2017-08-23Fix up the applications area (#4664)Eugen Rochko
- Section it into "Development" area - Improve UI of application form, index, and details
2017-08-22Add Mastodon::Source.url (#4643)Daigo 3 Dango
* Add Mastodon::Source.url * Update spec * Refactor Move things frmo Mastodon::Source to Mastodon::Version
2017-08-22Application prefs section (#2758)Colin Mitchell
* Add code for creating/managing apps to settings section * Add specs for app changes * Fix controller spec * Fix view file I pasted over by mistake * Add locale strings. Add 'my apps' to nav * Add Client ID/Secret to App page. Add some visual separation * Fix rubocop warnings * Fix embarrassing typo I lost an `end` statement while fixing a merge conflict. * Add code for creating/managing apps to settings section - Add specs for app changes - Add locale strings. Add 'my apps' to nav - Add Client ID/Secret to App page. Add some visual separation - Fix some bugs/warnings * Update to match code standards * Trigger notification * Add warning about not sharing API secrets * Tweak spec a bit * Cleanup fixture creation by using let! * Remove unused key * Add foreign key for application<->user
2017-08-17use existing inflections instead of custom helper (#4624)nightpool
* use existing inflections instead of custom helper * use ActiveSupport versions
2017-08-17Show what protocol is used for accounts in admin/accounts#index (#4622)nullkal
* Show what protocol used for in admin/accounts#index * Add frozen_string_literal
2017-08-16Redesign public profiles (#4608)Eugen Rochko
* Redesign public profiles * Responsive design * Change public profile status filtering defaults and add options - No longer displays private/direct toots even if you are permitted access - By default omits replies - "With replies" option - "Media only" option * Redesign account grid cards * Fix style issues
2017-08-14Update /admin/accounts/:id view for ActivityPub (#4600)unarist
* Add protocol field * Switch protocol specific information according to active protocol * Hide PuSH subscription related buttons if ActivityPub is active
2017-08-14Add protocol handler. Handle follow intents (#4511)Eugen Rochko
* Add protocol handler. Handle follow intents * Add share intent * Improve code in intents controller * Adjust share form CSS
2017-08-13Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586)Eugen Rochko
2017-08-08Fix short description in about/more page (#4554)Lynx Kotoura
2017-08-08unify short description styling (#4548)TheInventrix
apply same style class to the About description on both the landing page and the about/more page
2017-08-07Merge remote-tracking branch 'upstream/master'Ondřej Hruška
2017-08-07Adjust tags and accounts page (#4534)Lynx Kotoura
* Adjust tag and accounts page * Remove units from 0px paddings
2017-08-05Add "signed in as" header to some pages (#4523)Eugen Rochko
2017-08-01Merge upstream (#111)kibigo!
2017-07-31i18n: update Persian translation (#4470)Masoud Abkenar
* i18n: update Persian translation * i18n: fix quotes
2017-07-31Make salutation of email localizable (#4454)unarist
2017-07-30Multiple frontend support (#110)Gô Shoemake
* Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common
2017-07-30Do not create empty a element when there is no e-mail (#4455)Yamagishi Kazutoshi
Empty a element is created when there is no business e-mail input.
2017-07-30Set contact address in about/more as mailto link (#4450)Lynx Kotoura
* Set contact address as mailto link To be able to copy long email address * Set style for mailto link
2017-07-29Fix autocomplete option in haml files (#4438)Lynx Kotoura
* Fix autocomplete in two_factor.html.haml * Fix autocomplete in registrations edit.html.haml * Fix autocomplete in passwords edit.html.haml * Fix autocomplete in _registration.html.haml * Fix autocomplete in new.html.haml * Fix autocomplete in show.html.haml * Add autocomplete option to sessions new.html.haml * Add autocomplete option to 2FA new.html.haml * Add autocomplete option to 2FA show.html.haml
2017-07-28Fix current session not being displayed in sessions list (#4424)Eugen Rochko
2017-07-26Added external link icons to joinmastodon navbar buttons (#4368)Ondřej Hruška
2017-07-25Add .fa-external-link to instance list linkOndřej Hruška
2017-07-25Fix JS errors and add back commit hashOndřej Hruška
2017-07-25Merge git://github.com/tootsuite/mastodon into tootsuite-masterOndřej Hruška
2017-07-25Send short account URL to remote instance (regression from #3844) (#4355)Yamagishi Kazutoshi
* Send short account URL to remote instance (regression from #3844) Resolve #4347 * remove format: 'json'
generated by cgit-pink (git 2.37.1) at 2024-11-02 21:01:57 +0000