about summary refs log tree commit diff
path: root/app/views/layouts/application.html.haml
AgeCommit message (Collapse)Author
2019-07-30make cursor blink respect auto-play settingsmultiple creatures
2019-07-30add an optional blinking cursor to console formattingmultiple creatures
2019-07-21add more options for time range of roars visible to anonymous public profile ↵multiple creatures
viewers
2019-05-21make large emojos 24px instead of 32pxmultiple creatures
2019-05-21when autoplay is off play animated emoji on hovermultiple creatures
2019-05-21add option to embiggen the emojos & embiggen small bbcode text on hovermultiple creatures
2019-05-21Correct a 6-in-the-morning breaking typos.multiple creatures
2019-05-21Expose user settings to `Account` model and update code referencing those ↵multiple creatures
settings.
2019-05-21Anxiety reduction: add option to hide mascot.multiple creatures
2019-05-21Add option to remove filtered roar placeholder gap.multiple creatures
2019-05-21Add options to increase size and spacing of action buttons and width of ↵multiple creatures
compose drawer.
2019-05-21Add options to increase size and spacing of context menus and to gently the ↵multiple creatures
kobolds. Also allow showing multiple user roles.
2019-05-21add option to toggle captions + code: move monsterpit additons on topmultiple creatures
2019-04-22Load custom CSS rules after standard onesThibaut Girka
Fixes #933 Due to glitch-soc's theming system, JS and CSS files are imported in a slightly different order, and custom CSS rules were loaded *before* everything else. They will now be loaded *after* everything else, which is a bit different from upstream but should work better overall.
2018-10-11Merge commit 'ac7df62a0441b95ec04fd9111a9394795dd53ff2' into ↵Thibaut Girka
glitch-soc/merge-upstream
2018-10-10Add dns-prefetch if using different host for assets or uploads (#8942)Eugen Rochko
2018-08-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.
2018-08-25Add theme identifier to body classes for easier custom CSS styling (#8439)Eugen Rochko
Add forgotten custom CSS admin setting strings
2018-08-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.
2018-08-24Add admin custom CSS setting (#8399)Eugen Rochko
Fix #3894
2018-03-11Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-10Fix #6717: Do not double html-encode page titles (#6720)Eugen Rochko
2018-03-09Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-09Add missing meta description to profiles, some other SEO stuff (#6706)Eugen Rochko
- Add missing meta description to profiles - Add canonical rel link to landing page - Remove linebreaks from title tags - Add username to profile title - Add toots/following/followers to profile description tags - Add next/prev rel links to profiles - Do not index follower/following variants of profiles
2018-01-03Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-01-02delete X-UA-Compatible (#6068)Otakan
* delete X-UA-Compatible * undo * restore
2017-12-24Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2017-12-24Reduce motion for boost animation (#5871)Nolan Lawson
* Reduce motion for boost animation Fixes #5833 * Fix ternary expression
2017-12-10Only localize js when there's a themekibigo!
2017-12-10Javascript intl8n flavour supportkibigo!
2017-11-20Finalized theme loading and stuffkibigo!
2017-11-16Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
2017-10-28Refactor initial state: reduce_motion and auto_play_gif (#5501)Nolan Lawson
2017-10-16Merge pull request #184 from tootsuite/masterbeatrix
Fix reduced motion breaking public galleries (#5423)
2017-10-16Fix reduced motion breaking public galleries (#5423)Nolan Lawson
2017-10-11Merge remote-tracking branch 'upstream/master'Ondřej Hruška
2017-10-11Only preload JS in /web pages (#5325)Nolan Lawson
2017-09-28Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstreamOndřej Hruška
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-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-07-30Multiple frontend support (#110)Gô Shoemake
* Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common
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-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