Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge pull request #1 from dotnetcore/master #10

Open
wants to merge 28 commits into
base: master
Choose a base branch
from
Open

Merge pull request #1 from dotnetcore/master #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
3c4a50d
Merge pull request #1 from dotnetcore/master
Nov 14, 2017
0bb9e52
Merge pull request #2 from dotnetcore/master
Nov 17, 2017
7c8390b
Merge remote-tracking branch 'upstream/master'
Nov 20, 2017
ca0cd4e
Merge remote-tracking branch 'upstream/master'
Nov 24, 2017
9cfe040
Merge remote-tracking branch 'upstream/master'
Nov 27, 2017
9146c81
Merge remote-tracking branch 'upstream/master'
Nov 29, 2017
1ecc9d3
Merge remote-tracking branch 'upstream/master'
Dec 15, 2017
9ea788c
Merge remote-tracking branch 'upstream/master'
Dec 23, 2017
14019f0
Merge remote-tracking branch 'upstream/master'
Dec 24, 2017
fd59a9b
Merge remote-tracking branch 'upstream/master'
Dec 30, 2017
be915fc
Merge remote-tracking branch 'upstream/master'
Jan 7, 2018
af1c61d
Merge remote-tracking branch 'upstream/master'
Feb 22, 2018
f60224d
Merge remote-tracking branch 'upstream/master'
Mar 1, 2018
21764b0
Merge remote-tracking branch 'upstream/master'
Mar 12, 2018
7e573ab
Merge remote-tracking branch 'upstream/master'
May 14, 2018
1b538b5
我的修改
Jun 10, 2018
809c139
解决git冲突
Jun 11, 2018
d3802a3
Merge remote-tracking branch 'upstream/master'
Jun 11, 2018
555d501
Merge remote-tracking branch 'upstream/master'
Jun 17, 2018
f9f265f
Merge branch 'master' of https://github.com/dotnetcore/surging
Jul 22, 2018
eb7671d
Merge remote-tracking branch 'upstream/master'
Sep 8, 2018
a2cd3cd
Merge branch 'master' of https://github.com/dotnetcore/surging
Sep 30, 2018
65a938a
Merge branch 'master' of https://github.com/dotnetcore/surging
Oct 4, 2018
fad78fc
sxf
Dec 31, 2018
eebd91c
删除被改变的文件
Jan 5, 2019
23349ff
Merge remote-tracking branch 'remotes/upstream/master'
Jan 7, 2019
59efd00
update upstream
Jan 7, 2019
cfcb83f
删除提交
Jul 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 0 additions & 12 deletions src/.dockerignore
View file
Open in desktop

This file was deleted.

63 changes: 0 additions & 63 deletions src/.vscode/launch.json
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions src/.vscode/tasks.json
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/Surging.ApiGateway/.bowerrc
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions src/Surging.ApiGateway/Configs/appsettings.Development.json
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/Surging.ApiGateway/Configs/appsettings.json
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions src/Surging.ApiGateway/Configs/cacheSettings.json
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions src/Surging.ApiGateway/Configs/gatewaySettings.json
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions src/Surging.ApiGateway/Controllers/AuthenticationManageController.cs
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions src/Surging.ApiGateway/Controllers/HomeController.cs
View file
Open in desktop

This file was deleted.

Loading