glitchier-soc

Commit Graph

Author	SHA1	Message	Date
Thibaut Girka	91bef4759f	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js	6 years ago
jacob	d16c3342ce	add several missing alt tags (#8708 ) * add several missing alt tags * remove alt text from mascot images	6 years ago
Thibaut Girka	e70fc059a9	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
M Somerville	ad41806e53	Allow use of plurals on about page stats. (#8363 )	6 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.	6 years ago
Eugen Rochko	5b8603879f	Adjust responsive design for /about/more and /terms (#8158 ) Follow-up to #8142	6 years ago
Eugen Rochko	0dcc1950d1	Update /terms and /about/more to use public layout (#8142 )	6 years ago
imncls	bb6988a7ac	Merge branch 'master' of https://github.com/tootsuite/mastodon # Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb	7 years ago
Eugen Rochko	c71aa468b5	Redesign landing page (again) (#6486 ) * Redesign landing page (again) * Move login form in small version to the right column * Display closed registrations message * Add site setting for the hero image * Fix test * Increase spacing, maximum width, change call to action section	7 years ago
David Yip	4c1fd9a19c	Merge remote-tracking branch 'tootsuite/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Akihiko Odaki	5da5c65db8	Unify links container implementation in about pages (#6382 ) They were redundant, and also had a inconsistency; the button for "other instances" had an icon for the external link in "more" page, but it didn't in the other pages. This unifies the implementation, and the external link icon is now shown in all the about pages.	7 years ago
kibigo!	bdbbd06dad	Finalized theme loading and stuff	7 years ago
kibigo!	8d6b9ba494	Merge upstream 2.0ish #165	7 years ago
takayamaki	552d22bec9	sign_in and sign_up views present og meta infos (#5308 )	7 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	7 years ago
Eugen Rochko	9239e4ce4d	Uploads for admin site settings (#4913 ) * Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up	7 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	7 years ago
Daigo 3 Dango	696c2c6f2f	Add Mastodon::Source.url (#4643 ) * Add Mastodon::Source.url * Update spec * Refactor Move things frmo Mastodon::Source to Mastodon::Version	7 years ago
Lynx Kotoura	dcbc1af38a	Fix short description in about/more page (#4554 )	7 years ago
TheInventrix	c9fd6f386c	unify short description styling (#4548 ) apply same style class to the About description on both the landing page and the about/more page	7 years ago
Ondřej Hruška	4115043dc7	Added external link icons to joinmastodon navbar buttons (#4368 )	7 years ago
Ondřej Hruška	4c233b4f3a	Add .fa-external-link to instance list link	7 years ago
Ondřej Hruška	b7cf758fbe	Fix JS errors and add back commit hash	7 years ago
Eugen Rochko	2374d63536	Redesign extended information page (#4322 ) * Redesign extended information page * Remove unused keys * Add $ui-base-lighter-color variable to SCSS	7 years ago
yhirano	48594b18e6	Added haml-lint and fix warnings (#2773 ) * add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint	7 years ago
Matt Jankowski	9262f6968b	Fix broken spec for about/links view partial (#2586 )	8 years ago
Ash Furrow	a0ed88a99b	Adds version to about/more and API (#2181 ) * Adds version. * Cleans up code. * Removes standalone endpoint and adds version to instance endpoint. * Addresses feedback from #2181.	8 years ago
Matt Jankowski	84b5fae8e3	Simplify renders in views (#2084 ) * Simplify render in mailer views * Simplify render in about/more view * Simplify render in accounts follow views * Simplify render in recovery code views * Simplify render in stream entry embed * Simplify render in stream entries status partial * Simplify render in authorize follow new view	8 years ago
Matt Jankowski	389f8f8249	Instance helper to replace site title helper (#2038 ) * 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	8 years ago
Matt Jankowski	3b8908c114	About page contact email (#1839 ) * Correct site_contact_email typo * Separate about more page into partials, add specs	8 years ago
Matt Jankowski	e5282e4ec0	Clean up about page (#1282 ) * Add InstancePresenter to expose site details * Clean up about controller, use instance presenter	8 years ago
Eugen Rochko	cde0476ca2	Fix #487	8 years ago
Eugen Rochko	cc1eccc8bc	Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up	8 years ago
Eugen Rochko	7cde08e30b	Improve extended about page layout	8 years ago
Eugen Rochko	c01dd089ff	Adding about/more page with extended information that can be set up by an admin	8 years ago
Eugen Rochko	e25170f960	Add extended about page stub	8 years ago

36 Commits (4e60a0d5433f5dfa4f71a452cc5c6ceb0f21ceab)