Commit Graph

414 Commits

Author SHA1 Message Date
gagangoel290 0d4b17efd5 Merge pull request #18 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StockFacing_No_Camera_Icon
//language change
2017-02-23 16:31:32 +05:30
Gagan290 a9b0d63e8f //language change 2017-02-23 16:32:13 +05:30
Gagan290 889cf2c3d4 //language change 2017-02-23 16:14:33 +05:30
gagangoel290 e6a8db50fd Merge pull request #17 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StockFacing_No_Camera_Icon
//language change
2017-02-23 16:14:17 +05:30
gagangoel290 8b01a47560 Merge pull request #16 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Language_Changes_23-02-2017
//language change
2017-02-23 15:43:48 +05:30
Gagan290 303cf83f8c //language change 2017-02-23 15:36:18 +05:30
YadavendraSinghYaduvanshi c6bfab9c6e Merge pull request #15 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StockFacing_No_camera_image
//Add language method in stock facing planogram
2017-02-23 09:46:46 +05:30
YadavendraSinghYaduvanshi a0767ecb26 Merge pull request #14 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StockFacing_Planogram_Add_changes
//Add language method in stock facing planogram
2017-02-23 09:46:17 +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
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 7216d0f557 Merge pull request #12 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/CategoryPictureNewAC
Category picture new ac
2017-02-22 15:29:20 +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
ashishandroid 8dbb24f0a1 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV2 into codefire33 2017-02-15 11:59:53 +05:30
YadavendraSinghYaduvanshi d786092dc8 Update GSKOrangeDB.java 2017-02-15 11:58:29 +05:30
ashishandroid 913128a5d3 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV2 into codefire33 2017-02-15 11:48:09 +05:30
YadavendraSinghYaduvanshi 5f6e8f4703 Merge pull request #10 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Planogram_New_Changes
//PromoCompliance Default Toggle Changes
2017-02-15 11:47:31 +05:30
YadavendraSinghYaduvanshi c5040bad9f Merge branch 'master' into GG_Planogram_New_Changes 2017-02-15 11:47:26 +05:30
ashishandroid e9f37156a8 review 2017-02-15 11:43:06 +05:30
YadavendraSinghYaduvanshi 7cbc3896a1 Update CommonString.java 2017-02-15 10:46:05 +05:30
YadavendraSinghYaduvanshi 79b43f1564 Merge pull request #9 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/CodeFire22
Code fire22
2017-02-15 10:44:36 +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
YadavendraSinghYaduvanshi 2fe59a1f27 Merge pull request #7 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Planogram_Insert_Upload_PreviousUpload
//PromoCompliance Default Toggle Changes
2017-02-09 13:13:01 +05:30
Gagan290 cd15dffabf //PromoCompliance Default Toggle Changes 2017-02-09 12:33:24 +05:30
YadavendraSinghYaduvanshi 95e34ded2b Merge pull request #6 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Planogram_Insert_Upload
Gg planogram insert upload
2017-02-09 12:13:53 +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 15b06c26c7 Merge pull request #5 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StockFacing_PlanogramTracker
//PromoCompliance Default Toggle Changes
2017-02-03 11:42:11 +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
YadavendraSinghYaduvanshi 0131cf0c97 Merge pull request #4 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/AKCNewchangesME
review
2017-02-02 16:06:19 +05:30
ashishandroid d7172316ea review 2017-02-02 16:00:08 +05:30
YadavendraSinghYaduvanshi e526b78c2b Merge pull request #3 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/additionalchangessss
Additionalchangessss
2017-02-02 15:56:38 +05:30
ashishandroid 4bbc524824 review 2017-02-02 15:52:49 +05:30
ashishandroid 8fa42b16d6 review 2017-02-02 15:34:17 +05:30
YadavendraSinghYaduvanshi c5e81a0fec Merge pull request #2 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_PromoCompliance_Default_Toggle_False_changes
//PromoCompliance Default Toggle Changes
2017-02-02 12:42:51 +05:30
Gagan290 5fca35c584 //PromoCompliance Default Toggle Changes 2017-02-02 12:29:55 +05:30