about summary refs log tree commit diff
path: root/app/views/layouts
AgeCommit message (Collapse)Author
2017-10-11Only preload JS in /web pages (#5325)Nolan Lawson
2017-10-09Fix dependency of error page generation on database (#5280)Eugen Rochko
2017-09-29Remove dependency on db during assets:precompile (#5138)Eugen Rochko
2017-09-28Fixed lingering upstream Theme codekibigo!
2017-09-28Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstreamOndřej Hruška
2017-09-25New error page graphic. Other error page improvements (#5099)Eugen Rochko
- 500.html generated with admin-set default locale if set - Error page `<title>` includes Mastodon site title - 500 title changed to "This page is not correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A>) - 500 content appended with "on our end" to make clear it's not user's fault
2017-09-25Generate 500.html with assets:precompile, remove loading from Google Fonts ↵Eugen Rochko
(#5067)
2017-09-23Add emoji autosuggest (#5053)Eugen Rochko
* Add emoji autosuggest Some credit goes to glitch-soc/mastodon#149 * Remove server-side shortcode->unicode conversion * Insert shortcode when suggestion is custom emoji * Remove remnant of server-side emojis * Update style of autosuggestions * Fix wrong emoji filenames generated in autosuggest item * Do not lazy load emoji picker, as that no longer works * Fix custom emoji autosuggest * Fix multiple "Custom" categories getting added to emoji index, only add once
2017-09-23Switch from EmojiOne to Twemoji, different emoji picker (#5046)Eugen Rochko
* Switch from EmojiOne to Twemoji, different emoji picker * Make emoji-mart use a local spritesheet * Fix emojify test * yarn manage:translations
2017-09-20Pinned toots; embedskibigo!
2017-09-19Add support for multiple themes (#4959)Andrew
* Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return
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-04Fix #4551 - Use correct syntax for content preloading (#4798)Eugen Rochko
2017-09-02Fix profile page when use system's font (#4774)Yamagishi Kazutoshi
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-07Merge remote-tracking branch 'upstream/master'Ondřej Hruška
2017-08-05Add "signed in as" header to some pages (#4523)Eugen Rochko
2017-07-30Multiple frontend support (#110)Gô Shoemake
* Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common
2017-07-23New logo (#4306)Eugen Rochko
* Add new logo * Remove unused images
2017-07-14🎄🔨 Force tree shake emojione (#4202)Sorin Davidoi
* chore(yarn): Install babel-plugin-preval as development dependency * feat(babel): Add preval as a plugin * feat(emojione_light): Prevaled module what tree-shaked emojione * refactor(emoji): Use emojione_light * feat: Preload emojione_picker bundle * fix(emojione_light): Do not use Object.entries * fix(emojify): Update tests * chore(emojione_light): Remove silly ascii art
2017-07-14Add option to opt out of search engines on public profile/status pages (#4199)Eugen Rochko
2017-07-11Redesign the landing page, mount public timeline on it (#4122)Eugen Rochko
* Redesign the landing page, mount public timeline on it * Adjust the standalone mounted component to the lacking of router * Adjust auth layout pages to new design * Fix tests * Standalone public timeline polling every 5 seconds * Remove now obsolete translations * Add responsive design for new landing page * Address reviews * Add floating clouds behind frontpage form * Use access token from public page when available * Fix mentions and hashtags links, cursor on status content in standalone mode * Add footer link to source code * Fix errors on pages that don't embed the component, use classnames * Fix tests * Change anonymous autoPlayGif default to false * When gif autoplay is disabled, hover to play * Add option to hide the timeline preview * Slightly improve alt layout * Add elephant friend to new frontpage * Display "back to mastodon" in place of "login" when logged in on frontpage * Change polling time to 3s
2017-07-11Require stylesheets in common.js (#4152)Akihiko Odaki (@fn_aki@pawoo.net)
Require stylesheets in common.js because stylesheets are shared by the entry points.
2017-07-09refactor: Make all reducers sync (#4125)Sorin Davidoi
2017-07-08Lazy load components (#3879)Sorin Davidoi
* feat: Lazy-load routes * feat: Lazy-load modals * feat: Lazy-load columns * refactor: Simplify Bundle API * feat: Optimize bundles * feat: Prevent flashing the waiting state * feat: Preload commonly used bundles * feat: Lazy load Compose reducers * feat: Lazy load Notifications reducer * refactor: Move all dynamic imports into one file * fix: Minor bugs * fix: Manually hydrate the lazy-loaded reducers * refactor: Move all dynamic imports to async-components * fix: Loading modal style * refactor: Avoid converting the raw state for each lazy hydration * refactor: Remove unused component * refactor: Maintain modal name * fix: Add as=script to preload link * chore: Fix lint error * fix(components/bundle): Check if timestamp is set when computing elapsed * fix: Load compose reducers for the onboarding modal
2017-06-19Link to /about from public page on a single user instance (#3814)Daigo 3 Dango
There was no link for visitors to follow to see the about page.
2017-06-13Simplify getting started links localization. Link "powered by Mastodon" to ↵Eugen Rochko
joinmastodon.org (#3725)
2017-06-05Fix broken embed page (#3577)Yamagishi Kazutoshi
2017-06-01Resolve custom application stylesheet with Webpack (#3373)Akihiko Odaki (@fn_aki@pawoo.net)
This implementation is a bit smaller and still has the following benefits: * No need of app/javascript/packs/custom.js For custom stylesheet, it typically has only "require('../styles/custom.scss')" and is redundant. * No need to extract vendor stylesheet to another asset Extracting vendor stylesheet could be forgotten by developers who do not use custom stylesheet.
2017-05-27Fix #2922 - Load stylesheet from "custom.css" entrypoint when present (#3332)Eugen Rochko
* Fix #2922 - Load stylesheet from "custom.css" entrypoint when present This is pretty much the same way it worked as before, albeit with having to create app/javascript/packs/custom.js with require('../styles/custom.scss') (or whatever you want really), which will be a blank slate for you to import whatever you want * Remove old assets directory * Extract font-awesome into common.css and always load it
2017-05-25Replace \u2014 with &mdash; (#3301)Daigo 3 Dango
2017-05-22Only load Intl data for current language (#3130)Nolan Lawson
* Only load Intl data for current language * Extract common chunk only from application.js and public.js * Generate locale packs, avoid caching on window object
2017-05-19Use stylesheet_pack_tag in embedded layout, avoids pipeline deprecation ↵Matt Jankowski
warning (#3123)
2017-05-15Introduce common JavaScript file (#2981)Akihiko Odaki
* 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.
2017-05-08Added haml-lint and fix warnings (#2773)yhirano
* add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint
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-04-27Added '(dev)' to the title in development mode (#2524)Ashley
* Added different title for dev * Changed indentation
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-25Login link for single user instances (#2393)STJrInuyasha
* Login link for single user instances * Flip the if statement around Fixes AuthorizationController tests
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-23Clean up flash display in views (#2336)Matt Jankowski
* Add flashes partial to DRY up admin/auth layouts * Further consolidate flash messages
2017-04-20Use default locale for html lang in layouts (#2212)Matt Jankowski
2017-04-19Fix double-escaping of display names in <title> (#2155)Eugen
2017-04-18Instance helper to replace site title helper (#2038)Matt Jankowski
* Move site title helper to instance helper (name change only) * Remove newline in <title> tag * Add site_hostname helper method to wrap up local_domain value * Use site_hostname helper in places that need local_domain value
2017-04-17Add mask-icon.svg (#1572) (#1585)Dale Price
* Add mask-icon (#1572) * use updated svg logo for mask-icon
2017-04-15Fix cross-origin integrity (#1871)Eugen
See <https://glitch.social/users/bea/updates/434>
2017-04-15Check for a custom css file to help customization of instances (#1368)Naouak
* User can create a custom.scss to customize their instance without modifying gitted files. * Add documentation for customization. * Forgot the helper file * Fix Style to pass codeclimate * Requests from maintainer.
2017-04-14Implementing Subresource Integrity (#1729)maxypy
* Add sprockets-rails to Gemfile * Add sprockets-rails to Gemfile.lock * Update show.html.haml * Update index.html.haml * Update admin.html.haml * Update auth.html.haml * Update embedded.html.haml * Update public.html.haml