Commit Graph

65 Commits

Author SHA1 Message Date
yadavendras aff5b24204 YSY commit 2019-07-04 19:37:24 +05:30
yadavendras aa51c3570e YSY commit 2019-05-24 18:11:05 +05:30
yadavendras d0e9ab2148 YSY commit 2019-04-26 19:01:04 +05:30
yadavendras 5ff77f3be7 YSY commit 2019-03-13 18:44:52 +05:30
yadavendras 97d30b2f5b YSY commit 2019-03-01 20:32:01 +05:30
yadavendras f1eff431cd YSY commit 2019-01-18 19:53:24 +05:30
yadavendras c0757192b9 YSY commit 2018-10-26 18:59:48 +05:30
yadavendras b0e2e05501 Deepak_commit_31_05_2018 2018-10-08 18:46:28 +05:30
yadavendras 34d8473e33 Deepak_commit_31_05_2018 2018-10-01 20:48:45 +05:30
yadavendras 17212dee28 Deepak_commit_31_05_2018 2018-06-22 18:32:06 +05:30
yadavendras 2d25c22137 Deepak_commit_31_05_2018 2018-05-31 16:55:34 +05:30
yadavendras 3c2dc05314 Audit and Bulk image upload 2018-04-06 19:02:14 +05:30
yadavendras d53bca0e29 Planogram pdf and Category image mapping 2018-01-31 15:43:49 +05:30
yadavendras 4da796f77a Planogram pdf and Category image mapping 2018-01-06 02:39:56 +05:30
yadavendras 7946246ee0 no camera added 2017-10-27 19:41:26 +05:30
yadavendras a1f4172294 arabic UAE 2017-05-19 18:45:07 +05:30
Gagan290 343a374e5a Msl_Availability_New 2017-03-17 11:11:15 +05:30
Gagan290 7e5ced4f08 camera handle for arabic language 2017-03-06 12:25:47 +05:30
ashishandroid 22743480f6 review 2017-02-22 15:13:31 +05:30
YadavendraSinghYaduvanshi 64fb3f63f8 Merge branch 'master' into CodeFire22 2017-02-15 10:44:27 +05:30
ashishandroid ab49b6046c review 2017-02-08 17:07:00 +05:30
Gagan290 d4ca1184cf //PromoCompliance Default Toggle Changes 2017-02-03 11:01:17 +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
Gagan290 13c8c92e1e //Stock_FacingActivity Changes today 2017-01-23 10:33:08 +05:30
yadavendras cbc99474f5 T2P upload data newss 2017-01-21 16:14:43 +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
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
yadavendras 2f684cf426 T2P upload data newss 2017-01-17 13:49:27 +05:30
yadavendras e6ec42a521 T2P upload data newss 2017-01-13 19:12:14 +05:30
yadavendras 385bd0a36d T2P upload data newss 2017-01-13 17:58:49 +05:30
YadavendraSinghYaduvanshi 1f34b4fd91 Merge branch 'master' into ysy_upload_new 2017-01-12 17:55:00 +05:30
yadavendras 96b2ff2eb6 T2P upload data new 2017-01-12 17:49:12 +05:30
YadavendraSinghYaduvanshi bb08eb983a Merge branch 'master' into ysy_T2P_upload 2017-01-12 12:38:05 +05:30
yadavendras 412c81ca4b T2P upload data 2017-01-12 12:28:09 +05:30
YadavendraSinghYaduvanshi ba9b1f004c Merge branch 'master' into GG_StorePerformance 2017-01-12 10:07:23 +05:30
Gagan290 5b080446e6 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-11 18:04:08 +05:30
yadavendras ef976db07c T2P insert update complete 2017-01-11 16:49:36 +05:30
YadavendraSinghYaduvanshi 2b1c5503f1 Merge branch 'master' into Additional 2017-01-10 18:29:27 +05:30
ashishandroid a95bf5cddd Merge remote-tracking branch 'origin/GeoT' into GeoT
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
2017-01-09 18:13:27 +05:30
Gagan290 362f3ed0a3 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
2017-01-09 16:37:14 +05:30
yadavendras 06ee7edb6f upload module added 2017-01-09 15:50:47 +05:30
Gagan290 f4b812d965 Icons 2017-01-09 15:45:26 +05:30
YadavendraSinghYaduvanshi c38968aadf Merge branch 'master' into Gagan 2017-01-07 18:21:01 +05:30
ashishandroid 1260f47b0d Merge remote-tracking branch 'origin/GeoT' into GeoT
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
2017-01-07 09:42:10 +05:30
Gagan290 04875b6fc8 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
2017-01-06 17:52:25 +05:30
YadavendraSinghYaduvanshi 1e2d4973b4 Merge branch 'master' into GeoT 2017-01-06 11:59:56 +05:30
ashishandroid 83e6be733b Merge remote-tracking branch 'origin/GeoT' into GeoT
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
2017-01-06 11:42:14 +05:30