0 Fork 0

T

David Yip 67ad453373 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4

Conflicts:
      app/javascript/mastodon/features/getting_started/index.js
      app/javascript/packs/public.js
      app/javascript/styles/components.scss

2017-09-09 23:56:21 -05:00

app

Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4

2017-09-09 23:56:21 -05:00

bin

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

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

config

Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4

2017-09-09 23:56:21 -05:00

Fix locking migration on statuses table. Nullable column and NO default value (#4825 )

2017-09-06 20:57:52 +02:00

docs

…

lib

Bump version to 1.6.0rc4

2017-09-09 14:53:49 +02:00

log

…

nanobox

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

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

public

Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4

2017-09-09 23:56:21 -05:00

spec

Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4

2017-09-09 23:56:21 -05:00

streaming

Fix streaming url to lowercase (#4804 )

2017-09-04 12:52:06 +02:00

vendor/assets

…

.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

Add environment sample for OpenStack Swift (#4816 )

2017-09-06 12:13:00 +02:00

.env.test

…

.env.vagrant

…

.eslintignore

…

.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

…

.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

…

.rubocop.yml

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

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

.ruby-version

…

.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

…

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

Fix language filter codes (#4841 )

2017-09-08 12:32:22 +02:00

Gemfile.lock

Fix language filter codes (#4841 )

2017-09-08 12:32:22 +02:00

ISSUE_TEMPLATE.md

…

LICENSE

…

package.json

Update react-intl to version 2.4.0 (#4820 )

2017-09-06 16:25:19 +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

…

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 react-intl to version 2.4.0 (#4820 )

2017-09-06 16:25:19 +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.