mastodon - Plural Café fork of Mastodon/Glitch Social

Age	Commit message (Collapse)	Author
2018-10-22	Merge branch 'master' into glitch-soc/merge-upstream	Thibaut Girka
	Conflicts: - .github/ISSUE_TEMPLATE/bug_report.md Took our version. - CONTRIBUTING.md Updated the embedded copy of upstream's version. - README.md Took our version. - app/policies/status_policy.rb Not a real conflict, took code from both. - app/views/layouts/embedded.html.haml Added upstream's changes (dns-prefetch) and fixed `%body.embed` - app/views/settings/preferences/show.html.haml Reverted some of upstream changes, as we have a page dedicated for flavours and skins. - config/initializers/content_security_policy.rb Kept our version of the CSP. - config/initializers/doorkeeper.rb Not a real conflict, took code from both.
2018-10-12	Fix missing protocol in dns-prefetch, improve code style (#8963)	Eugen Rochko
	Regression from #8942
2018-08-22	Fix locale packs loading in embed layout	Thibaut Girka

2017-11-21	Minor fixes	kibigo!

2017-11-20	Finalized theme loading and stuff	kibigo!

2017-09-20	Pinned toots; embeds	kibigo!

2017-09-19	Add support for multiple themes (#4959)	Andrew
	* Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return
2017-07-14	Add option to opt out of search engines on public profile/status pages (#4199)	Eugen Rochko

2017-07-11	Require stylesheets in common.js (#4152)	Akihiko Odaki (@fn_aki@pawoo.net)
	Require stylesheets in common.js because stylesheets are shared by the entry points.
2017-06-05	Fix broken embed page (#3577)	Yamagishi Kazutoshi

2017-05-19	Use stylesheet_pack_tag in embedded layout, avoids pipeline deprecation ↵	Matt Jankowski
	warning (#3123)
2017-05-08	Added haml-lint and fix warnings (#2773)	yhirano
	* add haml_lint to Gemfile * add .haml-lint.yml * fix warnings of haml_lint
2017-05-03	Replace sprockets/browserify with Webpack (#2617)	Eugen Rochko
	* 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
2017-04-20	Use default locale for html lang in layouts (#2212)	Matt Jankowski

2017-04-15	Fix cross-origin integrity (#1871)	Eugen
	See <https://glitch.social/users/bea/updates/434>
2017-04-14	Implementing Subresource Integrity (#1729)	maxypy
	* Add sprockets-rails to Gemfile * Add sprockets-rails to Gemfile.lock * Update show.html.haml * Update index.html.haml * Update admin.html.haml * Update auth.html.haml * Update embedded.html.haml * Update public.html.haml
2016-12-18	Add OEmbed iframe HTML, convert emojis on public pages, increase size of ↵	Eugen Rochko
	attachment thumbnails