ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,895 Commits 36 Branches 19 Tags 655 MiB
Commit Graph

90 Commits

Author SHA1 Message Date
Cesar De la Torre
32da90b6af Merge pull request #235 from skynode/patch-2 
Update Identity.API/Startup.cs
 2017-08-16 13:34:17 -07:00
IgorSychev
1a8c0f2ef4 layout fix after alpha5 2017-08-16 21:59:24 +03:00
IgorSychev
e624150866 bootstrap version consolidated across all ui based apps. latest stable version is 3.3.7 
bootstrap version was inconsistent in WebMVC app. js was from 3.3.6, but css from 4.0.0-alpha.5. 4.0.0-alpha.5 was introduced in a commit
	Author:		Quique Fernandez <e.fernandez@plainconcepts.com>#mailto:e.fernandez@plainconcepts.com
	Date:		6 months ago (2016-12-29 7:16:26 PM)
	Commit hash:	35ef9740db30e7e50f00b432a54b2597cac73e72
	Parent(s):	f1a662e3e0
 2017-08-16 21:59:24 +03:00
David Britch
666a9c8735 Implemented PKCE in the authentication flow in the Xamarin client. Fixes #214 2017-08-08 15:44:54 +01:00
Ramón Tomás
d289ec00cf Add swagger authorization option in APIs 2017-07-12 12:10:10 +02:00
Christian Arenas
03f23eafa4 Merge branch 'load-testing' into dev 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Identity/Identity.API/Configuration/Config.cs
#	src/Web/WebMVC/appsettings.json
 2017-07-10 14:40:26 +02:00
Christian Arenas
540f7510b9 Create a mvctest client, check when is the environment variable UseLoadTest in MVC project to true 2017-07-10 14:25:03 +02:00
Dexter Valkyrie
24ca050458 Update Startup.cs 
The more general `builder.AddUserSecrets();` is deprecated and will not be available in ASP.NET Core 2.0. You must now qualify it with a type parameter.
 2017-07-08 09:53:43 +01:00
Christian Arenas
06cbab4731 Merge branch 'feature/marketing-details-azure-function' into dev 
# Conflicts:
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/appsettings.json
#	src/Web/WebSPA/AppSettings.cs
#	test/Services/FunctionalTests/Services/Marketing/MarketingScenarios.cs
 2017-07-07 11:56:57 +02:00
Ramón Tomás
f993463856 Implemented service bus for marketing.api locations.api graceperiodProcess payment.api 2017-06-30 08:59:26 +02:00
Eduard Tomas
96c3f5c2bc Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev 
# Conflicts:
#	docker-compose.override.yml
#	src/Web/WebMVC/WebMVC.csproj
#	src/Web/WebMVC/wwwroot/css/shared/components/identity/identity.css
#	src/Web/WebMVC/wwwroot/css/site.min.css
#	src/Web/WebSPA/AppSettings.cs
 2017-06-28 12:20:20 +02:00
Ramón Tomás
a3e63c11aa Merge from eShopOnContainers Dev 2017-06-26 13:51:49 +02:00
Shaun Walker
18b91ee5f1 minor fixes to data and UI customization 2017-06-23 11:49:25 -07:00
Shaun Walker
445101b376 data and UI customization enhancements 2017-06-20 12:54:32 -07:00
Ramón Tomás
e1a007edfa Merge display marketing campaigns feature for SPA app 2017-06-19 16:58:26 +02:00
Ramón Tomás
9fee40e358 Created marketing campaigns view details 2017-06-19 09:46:48 +02:00
Christian Arenas
e80c5efdd3 Add details view and add marketing scope in mvc project and identity config 2017-06-16 01:20:03 +02:00
Ramón Tomás
d6c6582b51 Merge from Master 2017-06-15 08:54:29 +02:00
Christian Arenas
e5a59a1bdf Merge branch 'feature/track-user-location-mongodb' into dev 
# Conflicts:
#	src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
 2017-06-13 11:26:47 +02:00
Christian Arenas
a74c2942fc Add AllowAccessTokensViaBrowser in Identity server, we got an login error from xamarin 2017-06-12 20:19:23 +02:00
Ramón Tomás
4be61abdde Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
Ramón Tomás
4ed070dbed Merge from Dev 2017-06-12 11:06:17 +02:00
Ramón Tomás
0337932697 Merge locations feature branch 2017-06-09 12:43:46 +02:00
Christian Arenas
dfae447f68 Merge branch 'marketingcampaign' into dev 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
 2017-06-09 12:13:21 +02:00
