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

52 Commits

Author SHA1 Message Date
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
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 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
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 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
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
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
ashishandroid a95bf5cddd 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-09 18:13:27 +05:30
Gagan290 5d6f153018 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-09 18:11:20 +05:30
YadavendraSinghYaduvanshi abc62c526d Merge branch 'master' into T2P_save_Y 2017-01-09 15:57:17 +05:30
yadavendras 06ee7edb6f upload module added 2017-01-09 15:50:47 +05:30
Gagan290 e2d02196c8 Icons 2017-01-09 13:30:29 +05:30
Yadavendra 8d591f86d4 T2p whole data done 2017-01-08 22:54:52 +05:30
YadavendraSinghYaduvanshi c38968aadf Merge branch 'master' into Gagan 2017-01-07 18:21:01 +05:30
ashishandroid 1260f47b0d 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-07 09:42:10 +05:30
Gagan290 04875b6fc8 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
 2017-01-06 17:52:25 +05:30
YadavendraSinghYaduvanshi 1e2d4973b4 Merge branch 'master' into GeoT 2017-01-06 11:59:56 +05:30
ashishandroid 83e6be733b 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-06 11:42:14 +05:30
Gagan290 25008a1aef Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
 2017-01-05 15:26:15 +05:30
Gagan290 54072e8e94 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
 2017-01-05 15:14:06 +05:30
YadavendraSinghYaduvanshi 4834af86d6 Merge branch 'master' into GeoT 2017-01-05 11:59:31 +05:30
ashishandroid fb8a08a5cb 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-05 10:52:09 +05:30
YadavendraSinghYaduvanshi e23089cfe2 Merge pull request #15 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Category_G 
Category g
 2017-01-05 10:40:00 +05:30
Gagan290 2f84b3ecea Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
 2017-01-05 09:58:16 +05:30
YadavendraSinghYaduvanshi f4ff9e0a8e Merge branch 'master' into CategoryDownload 2017-01-05 09:55:42 +05:30
YadavendraSinghYaduvanshi a7e9190591 Merge pull request #13 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Category_G 
Category g
 2017-01-05 09:51:53 +05:30
yadavendras 5a8151ecd4 new download branch 2017-01-05 09:46:53 +05:30
Gagan290 e0ed5b560e Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
 2017-01-04 18:09:32 +05:30
ashishandroid 95310c3375 dbclass1 2016-12-30 16:47:05 +05:30
YadavendraSinghYaduvanshi 0d750227f7 Merge branch 'master' into GeoT 2016-12-30 14:56:33 +05:30
ashishandroid 7f24e8550f dbclass1 2016-12-30 13:25:54 +05:30
Gagan290 5641ee2d6a Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
 2016-12-30 09:42:54 +05:30
ashishandroid efa800ad43 dbclass1 2016-12-29 18:01:37 +05:30
Gagan290 b39076fcf2 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
 2016-12-29 12:35:18 +05:30
Gagan290 1a810172d5 Change 2016-12-29 10:13:12 +05:30