mastodon

Commit Graph

Author	SHA1	Message	Date
David Yip	a60a600a10	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: spec/views/about/show.html.haml_spec.rb	2018-04-04 13:56:58 -05:00
Eugen Rochko	7f1e924fa9	Add contact account to landing page ("Administered by") (#6984 )	2018-04-04 01:11:26 +02:00
imncls	c0aabbec0f	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	2018-02-23 23:28:31 +09:00
Eugen Rochko	ad1f541bd7	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	2018-02-22 01:03:48 +01:00
Ondřej Hruška	851d5c03e2	fix haml quotes in a bid to make travis less grumpy	2017-10-06 09:07:04 +02:00
Ondřej Hruška	914c0465b1	Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream	2017-09-28 09:12:17 +02:00
Eugen Rochko	9ff429aa6d	Uploads for admin site settings (#4913 ) * Improve OpenGraph tags for about pages * Add thumbnail admin setting * Fix error * Fix up	2017-09-14 00:04:30 +02:00
David Yip	da3f22ee7d	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	2017-09-09 14:27:47 -05:00
Daigo 3 Dango	fd9d66dfd4	Add Mastodon::Source.url (#4643 ) * Add Mastodon::Source.url * Update spec * Refactor Move things frmo Mastodon::Source to Mastodon::Version	2017-08-22 22:54:19 +02:00
David Yip	041e5f4b83	Add commit_hash to instance presenter double (#107 ) glitch-soc's about page grabs said value from InstancePresenter; the double needs to emulate that.	2017-07-28 19:25:30 -04:00
Eugen Rochko	49026e27e8	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	2017-07-11 15:27:59 +02:00
Matt Jankowski	d30ae1bc44	Remove the react-rails gem (#2801 ) * Remove react-rails gem * Fix broken view spec	2017-05-04 23:45:18 +02:00
Wesley Ellis	4a6ccafa2f	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	2017-04-22 17:29:46 +02:00

13 Commits (739f76403f9bb97166470c10553e7a79f3ef251d)