Skip to content

Commit

Permalink
Merge branch 'master' into 2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
Joel Butcher committed Jan 8, 2021
2 parents 43c22b3 + 9398c78 commit 444cad8
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 4 deletions.
20 changes: 19 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,29 @@ This changelog follows [the Keep a Changelog standard](https://keepachangelog.co
## v2.0.0 (2021-01-06)
Initial V2 release

## [v1.0.1 (2020-12-29)](https://github.com/joelbutcher/socialstream/compare/v1.0.0...v1.0.1)
## [v1.1.2 (2021-01-08)](https://github.com/joelbutcher/socialstream/compare/v1.1.1...v1.1.2)
### Fixed
- Fixed an issue with `view:clear` throwing DirectoryNotFound (#33)

## [v1.1.1 (2021-01-06)](https://github.com/joelbutcher/socialstream/compare/v1.1.0...v1.1.1)

### Fixed
- Fixed config name in service provider

### Removed
- Removed resource / view publishing from service provider `boot` method

### Fixed
- Fixed `Show.vue` showing the delete account form if a password hasn't been set.

## [v1.1.0 (2020-12-28)](https://github.com/joelbutcher/socialstream/compare/v1.0.0...v1.1.0)

### Fixed
- Fixed `ActionLink.vue` to use an anchor tag rather than inertia-link to avoid CORS issue. (#22)

### Removed
- Removed the duplicate method `getAccountForProvider` in `ConnectedAccountsForm.vue` (#20)

## [v1.0.0 (2020-12-28)](https://github.com/joelbutcher/socialstream/compare/v0.0.4...v1.0.0)

## [v0.0.4 (2020-12-28)](https://github.com/joelbutcher/socialstream/compare/v0.0.3...v0.0.4)
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.x-dev"
"dev-master": "3.x-dev"
},
"laravel": {
"providers": [
Expand Down
2 changes: 0 additions & 2 deletions src/SocialstreamServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ public function register()
*/
public function boot()
{
$this->loadViewsFrom(__DIR__.'/../resources/views', 'socialstream');

$this->configurePublishing();
$this->configureRoutes();
$this->configureCommands();
Expand Down

0 comments on commit 444cad8

Please sign in to comment.