Skip to content

Commit

Permalink
Merge branch 'release/4.0.0'
Browse files Browse the repository at this point in the history
* release/4.0.0: (319 commits)
  image width bugfix
  refactor and isolate stylesheets
  code formatting
  formatting fix
  fix image widths
  wip
  added the storage:link step
  readme updates
  wip
  wip
  wip
  wip
  wip
  wip
  wip
  wip
  wip
  wip
  Apply fixes from StyleCI (#426)
  wip
  ...
  • Loading branch information
austintoddj committed Feb 1, 2019
2 parents 641da46 + 0b369a1 commit 62584c1
Show file tree
Hide file tree
Showing 194 changed files with 12,945 additions and 10,219 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.md]
trim_trailing_whitespace = false

[*.yml]
indent_size = 2
37 changes: 0 additions & 37 deletions .env.example

This file was deleted.

11 changes: 8 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
* text=auto
*.css linguist-vendored
*.scss linguist-vendored
*.js linguist-vendored

.editorconfig export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.styleci.yml export-ignore
.travis.yml export-ignore
phpunit.xml.dist export-ignore
/tests export-ignore
24 changes: 9 additions & 15 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
/node_modules
/public/hot
/public/storage
/public/vendor
/storage/*.key
/vendor
/node_modules
composer.phar
.DS_Store
Thumbs.db
/phpunit.xml
/.idea
/.vagrant
/.storage
/storage/*.index
/storage/*.lock
Homestead.json
Homestead.yaml
npm-debug.log
yarn-error.log
.env
config/blog.php
/.vscode
.phpunit.result.cache
*.cache
*.lock
38 changes: 10 additions & 28 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,19 @@
notifications:
slack: cnvs-io:4TcmkF2B3kYyUkhfJmL8dImj

dist: trusty

sudo: required

language: php

php:
- 7.1
- 7.2

env:
global:
- setup=basic

matrix:
allow_failures:
- php: 7.2
fast_finish: true
include:
- php: 7.1
- php: 7.2
- php: 7.3

sudo: false

before_install:
- if [[ $TRAVIS_PHP_VERSION != 7.2 ]] ; then phpenv config-rm xdebug.ini; fi
- mv .env.example .env
- phpenv config-rm xdebug.ini || true
- travis_retry composer self-update

install:
- composer install --ignore-platform-reqs

before_script:
- php artisan canvas:publish:assets -y
- php artisan canvas:publish:config -y
- php artisan key:generate
- echo '1485524707' > storage/canvas_installed.lock
- travis_retry composer update --prefer-dist --no-interaction --prefer-stable --no-suggest

script:
- vendor/bin/phpunit
script: vendor/bin/phpunit --verbose
40 changes: 0 additions & 40 deletions app/Console/Kernel.php

This file was deleted.

81 changes: 0 additions & 81 deletions app/Exceptions/Handler.php

This file was deleted.

9 changes: 0 additions & 9 deletions app/Http/Controllers/Controller.php

This file was deleted.

49 changes: 0 additions & 49 deletions app/Http/Kernel.php

This file was deleted.

17 changes: 0 additions & 17 deletions app/Http/Middleware/EncryptCookies.php

This file was deleted.

26 changes: 0 additions & 26 deletions app/Http/Middleware/RedirectIfAuthenticated.php

This file was deleted.

17 changes: 0 additions & 17 deletions app/Http/Middleware/VerifyCsrfToken.php

This file was deleted.

Loading

0 comments on commit 62584c1

Please sign in to comment.