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

415 Commits

Author SHA1 Message Date
Gagan290 303cf83f8c //language change 2017-02-23 15:36:18 +05:30
ashishandroid 5836b86f44 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV2 into newdata 2017-02-23 10:12:09 +05:30
ashishandroid e119cb95a0 review 2017-02-23 10:11:43 +05:30
ashishandroid be2f901986 review 2017-02-23 10:07:18 +05:30
Gagan290 74b4aa7589 //Add language method in stock facing planogram 2017-02-23 09:40:37 +05:30
Gagan290 4eafe3c14d //Add language method in stock facing planogram 2017-02-22 16:36:13 +05:30
ashishandroid f60a00ac09 review 2017-02-22 15:50:44 +05:30
YadavendraSinghYaduvanshi 571f245ab3 Merge pull request #13 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StockFacing_Planogram_Sort 
//PromoCompliance Default Toggle Changes
 2017-02-22 15:30:26 +05:30
YadavendraSinghYaduvanshi 812065fce4 Merge branch 'master' into CategoryPictureNewAC 2017-02-22 15:29:14 +05:30
ashishandroid 22743480f6 review 2017-02-22 15:13:31 +05:30
Gagan290 bb2dfe7594 //PromoCompliance Default Toggle Changes 2017-02-22 14:00:46 +05:30
YadavendraSinghYaduvanshi 3073fa2676 Merge pull request #11 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StockFacing_Planogram_22-02-2017 
//PromoCompliance Default Toggle Changes
 2017-02-22 12:27:31 +05:30
Gagan290 ca1d29bca5 //PromoCompliance Default Toggle Changes 2017-02-22 12:19:42 +05:30
YadavendraSinghYaduvanshi d786092dc8 Update GSKOrangeDB.java 2017-02-15 11:58:29 +05:30
YadavendraSinghYaduvanshi c5040bad9f Merge branch 'master' into GG_Planogram_New_Changes 2017-02-15 11:47:26 +05:30
YadavendraSinghYaduvanshi 7cbc3896a1 Update CommonString.java 2017-02-15 10:46:05 +05:30
YadavendraSinghYaduvanshi 64fb3f63f8 Merge branch 'master' into CodeFire22 2017-02-15 10:44:27 +05:30
ashishandroid 6799680555 review 2017-02-14 12:35:20 +05:30
ashishandroid 02d0ad3e82 review 2017-02-13 16:18:17 +05:30
ashishandroid ebdacde272 review 2017-02-13 15:59:21 +05:30
Gagan290 6eb5517834 //PromoCompliance Default Toggle Changes 2017-02-10 17:55:24 +05:30
ashishandroid 0207a8ce01 review 2017-02-09 18:09:13 +05:30
ashishandroid 4f0884dac7 review 2017-02-09 13:21:26 +05:30
Gagan290 cd15dffabf //PromoCompliance Default Toggle Changes 2017-02-09 12:33:24 +05:30
Gagan290 1f62100334 //PromoCompliance Default Toggle Changes 2017-02-09 12:12:12 +05:30
ashishandroid ab49b6046c review 2017-02-08 17:07:00 +05:30
Gagan290 128eae193d //PromoCompliance Default Toggle Changes 2017-02-07 16:55:53 +05:30
Gagan290 734ddee591 //PromoCompliance Default Toggle Changes 2017-02-03 18:05:52 +05:30
YadavendraSinghYaduvanshi 3c901931ec Merge branch 'master' into GG_StockFacing_PlanogramTracker 2017-02-03 11:42:06 +05:30
Gagan290 d4ca1184cf //PromoCompliance Default Toggle Changes 2017-02-03 11:01:17 +05:30
YadavendraSinghYaduvanshi 4e34174194 Update GSKOrangeDB.java 2017-02-02 16:09:15 +05:30
ashishandroid d7172316ea review 2017-02-02 16:00:08 +05:30
ashishandroid 4bbc524824 review 2017-02-02 15:52:49 +05:30
ashishandroid 8fa42b16d6 review 2017-02-02 15:34:17 +05:30
Gagan290 5fca35c584 //PromoCompliance Default Toggle Changes 2017-02-02 12:29:55 +05:30
YadavendraSinghYaduvanshi 33f6dbb65f Merge branch 'master' into GG_T2P_Add_Camera 2017-02-01 13:43:16 +05:30
yadavendras 033f55adbc Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk 
# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
 2017-02-01 12:22:19 +05:30
Gagan290 f86f832b61 //Stock_FacingActivity Changes today 2017-01-31 18:01:49 +05:30
ashishchauhan009 c0d24675e5 Merge pull request #102 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ac_settings 
newcode
 2017-01-25 19:14:05 +05:30
ashishandroid d71e92dc02 newcode 2017-01-25 19:01:41 +05:30
ashishchauhan009 68b1e9e756 Merge branch 'master' into StoreLISTAC 2017-01-25 18:18:45 +05:30
ashishandroid e07c6bc10e newcode 2017-01-25 18:16:14 +05:30
ashishandroid 56b5a42ff1 newcode 2017-01-25 11:24:41 +05:30
ashishandroid 5a00e4c298 newcode 2017-01-25 10:57:49 +05:30
yadavendras 16bdac6be1 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk 
# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
 2017-01-25 10:47:58 +05:30
yadavendras c5efee08d6 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk 
# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
 2017-01-24 17:28:56 +05:30
Gagan290 99b7c5788f //Stock_FacingActivity Changes today 2017-01-24 16:46:05 +05:30
Gagan290 423d80fd63 //Stock_FacingActivity Changes today 2017-01-24 16:31:34 +05:30
Gagan290 01b5ff071f //Stock_FacingActivity Changes today 2017-01-24 12:58:25 +05:30
Gagan290 4edb3666df //Stock_FacingActivity Changes today 2017-01-24 11:49:43 +05:30