Merge branch 'master' of git://github.com/moutonnoireu/BookStack into… · lvps/BookStack@110f32a · GitHub

lvps / BookStack Public

forked from injektion/BookStack

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 110f32a

Browse filesBrowse the repository at this point in the historyBrowse files

ssddanbrown

committed

Merge branch 'master' of git://github.com/moutonnoireu/BookStack into moutonnoireu-master

Also updated composer deps

2 parents bed7ba7 + addfb96 commit 110f32a
Copy full SHA for 110f32a

8 files changed

+207-129Lines changed: 207 additions & 129 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• .env.example
• app
  • Providers
    • EventServiceProvider.php
  • Services
    • SocialAuthService.php
• composer.json
• composer.lock
• config
  • services.php
• package.json
• resources/assets/icons
  • twitch.svg

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎.env.example‎

Copy file name to clipboardExpand all lines: .env.example

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -49,7 +49,8 @@ GOOGLE_APP_SECRET=false
49	49	OKTA_BASE_URL=false
50	50	OKTA_APP_ID=false
51	51	OKTA_APP_SECRET=false
52		-
	52	+ TWITCH_APP_ID=false
	53	+ TWITCH_APP_SECRET=false
53	54	GITLAB_APP_ID=false
54	55	GITLAB_APP_SECRET=false
55	56	GITLAB_BASE_URI=false

Collapse file

‎app/Providers/EventServiceProvider.php‎

Copy file name to clipboardExpand all lines: app/Providers/EventServiceProvider.php

+1Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -19,6 +19,7 @@ class EventServiceProvider extends ServiceProvider
19	19	'SocialiteProviders\Azure\AzureExtendSocialite@handle',
20	20	'SocialiteProviders\Okta\OktaExtendSocialite@handle',
21	21	'SocialiteProviders\GitLab\GitLabExtendSocialite@handle',
	22	+ 'SocialiteProviders\Twitch\TwitchExtendSocialite@handle',
22	23	],
23	24	];
24	25

Collapse file

‎app/Services/SocialAuthService.php‎

Copy file name to clipboardExpand all lines: app/Services/SocialAuthService.php

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -16,7 +16,7 @@ class SocialAuthService
16	16	protected $socialite;
17	17	protected $socialAccount;
18	18
19		- protected $validSocialDrivers = ['google', 'github', 'facebook', 'slack', 'twitter', 'azure', 'okta', 'gitlab'];
	19	+ protected $validSocialDrivers = ['google', 'github', 'facebook', 'slack', 'twitter', 'azure', 'okta', 'gitlab', 'twitch'];
20	20
21	21	/**
22	22	* SocialAuthService constructor.

Collapse file

‎composer.json‎

Copy file name to clipboardExpand all lines: composer.json

+2-1Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -19,7 +19,8 @@
19	19	"socialiteproviders/slack": "^3.0",
20	20	"socialiteproviders/microsoft-azure": "^3.0",
21	21	"socialiteproviders/okta": "^1.0",
22		- "socialiteproviders/gitlab": "^3.0"
	22	+ "socialiteproviders/gitlab": "^3.0",
	23	+ "socialiteproviders/twitch": "^3.0"
23	24	},
24	25	"require-dev": {
25	26	"filp/whoops": "~2.0",

Collapse file

‎composer.lock‎

Copy file name to clipboardExpand all lines: composer.lock

+162-125Lines changed: 162 additions & 125 deletions

Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Collapse file

‎config/services.php‎

Copy file name to clipboardExpand all lines: config/services.php

+7Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -102,6 +102,13 @@
102	102	'name' => 'Gitlab',
103	103	],
104	104
	105	+ 'twitch' => [
	106	+ 'client_id' => env('TWITCH_APP_ID'),
	107	+ 'client_secret' => env('TWITCH_APP_SECRET'),
	108	+ 'redirect' => env('APP_URL') . '/login/service/twitch/callback',
	109	+ 'name' => 'Twitch',
	110	+ ],
	111	+
105	112	'ldap' => [
106	113	'server' => env('LDAP_SERVER', false),
107	114	'dn' => env('LDAP_DN', false),

Collapse file

‎package.json‎

Copy file name to clipboardExpand all lines: package.json

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -11,7 +11,7 @@
11	11	"babelify": "^7.3.0",
12	12	"browserify": "^14.3.0",
13	13	"envify": "^4.0.0",
14		- "gulp": "3.9.1",
	14	+ "gulp": "^3.9.1",
15	15	"gulp-autoprefixer": "3.1.1",
16	16	"gulp-clean-css": "^3.0.4",
17	17	"gulp-livereload": "^3.8.1",

Collapse file

‎resources/assets/icons/twitch.svg‎

Copy file name to clipboard

+31Lines changed: 31 additions & 0 deletions

• Display the source diff
• Display the rich diff

LoadingViewer requires iframe.

0 commit comments

Comments

0 (0)