Merge pull request #890 from pixelfed/frontend-ui-refactor

Frontend ui refactor
This commit is contained in:
daniel 2019-02-26 13:14:15 -07:00 committed by GitHub
commit 724f61c938
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7626 additions and 6 deletions

View file

@ -7,7 +7,7 @@ jobs:
build: build:
docker: docker:
# Specify the version you desire here # Specify the version you desire here
- image: circleci/php:7.1-jessie-node-browsers - image: circleci/php:7.2.3-cli-stretch-node
# Specify service dependencies here if necessary # Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images # CircleCI maintains a library of pre-built images

1
.gitignore vendored
View file

@ -7,7 +7,6 @@
/.vscode /.vscode
/.vagrant /.vagrant
/docker-volumes /docker-volumes
composer.lock
Homestead.json Homestead.json
Homestead.yaml Homestead.yaml
npm-debug.log npm-debug.log

View file

@ -25,13 +25,12 @@
"league/flysystem-aws-s3-v3": "~1.0", "league/flysystem-aws-s3-v3": "~1.0",
"league/flysystem-cached-adapter": "~1.0", "league/flysystem-cached-adapter": "~1.0",
"moontoast/math": "^1.1", "moontoast/math": "^1.1",
"phpseclib/phpseclib": "~2.0",
"pbmedia/laravel-ffmpeg": "3.0.0", "pbmedia/laravel-ffmpeg": "3.0.0",
"phpseclib/phpseclib": "~2.0",
"pixelfed/bacon-qr-code": "^3.0", "pixelfed/bacon-qr-code": "^3.0",
"pixelfed/dotenv-editor": "^2.0", "pixelfed/dotenv-editor": "^2.0",
"pixelfed/fractal": "^0.18.0", "pixelfed/fractal": "^0.18.0",
"pixelfed/google2fa": "^4.0", "pixelfed/google2fa": "^4.0",
"pixelfed/http-signatures-guzzlehttp": "^4.0",
"pixelfed/zttp": "^0.4", "pixelfed/zttp": "^0.4",
"predis/predis": "^1.1", "predis/predis": "^1.1",
"spatie/laravel-backup": "^5.0.0", "spatie/laravel-backup": "^5.0.0",
@ -39,8 +38,6 @@
"stevebauman/purify": "2.0.*" "stevebauman/purify": "2.0.*"
}, },
"require-dev": { "require-dev": {
"barryvdh/laravel-debugbar": "^3.1",
"beyondcode/laravel-er-diagram-generator": "^0.2.2",
"filp/whoops": "^2.0", "filp/whoops": "^2.0",
"fzaninotto/faker": "^1.4", "fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0", "mockery/mockery": "^1.0",

7624
composer.lock generated Normal file

File diff suppressed because it is too large Load diff