Commit Graph

376 Commits

Author SHA1 Message Date
ashishandroid ebdacde272 review 2017-02-13 15:59:21 +05:30
ashishandroid 0207a8ce01 review 2017-02-09 18:09:13 +05:30
ashishandroid 4f0884dac7 review 2017-02-09 13:21:26 +05:30
ashishandroid ab49b6046c review 2017-02-08 17:07:00 +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
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
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
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