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

355 Commits

Author SHA1 Message Date
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 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 9e55ad63ab Merge branch 'master' into AShishNewBranch 2017-01-12 18:45:26 +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 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 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
Gagan290 3a2fb11823 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:02 +05:30
Gagan290 2b7f9fe882 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:04:42 +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
Gagan290 4a73e327ed 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 10:19:00 +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
YadavendraSinghYaduvanshi ce7e7c0f9e Merge branch 'master' into AC_VisibilityUpload 2017-01-11 17:39:50 +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 8a6056a10b newcode 2017-01-11 16:13:47 +05:30
YadavendraSinghYaduvanshi a5f7b982a9 Merge branch 'master' into NewchangesAC 2017-01-11 13:40:22 +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
ashishandroid ba0ff03370 download 2017-01-11 12:07:32 +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
YadavendraSinghYaduvanshi 2b1c5503f1 Merge branch 'master' into Additional 2017-01-10 18:29:27 +05:30
Gagan290 a18d04ca5f 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-10 18:15:48 +05:30
Gagan290 f6a0e466b4 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-10 17:59:55 +05:30
Gagan290 084cfd7b70 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-10 17:43:29 +05:30