Commit Graph

98 Commits

Author SHA1 Message Date
yadavendras a1f4172294 arabic UAE 2017-05-19 18:45:07 +05:30
gagangoel290 1b956ecc89 GG T2p String change 2017-05-12 11:46:17 +05:30
Yadavendra ae0a6e2eaf sku availibility 2017-04-29 15:45:16 +05:30
Gagan290 bcc2fee32b msl_availability and additional 2017-03-27 17:47:44 +05:30
Gagan290 6184b20582 Msl_Availability_StockFacing_New Merge into Main Project 2017-03-24 13:45:05 +05:30
Gagan290 343a374e5a Msl_Availability_New 2017-03-17 11:11:15 +05:30
Gagan290 72c4d0ab2b camera handle for arabic language 2017-03-09 17:47:32 +05:30
Gagan290 7e5ced4f08 camera handle for arabic language 2017-03-06 12:25:47 +05:30
Gagan290 7b6f2179ee camera handle for arabic language 2017-02-24 15:08:29 +05:30
Gagan290 303cf83f8c //language change 2017-02-23 15:36:18 +05:30
Gagan290 74b4aa7589 //Add language method in stock facing planogram 2017-02-23 09:40:37 +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
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 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
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
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
ashishandroid 4bbc524824 review 2017-02-02 15:52:49 +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
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
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
yadavendras cbc99474f5 T2P upload data newss 2017-01-21 16:14:43 +05:30
YadavendraSinghYaduvanshi e286234be1 Merge branch 'master' into ysy_camera 2017-01-21 14:57:38 +05:30
yadavendras f42be9e473 T2P upload data newss 2017-01-21 14:23:49 +05:30
YadavendraSinghYaduvanshi 12ef109266 Merge branch 'master' into saturdayNEWAC 2017-01-21 13:40:05 +05:30
ashishandroid 2321b02268 newcode 2017-01-21 13:36:56 +05:30
Gagan290 2b7cfd7f72 //Stock_FacingActivity Changes today 2017-01-21 13:34:45 +05:30
ashishandroid b8a10b5699 newcode 2017-01-21 12:37:10 +05:30
Gagan290 fd4c806d8d //Stock_FacingActivity Changes today 2017-01-21 09:53:23 +05:30
ashishandroid bac28fa8b5 newcode 2017-01-20 18:14:52 +05:30
YadavendraSinghYaduvanshi 82fc24d05d Merge branch 'master' into gg_login_change 2017-01-20 16:52:49 +05:30
Gagan290 2bc6d83704 //Stock_FacingActivity Changes today 2017-01-20 16:47:44 +05:30
gagangoel290 6ef51445f2 Merge branch 'master' into NewDialogChangeAC 2017-01-20 16:05:04 +05:30
ashishandroid 0d28ef8f8d newcode 2017-01-20 15:56:53 +05:30
ashishandroid fb0718e5e2 newcode 2017-01-20 15:52:16 +05:30
ashishandroid 783a8ed103 newcode 2017-01-20 13:44:46 +05:30
YadavendraSinghYaduvanshi 5677d6df11 Merge branch 'master' into YSY_t2p_updated 2017-01-20 12:55:37 +05:30
yadavendras 1bebe6d0f9 T2P upload data newss 2017-01-20 12:50:56 +05:30
Gagan290 3523124716 //Stock_FacingActivity Changes today 2017-01-20 11:36:41 +05:30
YadavendraSinghYaduvanshi 7d546d79db Merge branch 'master' into JioAC 2017-01-18 17:33:03 +05:30
ashishandroid f4a8b065ea newcode 2017-01-18 15:40:45 +05:30
Gagan290 37aa966894 //Stock_FacingActivity Changes today 2017-01-18 15:09:35 +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