Ramón Tomás
3a10038d71 Fix bug antiforgery decryption issue when deploying in a k8s cluster 
Changed in-memory grant store in idsrv to persist in db
 2017-06-08 17:45:07 +02:00
Ramón Tomás
27fd97b92e Merge from Dev 2017-06-07 17:54:53 +02:00
Ramón Tomás
375780e3a4 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-06-05 21:54:13 +02:00
Ramón Tomás
41101164fa Persist identity grant store to db 
Persist machine Keys to Redis
 2017-06-05 21:54:03 +02:00
Ramón Tomás
bae10b07b8 Created UserLocationModel 
Map Position to Locations APi
Update current user location
 2017-06-01 20:16:19 +02:00
Christian Arenas
665733c40e Add marketing resource to identity 2017-06-01 10:10:37 +02:00
Ramón Tomás
9d5cde2057 #2412-Create Location Microservice 2017-05-30 15:01:58 +02:00
Ramón Tomás
2a64d2245f Merge branch 'dev' into hybrid-flow-xamarin 2017-05-29 08:31:49 +02:00
Ramón Tomás
5482ccdf0d Changed Xamarin app authentication to Hybrid flow 2017-05-29 08:30:33 +02:00
Frank Ibem
da582dac39 Update ProfileService.cs 
Update check for LastName value in GetClaimsFromUser()
 2017-05-26 20:35:56 -05:00
Cesar De la Torre
4410e455e0 Updates to target .NET Core 1.1.2 - Version changes at every .csproj file, dockerfile and the docker-compose.ci.build.yml file for building from the CLI. 2017-05-25 17:01:10 -07:00
igorsych
9e75504690 Newtonsoft.Json and MediatR with fixes of all based on MediatR classes 
also from csproj files excluded direct specification of runtime to make compile happy if on a system we have higher version.
 2017-05-19 18:03:05 +03:00
igorsych
85b61a2bfd Test packages update to the latest version 
Redis and RabbitMQ also updated
Identity server changes reflectiong  ac59db6e16 commit
 2017-05-19 09:02:05 +03:00
igorsych
c5778a04f3 .NET core packages update 2017-05-19 08:11:18 +03:00
Ramón Tomás
87e57b9a44 Merge from Dev 2017-05-18 15:39:31 +02:00
Eduard Tomas
9f7a7cda8a Merge remote-tracking branch 'eShopOnContainers/dev' into dev 
# Conflicts:
#	k8s/deploy.ps1
 2017-05-18 13:01:40 +02:00
Eduard Tomas
7fc63fe196 Messagebus dispatch messages in its own scope 2017-05-11 13:44:38 +02:00
Ramón Tomás
d18b3581a6 Remove hard-coded values from Identity srv configuration 2017-05-10 12:39:11 +02:00
Eduard Tomas
95af2d9a02 Autorefresh on healthchecks with config timeout 2017-05-09 13:54:45 +02:00
Christian Arenas
c5cca8f320 Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
 2017-05-08 13:59:59 +02:00
Eduard Tomas
2af88e74c8 Merge remote-tracking branch 'eShopOnContainers/dev' into dev 
# Conflicts:
#	README.md
#	docs/Enterprise-Application-Patterns-using-XamarinForms.pdf
#	docs/architecting-and-developing-containerized-and-microservice-based-net-applications-ebook-early-draft.pdf
 2017-05-05 10:05:51 +02:00
Eduard Tomas
829f13aff0 Updated healthcheck lib 2017-05-02 10:29:24 +02:00
Ramón Tomás
8a19fad3a5 Created Payment.api microservice 2017-04-28 15:04:38 +02:00
Eduard Tomas
3153bf7654 Added missing IdSvr certificate! 2017-04-25 11:05:15 +02:00
Eduard Tomas
952bd41e39 Merge of eShopOnContainers/master branch into master 
/docs not merged (won't be on this repo).
 2017-04-24 12:25:10 +02:00
Cesar De la Torre
63eed87292 Merge pull request #142 from chlowell/hosting-changes 
Set application discriminators, work around Redis client issue
 2017-04-08 11:15:28 -07:00