92 Commits (5c400a28422121df01fc5ae73bc201f3b9aa5288)

Author	SHA1	Message	Date
Thibaut Girka	36393e1d2b	Merge branch 'master' into glitch-soc/merge-upstream ... 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.	8 years ago
PatrickRWells	5c42e8b51b	Fix CW issues in static view on Safari (Fixes #8354) (#8446) ... * Fix CW issues in static view on Safari (8354) * Fixed formatting issues * Trailing space	8 years ago
M Somerville	29da56cf75	Hide reject media checkbox when not relevant. (#8426)	8 years ago
Thibaut Girka	bfeac6747a	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: .circleci/config.yml app/controllers/authorize_follows_controller.rb app/javascript/packs/public.js Moved new stuff from packs/public.js to core/public.js. Added appropriate use_pack in new controllers.	8 years ago
Eugen Rochko	78fa926ed5	Add remote interaction dialog for toots (#8202) ... * Add remote interaction dialog for toots * Change AuthorizeFollow into AuthorizeInteraction, support statuses * Update brakeman.ignore * Adjust how interaction buttons are display on public pages * Fix tests	8 years ago
ThibG	be0b372a22	Fix admin.js starting rails-ujs twice (fixes #8168) (#8213)	8 years ago
Thibaut Girka	e5a603206d	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.	8 years ago
ThibG	1ab8b4b8ea	Scroll to linked status in public status view (fixes #7884) (#8130) ... When there is a single detailed status on a public page, scroll to it and replace the history state to not scroll back on refresh (simulates # anchors).	8 years ago
Thibaut Girka	c1c514ca70	Merge branch 'master' into glitch-soc/merge-upstream ... Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.	8 years ago
Eugen Rochko	bb71538bb5	Redesign public profiles and toots (#8068)	8 years ago
Thibaut Girka	f26f1145ac	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: Dockerfile app/javascript/packs/common.js config/webpack/loaders/sass.js config/webpack/shared.js db/schema.rb package.json yarn.lock A lot of the conflicts come from updating webpack. Even though upstream deleted app/javascript/packs/common.js, I kept glitch-soc's version as it unifies JS/CSS packs behavior across flavours. Ported glitch changes to webpack 4.x	8 years ago
Yamagishi Kazutoshi	e9b322d0a6	Upgrade webpack to version v4.x (#6655)	8 years ago
Thibaut Girka	d392020da6	Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.	8 years ago
Eugen Rochko	2092d5c0ad	Improve embeds (#7919) ... * Make embeds cacheable by reverse proxy * Make follow button on embeds open remote follow modal Instead of web+mastodon://, also, turn the button blue, and add a sign up prompt to the remote follow modal	8 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	8 years ago
Yamagishi Kazutoshi	f9afd06221	Combine similar components into one on public UI (#7458)	8 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	8 years ago
Yamagishi Kazutoshi	16fee0335f	Show card modal on public pages (#7428)	8 years ago
Eugen Rochko	a9c440637c	Improve report layout (#7188) ... * 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	8 years ago
Jenkins	837b3804bf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	8 years ago
Akihiko Odaki	ff7941e652	Show media modal on public pages (#6801)	8 years ago
Akihiko Odaki	7a6eaad445	Do not require images in about.js and share.js (#6622) ... They are already required by common.js.	8 years ago
abcang	8cd2828e91	Fix hide and show media button on admin page (#6347)	8 years ago
kibi!	cda845ae0e	Fix mailer to use webpack core	8 years ago
David Yip	89a9d629f7	Merge remote-tracking branch 'origin/master' into gs-master ... Conflicts: Gemfile.lock	8 years ago
Eugen Rochko	5276c0a090	HTML e-mails for UserMailer (#6256) ... - premailer gem to turn CSS into inline styles automatically - rework UserMailer templates - reword UserMailer templates	8 years ago
kibigo!	541fe9b110	Skins support	8 years ago
kibigo!	bdbbd06dad	Finalized theme loading and stuff	8 years ago
kibigo!	a9ed857171	WIP static themeing	8 years ago
kibigo!	08a01dd037	Public pack fix	8 years ago
kibigo!	45c44989c8	Forking glitch theme	8 years ago
Surinna Curtis	35fbdc36f9	Merge tootsuite/master at 3023725936	8 years ago
Ondřej Hruška	37ff061d9b	satisfy eslint and jest	8 years ago
Ondřej Hruška	4b397adb5b	fix some lint errors	8 years ago
David Yip	dbb1fce94d	Merge remote-tracking branch 'upstream/master' into gs-master	8 years ago
Yamagishi Kazutoshi	bf0ee1a25c	Enable ESLint rules import/* (#5414) ... * Enable ESLint rules import/* * fix	8 years ago
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	8 years ago
Eugen Rochko	f486ef2666	Redesign public hashtag pages (#5237)	9 years ago
Nolan Lawson	fd7f0732fe	Compress and combine emoji data (#5229)	9 years ago
Ondřej Hruška	daad07b1d5	Merge remote-tracking branch 'origin/better-themeing' into merging-upstream	9 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	9 years ago
kibigo!	86e617a839	Better themeing support!!	9 years ago
Andrew	0401a24558	Add support for multiple themes (#4959) ... * 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	9 years ago
Eugen Rochko	2bbf987a0a	Redesign video player (#4911) ... * 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	9 years ago
unarist	47d48fed8d	Reset preview image if avatar/header image selection was cancelled (#4893)	9 years ago
David Yip	67ad453373	Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4 ... Conflicts: app/javascript/mastodon/features/getting_started/index.js app/javascript/packs/public.js app/javascript/styles/components.scss	9 years ago
David Yip	b9f7bc149b	Merge branch 'origin/master' into sync/upstream ... 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	9 years ago
Eugen Rochko	6867681c7c	Add script to make embedded iframes autosize (#4853)	9 years ago
Eugen Rochko	d1a78eba15	Embed modal (#4748) ... * Embed modal * Proxy OEmbed requests from web UI	9 years ago
Eugen Rochko	e95bdec7c5	Update status embeds (#4742) ... - 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	9 years ago