62 Commits (3c49daeb8d93010dc072de82e06a016bac7dbf16)

Author	SHA1	Message	Date
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.	7 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	7 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.	7 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).	7 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”.	7 years ago
Eugen Rochko	bb71538bb5	Redesign public profiles and toots (#8068)	7 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	7 years ago
Yamagishi Kazutoshi	e9b322d0a6	Upgrade webpack to version v4.x (#6655)	7 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.	7 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	7 years ago
Thibaut Girka	ba7ee67498	Merge branch 'master' into glitch-soc/merge	7 years ago
Yamagishi Kazutoshi	f9afd06221	Combine similar components into one on public UI (#7458)	7 years ago
Thibaut Girka	1c9c0167b7	Merge branch 'master' into glitch-soc/master ... Conflicts: app/models/account.rb app/views/accounts/_header.html.haml	7 years ago
Yamagishi Kazutoshi	16fee0335f	Show card modal on public pages (#7428)	7 years ago
Jenkins	837b3804bf	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Akihiko Odaki	ff7941e652	Show media modal on public pages (#6801)	7 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
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	8 years ago
Nolan Lawson	fd7f0732fe	Compress and combine emoji data (#5229)	8 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	8 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	8 years ago
unarist	47d48fed8d	Reset preview image if avatar/header image selection was cancelled (#4893)	8 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	8 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	8 years ago
Eugen Rochko	6867681c7c	Add script to make embedded iframes autosize (#4853)	8 years ago
Eugen Rochko	d1a78eba15	Embed modal (#4748) ... * Embed modal * Proxy OEmbed requests from web UI	8 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	8 years ago
unarist	fb8aa2b3ba	Apply user timezone for the title attribute of .time-ago (#4693)	8 years ago
beatrix-bitrot	984d2d4cb6	Merge that good fresh upstream shit	8 years ago
Yamagishi Kazutoshi	f2390e2803	Dynamicaly change avatar and header bg from account setting (#4289)	8 years ago
beatrix	e7edb4d1ee	Merge pull request #87 from tootsuite/master ... merge upstream	8 years ago
Cygnan	bc1f9dc24b	Fix a typo in public.js (double semicolons) (#4269) ... Signed-off-by: Cygnan <mail@cygnan.com>	8 years ago
Ondřej Hruška	d69fa9e1f4	Merge changes from upstream with the CSS reload fix	8 years ago
Akihiko Odaki	b11ac88692	Require any modules after loading polyfill in entry points (#4231) ... 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.	8 years ago
Ondřej Hruška	c727eae441	Updated from tootsuite	8 years ago
Akihiko Odaki	b15f790221	Require images in common.js (#4232)	8 years ago
kibigo!	09cfc079b0	Merge upstream (#81)	8 years ago
Yamagishi Kazutoshi	9008ab3407	Do not load unnecessary script files (#4193)	8 years ago
kibigo!	79d898ae0a	Merge upstream!! #64 <3 <3	8 years ago
kibigo!	297921fce5	Moved glitch files to their own location ;)	8 years ago
Eugen Rochko	e19eefe219	Redesign the landing page, mount public timeline on it (#4122) ... * 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	8 years ago
abcang	f76e71825d	Improve Activity stream spoiler (#4088)	8 years ago
Surinna Curtis	7b53d4bbca	Bio length on client side mostly doesn't count metadata	8 years ago
beatrix-bitrot	c0a665865e	update bio length to 500	8 years ago
Yamagishi Kazutoshi	3690f04e4a	Remove comments for eslint-disable (#3691)	8 years ago
Yamagishi Kazutoshi	140e73bc82	Check ready state of document in public pages (#3652) ... * Check ready state of document in public pages * add check interactive	8 years ago
Yamagishi Kazutoshi	bc4fad9e22	Change libraries path to relative (#3433)	8 years ago