mirror of https://github.com/mastodon/mastodon.git synced 2025-01-19 00:21:40 +01:00

Go to file

Surinna Curtis ff9f2088f7 Move layout override into app settings modal

Squashed commit of the following:

commit 3842f879865818a3299f8283f8ed1b43c5566500
Author: Surinna Curtis <ekiru.0@gmail.com>
Date:   Mon Jul 3 19:57:39 2017 -0500

    Fix some style issues

commit 08628a0234392ecac90e869a1272f429de0b6db2
Author: Surinna Curtis <ekiru.0@gmail.com>
Date:   Mon Jul 3 19:35:22 2017 -0500

    Improved styling and layout of select app settings

commit 1787a7c20f2bf7101c6d6830450564178314a737
Author: Surinna Curtis <ekiru.0@gmail.com>
Date:   Mon Jul 3 17:13:53 2017 -0500

    remove the layout selector ui from the drawer

commit 7d93b180b1e615e2c36210ad6f119fe80a2778d8
Author: Surinna Curtis <ekiru.0@gmail.com>
Date:   Mon Jul 3 17:01:51 2017 -0500

    Add layout setting to app settings modal

2017-07-03 21:51:00 -05:00

app

Move layout override into app settings modal

2017-07-03 21:51:00 -05:00

bin

Upgrade Webpacker to version 2.0 (#3729 )

2017-06-18 02:57:09 +02:00

config

Merge remote-tracking branch 'upstream/master'

2017-06-27 20:46:13 +00:00

Bind web UI access tokens to sessions (#3940 )

2017-06-25 23:51:32 +02:00

docs

Fix redirect link on Tuning.md (#1595 )

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

lib

#1456 Added rake task to add a user. (#1482 )

2017-06-27 14:18:53 +02:00

log

Initial commit

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

nanobox

Add Support for Nanobox (#1709 )

2017-05-23 16:54:44 +02:00

public

cybre cleanup

2017-06-23 21:45:14 +00:00

spec

try fix failing controller spec caused by long bios

2017-06-30 16:27:52 +00:00

storybook

Remove unused variables (#3906 )

2017-06-23 16:05:04 +02:00

streaming

Stop using Babel with streaming server (#3950 )

2017-06-26 04:49:39 +02:00

vendor/assets

Initial commit

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

.babelrc

Use Class and Property Decorators (#3730 )

2017-06-23 19:36:54 +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

Ignore packs folder when COPY . /mastodon (#3522 )

2017-06-02 18:09:28 +02:00

.editorconfig

Add final newline to locale files (#2890 )

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

.env.nanobox

[nanobox] Adjustments for Nanobox development (#3295 )

2017-05-29 17:59:18 +02:00

.env.production.sample

added 'https://' to CDN_HOST variable example (#3446 )

2017-05-30 18:39:28 +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 unused variables (#3906 )

2017-06-23 16:05:04 +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

Upgrade Webpacker to version 2.0 (#3729 )

2017-06-18 02:57:09 +02:00

.haml-lint.yml

Added haml-lint and fix warnings (#2773 )

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

.nanoignore

Add Support for Nanobox (#1709 )

2017-05-23 16:54:44 +02:00

.nvmrc

update Node to 6.x LTS (#1228 )

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

.postcssrc.yml

Add browserslist config for autoprefixer (#3053 )

2017-05-14 12:57:54 +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

Improve RuboCop rules (compatibility to Code Climate) (#3636 )

2017-06-08 13:24:28 +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

Updates slugignore.

2017-04-06 07:53:48 -04:00

.travis.yml

Fix travis builds

2017-06-22 13:24:00 +02:00

app.json

Use cid3 on Heroku (#3001 )

2017-05-12 14:33:54 +02:00

Aptfile

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

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

boxfile.yml

[nanobox] Add python for node-gyp (#3491 )

2017-06-01 17:33:57 +02:00

Capfile

remove capistrano/faster_assets from Capfile (#2737 )

2017-05-03 12:14:52 +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

README tidy up (#2026 )

2017-04-17 21:28:31 +02: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

Some Dockerfile improvements (#3182 )

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

Gemfile

Add overview of active sessions (#3929 )

2017-06-25 16:54:30 +02:00

Gemfile.lock

Update Rails to v5.1.2 (#3968 )

2017-06-27 13:41:03 +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

Update dependencies for Node.js (#3967 )

2017-06-27 13:46:11 +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

put travis thing in readme.md

2017-06-30 12:36:10 -04:00

scalingo.json

More SMTP customization (#1372 )

2017-04-10 21:48:30 +02:00

Vagrantfile

Use the stable RVM installer (#3901 )

2017-06-22 23:28:52 +02:00

yarn.lock

Update dependencies for Node.js (#3967 )

2017-06-27 13:46:11 +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?

Languages

Ruby 64.4%

JavaScript 17.3%

TypeScript 8.7%

SCSS 4.7%

Haml 4.4%

Other 0.5%