Commit Graph

935 Commits (183674dd046079d47c77062ada66aeb98b05dc6b)

Author SHA1 Message Date
Henning Støverud bce436c8d9 Default name changed from config.json to appsettings.json
In beta 8 the name of the genrated config file has changed from config.json to appsettings.json.
2015-10-28 12:14:57 -07:00
danroth27 34edb9b128 Merge branch 'bower-article-update' 2015-10-28 11:50:10 -07:00
danroth27 bb825088b4 Merge branch 'bower-article-update' into 1.0.0-rc1 2015-10-28 11:49:50 -07:00
danroth27 e480c28191 Add Scott Addie to authors list 2015-10-28 11:22:39 -07:00
Scott Addie e48e260e19 Update Bower article for Beta 8 release 2015-10-28 11:17:57 -07:00
danroth27 5f1b40c187 Merge branch 'erikre102015-asp5' 2015-10-28 11:01:46 -07:00
danroth27 70fc9610fe Merge branch 'erikre102015-asp5' into 1.0.0-rc1 2015-10-28 11:01:22 -07:00
Erik Reitan 95f38b92c4 Adding survey link to top-level index page. 2015-10-28 10:58:28 -07:00
danroth27 bcca492fd3 Merge branch 'fixformatting' 2015-10-28 00:21:09 -07:00
danroth27 7bf732b54e Merge branch 'fixformatting' into 1.0.0-rc1 2015-10-28 00:20:50 -07:00
danroth27 48ffc07fde Fix literal block 2015-10-28 00:20:18 -07:00
danroth27 cd537e4e15 Fix merge conflict 2015-10-28 00:12:09 -07:00
danroth27 acf53692a8 Merge branch 'riande-pubISS-installOnWin' into 1.0.0-rc1 2015-10-28 00:06:53 -07:00
danroth27 938cdaeefb Minor formatting fixes 2015-10-27 23:59:46 -07:00
Rick Anderson e40180f316 organize directions 2015-10-27 23:59:45 -07:00
Daniel Roth 839557631f Fix broken image link 2015-10-26 13:19:38 -07:00
Rick Anderson e74f46f850 IIS Pub B8
feedback fixes

fixes II

copy edits
2015-10-22 11:49:30 -07:00
Rick Anderson 71f45fda01 IIS Pub B8
feedback fixes

fixes II

copy edits
2015-10-22 11:38:27 -07:00
Rick Anderson 12fd45f3ad IIS Pub B8
feedback fixes

fixes II

copy edits
2015-10-22 10:29:27 -07:00
danroth27 3a48b31baf Merge branch 'hidehelpfulness' 2015-10-21 07:02:36 -07:00
danroth27 bc791df52c Merge branch 'hidehelpfulness' into 1.0.0-rc1 2015-10-21 07:02:14 -07:00
danroth27 72162c24c6 Remove helpfulness script temporarily 2015-10-21 06:55:05 -07:00
danroth27 5465e29507 Merge branch 'fixhelpfulness' 2015-10-21 00:31:17 -07:00
danroth27 9e99f1034a Merge branch 'fixhelpfulness' into 1.0.0-rc1 2015-10-21 00:30:59 -07:00
danroth27 73784fe80d Hide helpfulness 2015-10-21 00:29:55 -07:00
danroth27 5f7d99c347 Merge branch 'riande-2fa' 2015-10-20 23:03:19 -07:00
danroth27 aab13e885f Merge branch 'riande-2fa' into 1.0.0-rc1 2015-10-20 23:02:57 -07:00
riande@microsoft.com 6f8ca76941 Update 2-factor authn article for beta8. 2015-10-20 23:00:34 -07:00
Steve Smith f57bcb5171 Merge branch 'ardalis/logging-patch' into 1.0.0-beta8 2015-10-20 09:47:02 -04:00
danroth27 de7b59789c Merge branch '1.0.0-beta8' 2015-10-20 00:16:18 -07:00
danroth27 a4cedf976e Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-10-20 00:16:04 -07:00
Sourabh Shirhatti ef34619692 Fix travis status by fixing exit code 2015-10-20 00:15:00 -07:00
danroth27 ea87fa5ef6 Merge branch '1.0.0-beta8' 2015-10-20 00:12:04 -07:00
danroth27 0f1a6fdf4b Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-10-20 00:11:41 -07:00
Rick Anderson 5ec52546bd Update common WebApplication1 to beta8. 2015-10-20 00:09:42 -07:00
danroth27 9129a71774 Merge branch '1.0.0-beta8' 2015-10-19 22:59:50 -07:00
danroth27 945d42888c Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-10-19 22:59:29 -07:00
Rick Anderson b22bc91eaa Update Your First Web API for beta8 2015-10-19 22:57:48 -07:00
danroth27 994bc5d7a6 Merge branch '1.0.0-beta8' 2015-10-19 22:38:55 -07:00
danroth27 cb8d380415 Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-10-19 22:38:39 -07:00
danroth27 32e6e4179b Remove duplicate unit testing target name 2015-10-19 22:38:09 -07:00
danroth27 c26c0e5623 Merge branch '1.0.0-beta8' 2015-10-19 22:10:43 -07:00
danroth27 807aced95f Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-10-19 22:10:13 -07:00
danroth27 e8d7d84b41 Remove raw directive 2015-10-19 22:09:04 -07:00
Steve Smith 7e7095bf97 Updated to beta8 2015-10-19 23:47:19 -04:00
Steve Smith f33916c2cc Merge branch 'ardalis/logging-patch' of https://github.com/aspnet/Docs into ardalis/logging-patch 2015-10-19 23:35:46 -04:00
Steve Smith 94d1360b5c Cleaned up missing file reference and fixed up TraceSource demo 2015-10-19 23:35:22 -04:00
danroth27 a6638f34f3 Merge branch '1.0.0-beta8' 2015-10-19 14:22:38 -07:00
danroth27 376ee63f03 Merge branch '1.0.0-beta8' into 1.0.0-rc1 2015-10-19 14:22:01 -07:00
danroth27 a18248dd76 Move prolog content to page template and remove footer override 2015-10-19 14:20:30 -07:00