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

375 Commits

Author SHA1 Message Date
dsanz
a65e9c01eb Add Healthchecks to Locations.API and MArketing.API 2017-07-04 13:51:05 +02:00
Ramón Tomás
525040b9b6 Created Azure functions for details campaign 
Adapt MVC app to azure function details campaign
Adapt SPA app to azure function details campaign
 2017-06-30 16:31:22 +02:00
Eduard Tomas
d65a112535 References updated to preview-2 
code adjustements to work with preview-2
 2017-06-29 18:36:57 +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
Christian Arenas
b28c650e06 Remove userId setting from xamarin app and remove userId parameter from GetCampaignsByUserId in Campaign API 2017-06-26 18:29:51 +02:00
Shaun Walker
a6cef8009c replace main banner in SPA app 2017-06-23 12:04:40 -07:00
Shaun Walker
632c023a3f strip quotes, fix image transparency, format price and amount 2017-06-22 17:26:57 -07:00
Eduard Tomas
0a1f14f1f1 WebSPA nuget update 2017-06-22 16:19:54 +02:00
Eduard Tomas
56902a5549 [WIP] Projects & Dockerfile migrated to 2.0 
Lots of things to address yet, because nuget packages are still on 1.1
 2017-06-21 19:03:48 +02:00
Shaun Walker
445101b376 data and UI customization enhancements 2017-06-20 12:54:32 -07:00
Ramón Tomás
847f145bc2 Update spa marketing campaign view 2017-06-19 10:21:29 +02:00
Ramón Tomás
9fee40e358 Created marketing campaigns view details 2017-06-19 09:46:48 +02:00
Ramón Tomás
249c7a5105 Display marketing campaign details SPA 2017-06-19 09:46:19 +02:00
Ramón Tomás
a9c185a41a Updated number of products in catalog stock 
Orders list ordered
Refresh orders list periodically
Fix bug SPA basket not dropped after creating order
 2017-06-14 16:38:27 +02:00
Ramón Tomás
4be61abdde Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
Ramón Tomás
d018d00b68 Update settings 2017-06-09 12:33:59 +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
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
Ramón Tomás
8c2af8c048 Clean Basket event is launched once basket is converted to order and before starting creating order. 
Change grace period time  to 1 minute
Remove unecessary clean basket methods on client
 2017-05-24 16:09:03 +02: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
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
Ramón Tomás
afc247da67 Change SPA app to call basket for order checkout 2017-05-16 09:23:35 +02:00
Christian Arenas
9ae4d93a54 Add Order Description field 2017-05-11 16:04:35 +02:00
Ramón Tomás
83a33bc8fd Merge from Dev 2017-05-10 15:07:54 +02:00
Ramón Tomás
afd3fe2fe5 Fix issue SPA HealthCheck Urls 2017-05-10 15:01:02 +02:00
Eduard Tomas
c33a6ecdf0 Commenting non-wanted task in csproj 2017-05-09 21:04:04 +02:00
Eduard Tomas
37cef95fec Use good endpoints for healthcheck 2017-05-09 16:59:23 +02:00
Eduard Tomas
95af2d9a02 Autorefresh on healthchecks with config timeout 2017-05-09 13:54:45 +02:00
Cesar De la Torre
3917701e7a eBook renamed 2017-05-08 12:26:07 -07:00
Cesar De la Torre
417a795f17 Updated the Microservices eBook 2017-05-08 12:05:33 -07:00
Ramón Tomás
fa048c22c1 Merge from Dev 2017-05-04 11:57:49 +02:00
Eduard Tomas
829f13aff0 Updated healthcheck lib 2017-05-02 10:29:24 +02:00
RamonTC
9c6b54a7fc Merge pull request #167 from andrelmp/dev 
Upgrade to angular-cli and Angular 4
 2017-04-25 10:29:31 +02:00
Ramón Tomás
6c6532c0f4 Merge from Dev 2017-04-21 15:46:15 +02:00
Eduard Tomas
101fc58418 Solves error building SPA on linux host due to case error 2017-04-19 15:45:32 +02:00
Eduard Tomas
6ea2e1ed8b Merge branch 'reviews/uzorrilla' into dev 
# Conflicts:
#	src/Services/Basket/Basket.API/Model/RedisBasketRepository.cs
 2017-04-18 15:34:31 +02:00
André Passos
676ba796ae
Changes to make SPA compatible with angular-cli AOT 
Signed-off-by: André Passos <andre-ap2@hotmail.com>
 2017-04-17 10:00:51 -03:00
André Passos
fe1216d5d8
fix controller routes 
Signed-off-by: André Passos <andre-ap2@hotmail.com>
 2017-04-17 09:11:43 -03:00
Andre Passos
db1fa9fd5c update to angular-cli and angular 4 2017-04-13 13:06:22 -03:00
Ramón Tomás
f48a503885 Fix issue error when building the SPA app from the CLI #164 2017-04-13 10:51:19 +02:00
dsanz
97d0283db1 Merge branch 'master' into dev 
# Conflicts:
#	src/Web/WebMVC/Views/Shared/Components/CartList/Default.cshtml
#	src/Web/WebSPA/Client/modules/basket/basket.component.html
 2017-04-13 09:54:12 +02:00
Charles Lowell
1eae6a9ea2 Merge branch 'master' 2017-04-11 12:20:39 -07:00
Cesar De la Torre
3ef6846fe0 Minor change in label 2017-04-08 12:06:51 -07:00
Cesar De la Torre
345e275a0e Minor change in label 2017-04-08 12:05:25 -07: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
97d8e80294 SPA checks for its dependences on healthcheck 2017-04-07 10:49:28 +02:00
Ramón Tomás
6803781bf8 Merge from Dev 2017-04-05 11:12:49 +02:00
Ramón Tomás
00f7226f30 Rename OrderingIntegrationEvent service methods 
Remove clean basket instruction from SPA client
 2017-04-05 11:07:26 +02:00
Eduard Tomas
202882aa7c Fixed healthcheck errors 2017-03-31 12:47:56 +02:00