Commit Graph

210 Commits

Author SHA1 Message Date
Gagan290 f86f832b61 //Stock_FacingActivity Changes today 2017-01-31 18:01:49 +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
Gagan290 4edb3666df //Stock_FacingActivity Changes today 2017-01-24 11:49:43 +05:30
ashishandroid f325d1d385 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into NewCODE 2017-01-23 17:38:20 +05:30
ashishandroid 7df66f1d5f newcode 2017-01-23 17:37:48 +05:30
Gagan290 7d6b772fa8 //Stock_FacingActivity Changes today 2017-01-23 17:35:59 +05:30
Gagan290 13c8c92e1e //Stock_FacingActivity Changes today 2017-01-23 10:33:08 +05:30
Yadavendra 1daef6b79b now title on main activity changes according to language 2017-01-23 00:16:39 +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
yadavendras cbc99474f5 T2P upload data newss 2017-01-21 16:14:43 +05:30
ashishandroid 5b3b47dc1e newcode 2017-01-21 16:10:23 +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 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 82fc24d05d Merge branch 'master' into gg_login_change 2017-01-20 16:52:49 +05:30
ashishandroid 648a3c21d2 newcode 2017-01-20 16:48:35 +05:30
Gagan290 2bc6d83704 //Stock_FacingActivity Changes today 2017-01-20 16:47:44 +05:30
ashishandroid 5bdd502d19 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into NewDialogChangeAC 2017-01-20 16:37:26 +05:30
ashishandroid 405d1c009c Merge remote-tracking branch 'origin/NewDialogChangeAC' into NewDialogChangeAC 2017-01-20 16:36:50 +05:30
ashishandroid 3ac64149a9 newcode 2017-01-20 16:35:24 +05:30
gagangoel290 c13afe8b50 Update string.xml 2017-01-20 16:09:38 +05:30
gagangoel290 6ef51445f2 Merge branch 'master' into NewDialogChangeAC 2017-01-20 16:05:04 +05:30
Gagan290 04abc52cf0 //Stock_FacingActivity Changes today 2017-01-20 16:02:47 +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 89d5fe28c2 Merge branch 'master' into ysy_temp_f 2017-01-19 15:08:53 +05:30
yadavendras 92cf9904a8 T2P upload data newss 2017-01-19 15:03:32 +05:30
Gagan290 bc49d570b6 //Stock_FacingActivity Changes today 2017-01-19 12:43:54 +05:30
YadavendraSinghYaduvanshi 34f34be155 Merge pull request #70 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/nonworking
newcode
2017-01-19 12:22:32 +05:30
ashishandroid c9f43af6d3 newcode 2017-01-18 18:06:22 +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
YadavendraSinghYaduvanshi ff799a122f Merge branch 'master' into ysy_t2p_valid 2017-01-18 15:27:50 +05:30
yadavendras 5eb8b67f24 T2P upload data newss 2017-01-18 15:24:21 +05:30
YadavendraSinghYaduvanshi f544705714 Merge pull request #65 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/AShishDONE
newcode
2017-01-18 15:20:48 +05:30
Gagan290 37aa966894 //Stock_FacingActivity Changes today 2017-01-18 15:09:35 +05:30