Commit Graph

215 Commits

Author SHA1 Message Date
gagangoel290 d8db348cdf Update StoreWisePerformanceActivity.java 2017-01-13 18:31:21 +05:30
gagangoel290 e79a09506d Update Stock_FacingActivity.java 2017-01-13 18:30:48 +05:30
gagangoel290 17974ee540 Update PromoComplianceActivity.java 2017-01-13 18:30:01 +05:30
gagangoel290 af08ab63ff Update MSL_AvailabilityActivity.java 2017-01-13 18:29:24 +05:30
gagangoel290 341fe12479 Update CategoryWisePerformanceActivity.java 2017-01-13 18:28:43 +05:30
YadavendraSinghYaduvanshi 55d85dada4 Merge pull request #52 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ACVisibilityDone
Ac visibility done
2017-01-13 18:24:48 +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 3c7ab5426a Merge pull request #51 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_update_checkout
T2P upload data newss
2017-01-13 18:10:00 +05:30
yadavendras 2b8e77d6e9 T2P upload data newss 2017-01-13 18:05:31 +05:30
YadavendraSinghYaduvanshi c6f068b799 Merge pull request #50 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_latest_setting
T2P upload data newss
2017-01-13 18:03:20 +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
gagangoel290 adc58aa2d4 Update StoreWisePerformanceActivity.java 2017-01-13 17:06:57 +05:30
gagangoel290 15f98f76d4 Update Stock_FacingActivity.java 2017-01-13 17:05:58 +05:30
gagangoel290 d9dda1b0a2 Update PromoComplianceActivity.java 2017-01-13 17:04:22 +05:30
ashishandroid 3a127934cc newcode 2017-01-13 17:03:18 +05:30
gagangoel290 c209f800d8 Update MSL_AvailabilityActivity.java 2017-01-13 17:00:30 +05:30
gagangoel290 20707a2c97 Update CategoryWisePerformanceActivity.java 2017-01-13 16:57:58 +05:30
YadavendraSinghYaduvanshi 14931cde7b Merge pull request #47 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_MappingPlanogram_DialogDisplay
Gg mapping planogram dialog display
2017-01-13 16:02:12 +05:30
YadavendraSinghYaduvanshi cb53b7acf5 Merge branch 'master' into GG_MappingPlanogram_DialogDisplay 2017-01-13 16:02:04 +05:30
YadavendraSinghYaduvanshi 8f9c86d368 Merge pull request #46 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_latest_setting
T2P upload data newss
2017-01-13 15:58:15 +05:30
yadavendras e4d980a5f2 T2P upload data newss 2017-01-13 15:55:02 +05:30
YadavendraSinghYaduvanshi 14ab8a3de2 Merge pull request #45 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_xlatest
T2P upload data newss
2017-01-13 15:55:00 +05:30
YadavendraSinghYaduvanshi 06f2902c18 Merge branch 'master' into ysy_xlatest 2017-01-13 15:54:16 +05:30
Gagan290 c10d401354 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 15:49:51 +05:30
Gagan290 ce531be3df 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 15:10:38 +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
Gagan290 e4a80d6e1b 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 10:19:25 +05:30
Gagan290 af4271360a 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 10:07:07 +05:30
yadavendras 6d47719735 T2P upload data newss 2017-01-12 19:37:08 +05:30
YadavendraSinghYaduvanshi 18c68a6271 Merge pull request #44 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_total
T2P upload data newss
2017-01-12 19:09:13 +05:30
YadavendraSinghYaduvanshi 264814cbd2 Merge branch 'master' into ysy_total 2017-01-12 19:09:06 +05:30
yadavendras d3606ada7b T2P upload data newss 2017-01-12 19:05:45 +05:30
YadavendraSinghYaduvanshi b8765256a6 Update string.xml 2017-01-12 18:54:13 +05:30
YadavendraSinghYaduvanshi dfbc916266 Update DailyDataMenuActivity.java 2017-01-12 18:51:29 +05:30
YadavendraSinghYaduvanshi 5a02ac0d6b Merge pull request #43 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/AShishNewBranch
newcode
2017-01-12 18:45:33 +05:30
YadavendraSinghYaduvanshi 9e55ad63ab Merge branch 'master' into AShishNewBranch 2017-01-12 18:45:26 +05:30
YadavendraSinghYaduvanshi 5f9ca8db6e Merge pull request #42 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_upload_new
T2P upload data news
2017-01-12 18:41:17 +05:30
YadavendraSinghYaduvanshi 52e245fd8e Merge branch 'master' into ysy_upload_new 2017-01-12 18:41:10 +05:30
ashishandroid 88eff88838 newcode 2017-01-12 18:40:18 +05:30
yadavendras 5db229d980 T2P upload data news 2017-01-12 18:29:02 +05:30
YadavendraSinghYaduvanshi 4c243ab49b Merge pull request #41 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_upload_new
T2P upload data new
2017-01-12 17:55: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
YadavendraSinghYaduvanshi 53d0eac19a Merge pull request #40 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_MappingPlanogram
Gg mapping planogram
2017-01-12 17:48:15 +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 11455f7702 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 13:22:38 +05:30
Gagan290 046b361e80 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 13:21:37 +05:30