Commit Graph

101 Commits

Author SHA1 Message Date
ashishandroid ab49b6046c review 2017-02-08 17:07:00 +05:30
ashishandroid 4bbc524824 review 2017-02-02 15:52:49 +05:30
Gagan290 f86f832b61 //Stock_FacingActivity Changes today 2017-01-31 18:01:49 +05:30
Gagan290 13c8c92e1e //Stock_FacingActivity Changes today 2017-01-23 10:33:08 +05:30
ashishandroid 5b3b47dc1e newcode 2017-01-21 16:10:23 +05:30
YadavendraSinghYaduvanshi 12ef109266 Merge branch 'master' into saturdayNEWAC 2017-01-21 13:40:05 +05:30
ashishandroid 2321b02268 newcode 2017-01-21 13:36:56 +05:30
Gagan290 2b7cfd7f72 //Stock_FacingActivity Changes today 2017-01-21 13:34:45 +05:30
ashishandroid b8a10b5699 newcode 2017-01-21 12:37:10 +05:30
ashishandroid bac28fa8b5 newcode 2017-01-20 18:14:52 +05:30
YadavendraSinghYaduvanshi f7d800efc6 Merge pull request #82 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Promo_Tick
//Stock_FacingActivity Changes today
2017-01-20 18:01:17 +05:30
Gagan290 48ce56ef85 //Stock_FacingActivity Changes today 2017-01-20 17:59:12 +05:30
gagangoel290 6ef51445f2 Merge branch 'master' into NewDialogChangeAC 2017-01-20 16:05:04 +05:30
Gagan290 04abc52cf0 //Stock_FacingActivity Changes today 2017-01-20 16:02:47 +05:30
ashishandroid 783a8ed103 newcode 2017-01-20 13:44:46 +05:30
YadavendraSinghYaduvanshi 34f34be155 Merge pull request #70 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/nonworking
newcode
2017-01-19 12:22:32 +05:30
ashishandroid c9f43af6d3 newcode 2017-01-18 18:06:22 +05:30
YadavendraSinghYaduvanshi 7d546d79db Merge branch 'master' into JioAC 2017-01-18 17:33:03 +05:30
ashishandroid f4a8b065ea newcode 2017-01-18 15:40:45 +05:30
YadavendraSinghYaduvanshi ff799a122f Merge branch 'master' into ysy_t2p_valid 2017-01-18 15:27:50 +05:30
yadavendras 5eb8b67f24 T2P upload data newss 2017-01-18 15:24:21 +05:30
Gagan290 37aa966894 //Stock_FacingActivity Changes today 2017-01-18 15:09:35 +05:30
YadavendraSinghYaduvanshi dfbc80a229 Merge branch 'master' into AshishDataImage 2017-01-18 09:54:14 +05:30
ashishandroid 370fc8127a newcode 2017-01-17 17:58:09 +05:30
YadavendraSinghYaduvanshi 876088b79e Merge pull request #62 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_service_setting
T2P upload data newss
2017-01-17 13:53:15 +05:30
yadavendras 2f684cf426 T2P upload data newss 2017-01-17 13:49:27 +05:30
ashishandroid 16f123ca21 newcode 2017-01-17 13:42:20 +05:30
YadavendraSinghYaduvanshi 9722cd7bac Merge branch 'master' into ysy_checkout_new 2017-01-13 19:19:02 +05:30
yadavendras e6ec42a521 T2P upload data newss 2017-01-13 19:12:14 +05:30
ashishandroid eb891ffc70 newcode 2017-01-13 19:09:40 +05:30
YadavendraSinghYaduvanshi 6e265aa501 Merge branch 'master' into ACVisibilityDone 2017-01-13 18:24:36 +05:30
ashishandroid 7c75154abf newcode 2017-01-13 18:15:22 +05:30
YadavendraSinghYaduvanshi 591cccc5b9 Merge branch 'master' into ysy_latest_setting 2017-01-13 18:03:13 +05:30
ashishandroid fa9d3a1136 newcode 2017-01-13 18:01:17 +05:30
yadavendras 385bd0a36d T2P upload data newss 2017-01-13 17:58:49 +05:30
ashishandroid 3a127934cc newcode 2017-01-13 17:03:18 +05:30
YadavendraSinghYaduvanshi cb53b7acf5 Merge branch 'master' into GG_MappingPlanogram_DialogDisplay 2017-01-13 16:02:04 +05:30
Gagan290 a9f187943c Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-13 12:12:46 +05:30
yadavendras 6d47719735 T2P upload data newss 2017-01-12 19:37:08 +05:30
YadavendraSinghYaduvanshi 9e55ad63ab Merge branch 'master' into AShishNewBranch 2017-01-12 18:45:26 +05:30
ashishandroid 88eff88838 newcode 2017-01-12 18:40:18 +05:30
YadavendraSinghYaduvanshi 1f34b4fd91 Merge branch 'master' into ysy_upload_new 2017-01-12 17:55:00 +05:30
yadavendras 96b2ff2eb6 T2P upload data new 2017-01-12 17:49:12 +05:30
Gagan290 1c48f2f8ad Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-12 17:04:24 +05:30
Gagan290 9384adeec3 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-12 12:04:18 +05:30
YadavendraSinghYaduvanshi ba9b1f004c Merge branch 'master' into GG_StorePerformance 2017-01-12 10:07:23 +05:30
Gagan290 5b080446e6 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-11 18:04:08 +05:30
yadavendras ef976db07c T2P insert update complete 2017-01-11 16:49:36 +05:30
ashishandroid 82ec3c7203 newcode 2017-01-11 12:52:10 +05:30
YadavendraSinghYaduvanshi f63e339d5a Merge pull request #31 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Toggle_background
Gg toggle background
2017-01-11 12:25:51 +05:30