70 Commits

Author SHA1 Message Date
Shaun Walker
445101b376 data and UI customization enhancements 2017-06-20 12:54:32 -07: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
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
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
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
Eduard Tomas
756cb3dafa Merge branch 'master' into dev
# Conflicts:
#	src/Mobile/eShopOnContainers/eShopOnContainers.Core/eShopOnContainers.Core.csproj
#	src/Services/Catalog/Catalog.API/Startup.cs
#	src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
#	src/Web/WebMVC/Startup.cs
2017-04-05 17:05:14 +02:00
Eduard Tomas
d00588ae37 Updated IdSvr for Xamarin-UWP signin related problems 2017-04-05 15:53:04 +02:00
André Passos
f337898143
upgrade to Identity Server 4 rtm 2017-04-05 09:23:22 -03:00
Eduard Tomas
75629193b7 Xamarin callback client configurable 2017-04-03 10:18:56 +02:00
dsanz
3b4556b9c4 Add comment. 2017-03-30 11:38:10 +02:00
dsanz
ba71b192a9 Fix issue #118 Token lifetime handling 2017-03-29 16:49:48 +02:00
Ramón Tomás
fd0a30d62a Merge from Dev 2017-03-28 16:37:36 +02:00
Ramón Tomás
e08fe895a3 Added MVC and SPA Apps to healthChecker
Added styles to view
2017-03-28 16:16:01 +02:00
Charles Lowell
2f3df2715d Set data protection application discriminators
This prevents cookie confusion when applications are hosted at the same domain and path. For example, under default settings, WebMVC may attempt to decrypt Identity's antiforgery cookie rather than its own.
2017-03-27 09:53:35 -07:00
Cesar De la Torre
313976da80 Fixed bugs related to the Product Update and PriceChangedIntegrationEvent. It was updating only when the price was changing... additional refactoring performed, too. 2017-03-25 14:47:23 -07:00
Eduard Tomas
5b9b92397d Updates to dockerfile / docker-compose for windows containers 2017-03-24 13:15:40 +01:00
Eduard Tomas
45499808b9 Merge remote-tracking branch 'origin/windows-containers-test' into dev 2017-03-24 09:35:57 +01:00
etomas
3ec61e0df6 Tried patch proposed by Sandeep Bansal 2017-03-18 11:13:20 +01:00
etomas
d01a548bbb Merge branch 'master' of https://github.com/dotnet/eShopOnContainers 2017-03-07 18:49:03 +01:00
etomas
39d4280b31 Fix for #81 2017-03-07 18:48:53 +01:00
dsanz
1b6ff6cb20 Fix issue #80 logging out crashes. 2017-03-07 16:50:19 +01:00
etomas
c38e078265 Deleting windows container files as they are not still supported 2017-03-06 15:00:41 +01:00
glennc
4aafa813f5 a couple of quick changes to allow building in the docker-compose.ci.build.yml 2017-03-05 19:55:46 -08:00
Cesar De la Torre
9e2500071a Updates at multiple README.MD pointing to the Wiki setup procedures 2017-03-05 13:49:25 -08:00
etomas
29473b455f Merge branch 'vs2017' 2017-03-03 19:40:55 +01:00