Commit Graph

349 Commits

Author SHA1 Message Date
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
yadavendras 38166663dd Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_upload_txt 2017-01-24 17:28:21 +05:30
YadavendraSinghYaduvanshi 38753c7128 Merge pull request #99 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_NonWorkingReason
//Stock_FacingActivity Changes today
2017-01-24 16:47:31 +05:30
YadavendraSinghYaduvanshi 1f214691e3 Merge pull request #98 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_MainActivity
//Stock_FacingActivity Changes today
2017-01-24 16:47:11 +05:30
YadavendraSinghYaduvanshi 6083578794 Merge pull request #97 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Msl_StockFacing_Categorywise
//Stock_FacingActivity Changes today
2017-01-24 16:46:45 +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
yadavendras f08097ef29 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 13:15:59 +05:30
Gagan290 01b5ff071f //Stock_FacingActivity Changes today 2017-01-24 12:58:25 +05:30
YadavendraSinghYaduvanshi bb62e52be0 Merge pull request #96 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Promo_Category_wise
//Stock_FacingActivity Changes today
2017-01-24 12:23:54 +05:30
yadavendras 87f30fa116 turkish 2017-01-24 12:23:35 +05:30
Gagan290 4edb3666df //Stock_FacingActivity Changes today 2017-01-24 11:49:43 +05:30
gagangoel290 ecfb8e5406 Merge pull request #95 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_CheckOut_Button_Turkish
//Stock_FacingActivity Changes today
2017-01-23 17:36:14 +05:30
Gagan290 7d6b772fa8 //Stock_FacingActivity Changes today 2017-01-23 17:35:59 +05:30
gagangoel290 fcea8443f1 Merge pull request #94 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_DownloadActivity_Title
//Stock_FacingActivity Changes today
2017-01-23 17:22:52 +05:30
Gagan290 13c8c92e1e //Stock_FacingActivity Changes today 2017-01-23 10:33:08 +05:30
YadavendraSinghYaduvanshi aadf026ccb Merge pull request #93 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_language_on_title
now title on main activity changes according to language
2017-01-23 00:17:44 +05:30
Yadavendra 1daef6b79b now title on main activity changes according to language 2017-01-23 00:16:39 +05:30
YadavendraSinghYaduvanshi 848c9da401 Merge pull request #92 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_new
T2P upload data newss
2017-01-21 16:37:42 +05:30
yadavendras 3ab90e2e9a T2P upload data newss 2017-01-21 16:34:50 +05:30
YadavendraSinghYaduvanshi 24f41426ef Merge pull request #91 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_new
T2P upload data newss
2017-01-21 16:18:51 +05:30
YadavendraSinghYaduvanshi 622c21e35e Merge pull request #90 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/finalBYAC
newcode
2017-01-21 16:15:36 +05:30
YadavendraSinghYaduvanshi 85ded617c3 Merge pull request #89 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_SOS
Gg sos
2017-01-21 16:15:02 +05:30
yadavendras cbc99474f5 T2P upload data newss 2017-01-21 16:14:43 +05:30
Gagan290 6c94212f60 //Stock_FacingActivity Changes today 2017-01-21 16:13:58 +05:30
Gagan290 53e769d234 //Stock_FacingActivity Changes today 2017-01-21 16:13:20 +05:30
ashishandroid 5b3b47dc1e newcode 2017-01-21 16:10:23 +05:30
YadavendraSinghYaduvanshi 34df6d9919 Merge pull request #88 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_camera
T2P upload data newss
2017-01-21 14:57:42 +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 5311a76b6d Merge pull request #87 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/saturdayNEWAC
Saturday newac
2017-01-21 13:40:15 +05:30
YadavendraSinghYaduvanshi 12ef109266 Merge branch 'master' into saturdayNEWAC 2017-01-21 13:40:05 +05:30
YadavendraSinghYaduvanshi 25343167d4 Merge pull request #86 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_sos_target_promotion_validation
Gg sos target promotion validation
2017-01-21 13:38:25 +05:30
ashishandroid 2321b02268 newcode 2017-01-21 13:36:56 +05:30
Gagan290 e31005fe18 //Stock_FacingActivity Changes today 2017-01-21 13:36:51 +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
ashishandroid d50198b218 newcode 2017-01-21 11:50:57 +05:30
YadavendraSinghYaduvanshi 9297c97bc8 Merge pull request #85 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/yy_temp
T2P upload data newss
2017-01-21 10:10:42 +05:30
yadavendras d9d0048f4a T2P upload data newss 2017-01-21 10:05:27 +05:30
YadavendraSinghYaduvanshi 4b40c09f24 Merge pull request #84 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_String_File_Upadte
//Stock_FacingActivity Changes today
2017-01-21 09:56:08 +05:30
Gagan290 fd4c806d8d //Stock_FacingActivity Changes today 2017-01-21 09:53:23 +05:30
YadavendraSinghYaduvanshi 4b744740d9 Merge pull request #83 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/yy_temp
T2P upload data newss
2017-01-20 18:19:24 +05:30
YadavendraSinghYaduvanshi 32f6197a10 Merge branch 'master' into yy_temp 2017-01-20 18:18:34 +05:30
ashishandroid bac28fa8b5 newcode 2017-01-20 18:14:52 +05:30
yadavendras 577f59d2f1 T2P upload data newss 2017-01-20 18:14:10 +05:30
YadavendraSinghYaduvanshi f7d800efc6 Merge pull request #82 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Promo_Tick
//Stock_FacingActivity Changes today
2017-01-20 18:01:17 +05:30
Gagan290 48ce56ef85 //Stock_FacingActivity Changes today 2017-01-20 17:59:12 +05:30
YadavendraSinghYaduvanshi c37d73c385 Merge pull request #81 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/gg_login_change
//Stock_FacingActivity Changes today
2017-01-20 16:52:55 +05:30