mastodon

Commit Graph

Author	SHA1	Message	Date
Claire	d9c3109bb6	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
Claire	6d3fa7828e	Redesign /about when already logged in (#17348 ) * Redesign /about when already logged in * Fix sign up form still showing when OMNIAUTH_ONLY is set * Fix tests * Change wording based on suggestions Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	3 years ago
Claire	fc500a6062	Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `CONTRIBUTING.md`: Upstream file has changed and we're quoting it. Ported the changes. - `README.md`: Upstream file has changed but we have a completely different one. Kept our version. - `lib/mastodon/version.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version. - `spec/presenters/instance_presenter_spec.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version.	4 years ago
Claire	5a1e072517	Change references to tootsuite/mastodon to mastodon/mastodon (#16491 ) * Change references to tootsuite/mastodon to mastodon/mastodon * Remove obsolete test fixture * Replace occurrences of tootsuite/mastodon with mastodon/mastodon in CHANGELOG And a few other places	4 years ago
Thibaut Girka	02062aab55	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: - app/controllers/about_controller.rb - app/controllers/tags_controller.rb - app/views/about/show.html.haml - spec/views/about/show.html.haml_spec.rb	6 years ago
Eugen Rochko	65fffeac3f	Redesign landing page (#10232 )	6 years ago
Thibaut Girka	d17844e6d1	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
ashleyhull-versent	2dba313100	Replace SVG asset with Custom mascot (#8766 )	6 years ago
Thibaut Girka	bf1d3ae3b8	Merge branch 'master' into glitch-soc/merge-upstream Conflicts: config/settings.yml	7 years ago
Eugen Rochko	cc56f2230a	Add separate setting for sidebar text (site_short_description) (#8107 ) * Add separate setting for sidebar text (site_short_description) * Fix tests	7 years ago
David Yip	3ab6a8b8be	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: spec/views/about/show.html.haml_spec.rb	7 years ago
Eugen Rochko	07176fed37	Add contact account to landing page ("Administered by") (#6984 )	7 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
Ondřej Hruška	dcd8ff5308	fix haml quotes in a bid to make travis less grumpy	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	8 years ago
David Yip	9aaf3218d2	Add commit_hash to instance presenter double (#107 ) glitch-soc's about page grabs said value from InstancePresenter; the double needs to emulate that.	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
Matt Jankowski	f9d398e8fb	Remove the react-rails gem (#2801 ) * Remove react-rails gem * Fix broken view spec	8 years ago
Wesley Ellis	a1174a6d7e	Add og:url tags (#2298 ) * add og:url to stream_item view * add og:url and text to about/show * add og:url to profile, followers and follows pages	8 years ago

23 Commits (75279377583c6e2aa04cc8d7380c593979630b38)