mastodon

Commit Graph

Author	SHA1	Message	Date
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
Maciek Baron	ca2cc556f1	Crush PNGs to reduce overall size (#7954 )	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	90f12f2e5a	Focal points (#6520 ) * Add focus param to media API, center thumbnails on focus point * Add UI for setting a focal point * Improve focal point icon on upload item * Use focal point in upload preview * Add focalPoint property to ActivityPub * Don't show focal point button for non-image attachments	7 years ago
Eugen Rochko	61ed133fea	Account archive download (#6460 ) * Fix #201: Account archive download * Export actor and private key in the archive * Optimize BackupService - Add conversation to cached associations of status, because somehow it was forgotten and is source of N+1 queries - Explicitly call GC between batches of records being fetched (Model class allocations are the worst offender) - Stream media files into the tar in 1MB chunks (Do not allocate media file (up to 8MB) as string into memory) - Use #bytesize instead of #size to calculate file size for JSON (Fix FileOverflow error) - Segment media into subfolders by status ID because apparently GIF-to-MP4 media are all named "media.mp4" for some reason * Keep uniquely generated filename in Paperclip::GifTranscoder * Ensure dumped files do not overwrite each other by maintaing directory partitions * Give tar archives a good name * Add scheduler to remove week-old backups * Fix code style issue	7 years ago
Jenkins	0e10667fbe	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	2fc2725076	Fix e-mail icon for reblog being stretched (#6336 )	7 years ago
David Yip	071c2c9c85	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	79b34a0fa2	Restore onboarding modal (#6303 ) * Restore onboarding modal Revert `5ba8b3a396` * Change greeting elephant graphic, fix up some design issues * Fix wrong link color in onboarding modal	7 years ago
Eugen Rochko	872a0d5bd8	Improve HTML e-mails based on Litmus tests (#6301 ) * Use PNG images in HTML e-mails * Make webpack use URLs with host so fonts load inside HTML e-mails Convert this back to a relative URL in the premailer CSS loader since local requests are quicker * Improve responsive design * Add missing PNG icon	7 years ago
David Yip	2ca965c704	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss	7 years ago
Eugen Rochko	540b3f37ae	Replace drawer elephant graphic with a vector image (#6286 ) * Replace drawer elephant graphic with a vector image * Replace wave graphic with SVG * Remove unused elephant graphic	7 years ago
David Yip	26ecee79bf	Merge pull request #332 from glitch-soc/merge-upstream Merge in home feed regeneration changes from upstream	7 years ago
Eugen Rochko	d799921c75	Replace tutorial modal with welcome e-mail (#6273 ) * Remove onboarding modal * Welcome e-mail * Send welcome e-mail after confirmation * Remove obsolete translations	7 years ago
David Yip	d3f64812a6	Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update Conflicts: app/javascript/styles/win95.scss config/themes.yml	7 years ago
David Yip	201e82686f	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/styles/mastodon/components.scss	7 years ago
Eugen Rochko	7badad7797	Fix home regeneration (#6251 ) * Fix regeneration marker not being removed after completion * Return HTTP 206 from /api/v1/timelines/home if regeneration in progress Prioritize RegenerationWorker by putting it into default queue * Display loading indicator and poll home timeline while it regenerates * Add graphic to regeneration message * Make "not found" indicator consistent with home regeneration	7 years ago
Jenkins	aa2bf07281	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	7 years ago
Eugen Rochko	6f244ba82c	Use better reblog icon and improve contrast in HTML e-mails (#6272 )	7 years ago
Eugen Rochko	02194838dd	HTML e-mails for NotificationMailer (#6263 ) * HTML e-mails for NotificationMailer (except digest) * Add HTML template for digest * Fix build	7 years ago
David Yip	89a9d629f7	Merge remote-tracking branch 'origin/master' into gs-master Conflicts: Gemfile.lock	7 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	7 years ago
Andrew	56312df73b	Z indexes and colors	7 years ago
Andrew	7a93acd803	To 2.1.2	7 years ago
Andrew	077f2e600c	Win95 to 2.1	7 years ago
Andrew	ed574fbc09	Theme: Windows 95	7 years ago
David Yip	54148b9a4a	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/controllers/authorize_follows_controller.rb app/javascript/styles/mastodon/components.scss	7 years ago
Akihiko Odaki	2c1ed5f872	Show mastodon on modal (#6129 )	7 years ago
David Yip	e4944d065b	Switch to tootsuite's elephant friend for the drawer This version has a transparent background, which works better with the wave.	7 years ago
David Yip	7174d1c955	Merge remote-tracking branch 'origin/master' into merge-upstream Conflicts: app/javascript/images/mastodon-drawer.png app/javascript/styles/mastodon/components.scss	7 years ago
Akihiko Odaki	65f30f65a2	Move the mastodon on Getting Started column to drawer column (#6109 ) Getting Started column obtained many links, and it became much taller. Because of its height, Getting Started column required long scrolling on devices with small screen, such as 4 inch phones and 10 inch laptops. This change moves the mastodon which took large space on the column to drawer column. The drawer column has only the compose form and has more space.	7 years ago
kibigo!	bdca1614d5	Screenshot support for themes	7 years ago
kibigo!	321fa41930	Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme	8 years ago
Andrew	2827f852c0	Theme: Windows 95	8 years ago
Ondřej Hruška	9330ea1f4d	Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream	8 years ago
Eugen Rochko	0d1215e82f	Remove redundant width/height values from SVGs to fix Safari bug (#4956 )	8 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	8 years ago
Ondřej Hruška	7e5691804d	Merge git://github.com/tootsuite/mastodon into tootsuite-master	8 years ago
Eugen Rochko	0e0f18ce7c	New logo (#4306 ) * Add new logo * Remove unused images	8 years ago
Ondřej Hruška	6913426e48	Merge pull request #92 from tootsuite/master tiny upstream merge	8 years ago
Eugen Rochko	311871eefc	Turn clouds on landing page into SVGs, use SCSS variables to color them (#4299 )	8 years ago
kibigo!	79d898ae0a	Merge upstream!! #64 <3 <3	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
beatrix	d9b9bb8c5e	glitch the getting started image	8 years ago
Charlotte Fields	b27842dc70	cybre cleanup	8 years ago
Chronister	65528fc54e	All cybrespace changes through 5/28	8 years ago
Eugen Rochko	bd21afb5ed	Replace onboarding elephant with friendlier graphic, shorter animation (#3337 ) on status fade-in, fix buttons not having pointer cursor	8 years ago
Yamagishi Kazutoshi	e6fbf0334f	Remove unnecessary .keep files (#2976 ) Follow up #2902	8 years ago
Matt Jankowski	d91ba3c8d0	Remove screenshot image (#2736 )	8 years ago
Eugen Rochko	f5bf5ebb82	Replace sprockets/browserify with Webpack (#2617 ) * Replace browserify with webpack * Add react-intl-translations-manager * Do not minify in development, add offline-plugin for ServiceWorker background cache updates * Adjust tests and dependencies * Fix production deployments * Fix tests * More optimizations * Improve travis cache for npm stuff * Re-run travis * Add back support for custom.scss as before * Remove offline-plugin and babili * Fix issue with Immutable.List().unshift(...values) not working as expected * Make travis load schema instead of running all migrations in sequence * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time	8 years ago

50 Commits (d8fbd74c47de3148d6693b5cb15e7e868f72448e)