about summary refs log tree commit diff
path: root/app/javascript/packs
AgeCommit message (Collapse)Author
2018-05-10Merge branch 'master' into glitch-soc/masterThibaut Girka
Conflicts: app/models/account.rb app/views/accounts/_header.html.haml
2018-05-09Show card modal on public pages (#7428)Yamagishi Kazutoshi
2018-04-20Improve report layout (#7188)Eugen Rochko
* Use table for statuses in report * Display reported account and reporter in the same table * Split accounts and general report info into two tables again * Redesign report statuses table, notes, merge notes and action log * Remove unused translations * Fix code style issue * Fix code style issue * Fix code style issue
2018-03-25Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-03-24Show media modal on public pages (#6801)Akihiko Odaki
2018-03-04Do not require images in about.js and share.js (#6622)Akihiko Odaki
They are already required by common.js.
2018-01-24Fix hide and show media button on admin page (#6347)abcang
2018-01-15Fix mailer to use webpack corekibi!
2018-01-15Merge remote-tracking branch 'origin/master' into gs-masterDavid Yip
Conflicts: Gemfile.lock
2018-01-16HTML e-mails for UserMailer (#6256)Eugen Rochko
- premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates
2017-11-30Skins supportkibigo!
2017-11-20Finalized theme loading and stuffkibigo!
2017-11-18WIP static themeingkibigo!
2017-11-18Public pack fixkibigo!
2017-11-17Forking glitch themekibigo!
2017-11-16Merge tootsuite/master at 30237259367a0ef2b20908518b86bbeb358999b5Surinna Curtis
2017-10-16satisfy eslint and jestOndřej Hruška
2017-10-16fix some lint errorsOndřej Hruška
2017-10-16Merge remote-tracking branch 'upstream/master' into gs-masterDavid Yip
2017-10-16Enable ESLint rules import/* (#5414)Yamagishi Kazutoshi
* Enable ESLint rules import/* * fix
2017-10-11Merge upstream 2.0ish #165kibigo!
2017-10-07Redesign public hashtag pages (#5237)Eugen Rochko
2017-10-06Compress and combine emoji data (#5229)Nolan Lawson
2017-09-28Merge remote-tracking branch 'origin/better-themeing' into merging-upstreamOndřej Hruška
2017-09-28Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstreamOndřej Hruška
2017-09-25Better themeing support!!kibigo!
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-14Redesign video player (#4911)Eugen Rochko
* Redesign video player * Use new video player on static public pages too * Use media gallery component on static public pages too * Pause video when hiding it * Full-screen sizing on WebKit * Add aria labels to video player buttons * Display link card on public status page * Fix fullscreen from modal sizing issue * Remove contain: strict property to fix fullscreen from columns
2017-09-11Reset preview image if avatar/header image selection was cancelled (#4893)unarist
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 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-09Add script to make embedded iframes autosize (#4853)Eugen Rochko
2017-08-31Embed modal (#4748)Eugen Rochko
* Embed modal * Proxy OEmbed requests from web UI
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-25Apply user timezone for the title attribute of .time-ago (#4693)unarist
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-07-30Multiple frontend support (#110)Gô Shoemake
* Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common
2017-07-22Merge that good fresh upstream shitbeatrix-bitrot
2017-07-21Dynamicaly change avatar and header bg from account setting (#4289)Yamagishi Kazutoshi
2017-07-20Merge pull request #87 from tootsuite/masterbeatrix
merge upstream
2017-07-19Fix a typo in public.js (double semicolons) (#4269)Cygnan
Signed-off-by: Cygnan <mail@cygnan.com>
2017-07-18Merge changes from upstream with the CSS reload fixOndřej Hruška
2017-07-18Improve admin page (#4121)abcang
* Improve admin page * Fix test * Add spec * Improve select style
2017-07-18Require any modules after loading polyfill in entry points (#4231)Akihiko Odaki
app/javascript/mastodon/main.js delayed the execution of modules, but other entry points didn't. That leads to failure in executing modules, which requires those polyfills. Strictly enforce the rule to require any modules after loading polyfill in entry points.
2017-07-17Updated from tootsuiteOndřej Hruška
2017-07-17Require images in common.js (#4232)Akihiko Odaki
2017-07-15Merge upstream (#81)kibigo!
2017-07-14Do not load unnecessary script files (#4193)Yamagishi Kazutoshi
2017-07-12Merge upstream!! #64 <3 <3kibigo!
2017-07-12Moved glitch files to their own location ;)kibigo!
generated by cgit-pink (git 2.37.1) at 2024-11-20 11:51:04 +0000