Commit Graph

591 Commits

Author SHA1 Message Date
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
YadavendraSinghYaduvanshi cbb90c982c Merge pull request #1 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_T2P_Add_Camera
//Stock_FacingActivity Changes today
2017-02-01 13:43:24 +05:30
YadavendraSinghYaduvanshi 33f6dbb65f Merge branch 'master' into GG_T2P_Add_Camera 2017-02-01 13:43:16 +05:30
YadavendraSinghYaduvanshi 6fad37af80 Merge pull request #103 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_nonworking_update
Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKE…
2017-02-01 12:30:15 +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 53c628b36d Merge pull request #101 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/StoreLISTAC
Store listac
2017-01-25 18:18:53 +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
YadavendraSinghYaduvanshi b7356ecf50 Merge pull request #100 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_upload_updated
Ysy upload updated
2017-01-25 10:52:06 +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
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