AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
498 Commits 2 Branches 0 Tags
a1f41722943826bd031a9ebdd0897fc9041dbb5b
Commit Graph

210 Commits

Author SHA1 Message Date
ashishandroid 9ff366cbeb newcode 2017-01-18 13:38:39 +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
YadavendraSinghYaduvanshi c66f0649f3 Merge branch 'master' into ACVisibilityDone 2017-01-13 19:13:10 +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
gagangoel290 28e9219de5 Update strings.xml 2017-01-13 18:34:46 +05:30
gagangoel290 7ccc313951 Update strings.xml 2017-01-13 18:33:47 +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
YadavendraSinghYaduvanshi 06f2902c18 Merge branch 'master' into ysy_xlatest 2017-01-13 15:54:16 +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 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
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 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
YadavendraSinghYaduvanshi dc4057b97d Merge pull request #39 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StockFacing_MSL_Availability_Change 
Gg stock facing msl availability change
 2017-01-12 13:01:21 +05:30
YadavendraSinghYaduvanshi bb08eb983a Merge branch 'master' into ysy_T2P_upload 2017-01-12 12:38:05 +05:30
yadavendras 412c81ca4b T2P upload data 2017-01-12 12:28:09 +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 740d384df7 Delete PDR_done.png 2017-01-12 10:23:01 +05:30
YadavendraSinghYaduvanshi fb8dce4660 Delete PDR.png 2017-01-12 10:22:48 +05:30
YadavendraSinghYaduvanshi 9b06016641 Delete OHC_done.png 2017-01-12 10:22:36 +05:30
YadavendraSinghYaduvanshi 98afe0e18b Delete OHC.png 2017-01-12 10:22:22 +05:30
YadavendraSinghYaduvanshi cbaba8350b Delete HFD_done.png 2017-01-12 10:22:11 +05:30
YadavendraSinghYaduvanshi 6c33cfd2e8 Delete HFD.png 2017-01-12 10:21:59 +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
Gagan290 fc5e21f9d0 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 16:30:33 +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
YadavendraSinghYaduvanshi 71fe74dc13 Merge branch 'master' into NewVisibilityCode 2017-01-11 12:24:11 +05:30
ashishandroid 35878c7d51 Merge remote-tracking branch 'origin/GeoT' into GeoT 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
 2017-01-11 12:13:08 +05:30
Gagan290 25ec455d2c 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 11:32:59 +05:30