mirror of https://github.com/mastodon/mastodon.git synced 2025-01-31 06:21:50 +01:00

Go to file

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

2017-09-09 14:27:47 -05:00

app

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

bin

Fix webpack-dev-server on Windows (#4000 )

2017-06-30 13:43:26 +02:00

config

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

Make PreviewCard records reuseable between statuses (#4642 )

2017-09-01 16:20:16 +02:00

docs

Fix redirect link on Tuning.md (#1595 )

2017-04-12 12:40:37 +02:00

lib

Use updated ActivityStreams context (added: sharedInbox) (#4764 )

2017-09-02 14:00:58 +02:00

log

Initial commit

2016-02-20 22:53:20 +01:00

nanobox

[nanobox] Allow Full-size Uploads (#4123 )

2017-07-09 02:52:36 +02:00

public

Merge upstream (#111 )

2017-08-01 13:20:29 -07:00

spec

Merge branch 'origin/master' into sync/upstream

2017-09-09 14:27:47 -05:00

streaming

Gracefully stop streaming server (#4103 )

2017-07-07 20:01:00 +02:00

vendor/assets

Initial commit

2016-02-20 22:53:20 +01:00

.babelrc

🎄🔨 Force tree shake emojione (#4202 )

2017-07-14 20:30:12 +02:00

.buildpacks

Add heroku APT buildpack for scalingo. (#3051 )

2017-05-14 12:57:13 +02:00

.codeclimate.yml

Enable CodeClimate SCSS Lint checks (#2886 )

2017-05-07 20:47:31 +02:00

.dockerignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.editorconfig

Add final newline to locale files (#2890 )

2017-05-07 19:55:47 +02:00

.env.nanobox

[nanobox] Add Automated Backups (#4023 )

2017-07-07 00:46:45 +02:00

.env.production.sample

Show SMTP_TLS in config sample (#4477 )

2017-08-01 15:00:29 +02:00

.env.test

Add recovery code support for two-factor auth (#1773 )

2017-04-15 13:26:03 +02:00

.env.vagrant

Add a default LOCAL_DOMAIN=mastodon.dev to .env.vagrant

2017-01-26 19:22:59 +11:00

.eslintignore

Dev Tooling fixes (eslint/editorconfig) (#1398 )

2017-04-11 00:36:03 +02:00

.eslintrc.yml

Remove eslint-disable comments (#4681 )

2017-08-24 12:15:36 +02:00

.foreman

Replace sprockets/browserify with Webpack (#2617 )

2017-05-03 02:04:16 +02:00

.gitattributes

Add .gitattributes file to avoid unwanted CRLF (#3954 )

2017-06-26 13:15:24 +02:00

.gitignore

fix #4356 : place sw.js to assets/sw.js (#4357 )

2017-07-28 01:55:52 +02:00

.haml-lint.yml

Added haml-lint and fix warnings (#2773 )

2017-05-08 03:35:25 +02:00

.nanoignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.nvmrc

update Node to 6.x LTS (#1228 )

2017-04-15 02:05:41 +02:00

.postcssrc.yml

Add object-fit polyfill for Edge (#4182 )

2017-07-14 01:59:34 +02:00

.profile

Add ffmpeg and dependent packages as well as LD_LIBRARY_PATHs (#3276 )

2017-05-24 17:57:33 +02:00

.rspec

Adding a Mention model, test stubs

2016-02-25 00:17:01 +01:00

.rubocop.yml

Add handling of Linked Data Signatures in payloads (#4687 )

2017-08-26 13:47:38 +02:00

.ruby-version

Version bumps for ruby and misc gems (#1159 )

2017-04-10 22:47:41 +02:00

.scss-lint.yml

Enable CodeClimate SCSS Lint checks (#2886 )

2017-05-07 20:47:31 +02:00

.slugignore

Remove Storybook (#4397 )

2017-07-27 22:30:27 +02:00

.travis.yml

Enable cache for babel-loader (#4505 )

2017-08-03 17:46:49 +02:00

app.json

Change logo URL for Heroku and Scalingo (#4476 )

2017-08-01 05:59:11 +02:00

Aptfile

Add libidn11 to Aptfile (#4475 )

2017-08-01 05:58:08 +02:00

boxfile.yml

[nanobox] Minor tweaks for 1.5 (#4395 )

2017-07-27 15:13:32 +02:00

Capfile

remove capistrano/faster_assets from Capfile (#2737 )

2017-05-03 12:14:52 +02:00

CODEOWNERS

Introduce CODEOWNERS file (#4670 )

2017-08-23 15:21:00 +02:00

config.ru

Fix rubocop issues, introduce usage of frozen literal to improve performance

2016-11-15 16:56:29 +01:00

CONTRIBUTING.md

Added link to docs website

2017-07-14 09:42:50 -07:00

docker_entrypoint.sh

Some Dockerfile improvements (#3182 )

2017-05-20 20:01:05 +02:00

docker-compose.yml

Switch docker-compose to version 3. (#2747 )

2017-05-04 15:56:05 +02:00

Dockerfile

Update to Alpine 3.6 (#4747 )

2017-08-30 23:52:19 +02:00

Gemfile

Add handling of Linked Data Signatures in payloads (#4687 )

2017-08-26 13:47:38 +02:00

Gemfile.lock

Update bundler-audit and brakeman (#4740 )

2017-08-30 03:30:13 +02:00

ISSUE_TEMPLATE.md

Adds note for instance admins. (#1925 )

2017-04-16 16:59:53 +02:00

LICENSE

Fix #49 - License changed from GPL-2.0 to AGPL-3.0

2016-09-21 23:04:34 +02:00

package.json

fix(mocha): Run all tests (#4433 )

2017-07-28 22:53:16 +02:00

Procfile

More robust PuSH subscription refreshes (#2799 )

2017-05-05 02:23:01 +02:00

Procfile.dev

Fix sidekiq "port" being wrong (#3014 )

2017-05-12 17:46:14 +02:00

Rakefile

Initial commit

2016-02-20 22:53:20 +01:00

README.md

Merge upstream (#111 )

2017-08-01 13:20:29 -07:00

scalingo.json

Change logo URL for Heroku and Scalingo (#4476 )

2017-08-01 05:59:11 +02:00

Vagrantfile

Install libidn11-dev in Vagrant (#4238 )

2017-07-18 00:31:43 +02:00

yarn.lock

Update webpack and related dependencies (without extract-text-webpack-plugin) (#4410 )

2017-07-28 05:16:12 +02:00

README.md

Mastodon Glitch Edition

Now with automated deploys!

So here's the deal: we all work on this code, and then it runs on dev.glitch.social and anyone who uses that does so absolutely at their own risk. can you dig it?

You can view documentation for this project at glitch-soc.github.io/docs/.
And contributing guidelines are available here and here.

Languages

Ruby 64.4%

JavaScript 16.8%

TypeScript 9.2%

SCSS 4.7%

Haml 4.4%

Other 0.5%