 YadavendraSinghYaduvanshi
|
591cccc5b9
|
Merge branch 'master' into ysy_latest_setting
|
2017-01-13 18:03:13 +05:30 |
|
|
ashishandroid
|
fa9d3a1136
|
newcode
|
2017-01-13 18:01:17 +05:30 |
|
|
yadavendras
|
385bd0a36d
|
T2P upload data newss
|
2017-01-13 17:58:49 +05:30 |
|
|
ashishandroid
|
3a127934cc
|
newcode
|
2017-01-13 17:03:18 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
cb53b7acf5
|
Merge branch 'master' into GG_MappingPlanogram_DialogDisplay
|
2017-01-13 16:02:04 +05:30 |
|
|
Gagan290
|
a9f187943c
|
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-13 12:12:46 +05:30 |
|
|
yadavendras
|
6d47719735
|
T2P upload data newss
|
2017-01-12 19:37:08 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
9e55ad63ab
|
Merge branch 'master' into AShishNewBranch
|
2017-01-12 18:45:26 +05:30 |
|
|
ashishandroid
|
88eff88838
|
newcode
|
2017-01-12 18:40:18 +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 |
|
|
Gagan290
|
1c48f2f8ad
|
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-12 17:04:24 +05:30 |
|
|
Gagan290
|
9384adeec3
|
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-12 12:04:18 +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 |
|
|
ashishandroid
|
82ec3c7203
|
newcode
|
2017-01-11 12:52:10 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
f63e339d5a
|
Merge pull request #31 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Toggle_background
Gg toggle background
|
2017-01-11 12:25:51 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
71fe74dc13
|
Merge branch 'master' into NewVisibilityCode
|
2017-01-11 12:24:11 +05:30 |
|
|
ashishandroid
|
35878c7d51
|
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-11 12:13:08 +05:30 |
|
|
Gagan290
|
25ec455d2c
|
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 11:32:59 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
2b1c5503f1
|
Merge branch 'master' into Additional
|
2017-01-10 18:29:27 +05:30 |
|
|
Gagan290
|
a18d04ca5f
|
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-10 18:15:48 +05:30 |
|
|
Gagan290
|
05c199dddd
|
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-10 16:31:51 +05:30 |
|
|
ashishandroid
|
5c3b06496f
|
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-10 16:13:48 +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 |
|
|
Gagan290
|
f03119e0ae
|
Icons
|
2017-01-09 16:29:10 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
abc62c526d
|
Merge branch 'master' into T2P_save_Y
|
2017-01-09 15:57:17 +05:30 |
|
|
yadavendras
|
06ee7edb6f
|
upload module added
|
2017-01-09 15:50:47 +05:30 |
|
|
Gagan290
|
e2d02196c8
|
Icons
|
2017-01-09 13:30:29 +05:30 |
|
|
Gagan290
|
0c30da48e7
|
Icons
|
2017-01-09 12:30:14 +05:30 |
|
|
Yadavendra
|
8d591f86d4
|
T2p whole data done
|
2017-01-08 22:54:52 +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
|
161804e602
|
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 18:10:32 +05:30 |
|
|
Gagan290
|
6807b45dbb
|
Merge remote-tracking branch 'origin/Category_G' into Category_G
|
2017-01-06 17:53:02 +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 |
|
|
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 |
|
|
YadavendraSinghYaduvanshi
|
1a1a17e3bf
|
Merge branch 'master' into CategoryDownload
|
2017-01-05 16:32:07 +05:30 |
|
|
yadavendras
|
b6d31c43c0
|
Merge remote-tracking branch 'origin/CategoryDownload' into CategoryDownload
|
2017-01-05 16:08:31 +05:30 |
|
|
yadavendras
|
8f8a30a007
|
new download branch
|
2017-01-05 16:07:29 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
4834af86d6
|
Merge branch 'master' into GeoT
|
2017-01-05 11:59:31 +05:30 |
|
|
ashishandroid
|
fb8a08a5cb
|
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-05 10:52:09 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
e23089cfe2
|
Merge pull request #15 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Category_G
Category g
|
2017-01-05 10:40:00 +05:30 |
|
|
Gagan290
|
8bb793e0f5
|
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-05 10:35:22 +05:30 |
|
|
Gagan290
|
2f84b3ecea
|
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-05 09:58:16 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
f4ff9e0a8e
|
Merge branch 'master' into CategoryDownload
|
2017-01-05 09:55:42 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
a7e9190591
|
Merge pull request #13 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Category_G
Category g
|
2017-01-05 09:51:53 +05:30 |
|
|
yadavendras
|
5a8151ecd4
|
new download branch
|
2017-01-05 09:46:53 +05:30 |
|
|
Gagan290
|
e0ed5b560e
|
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-04 18:09:32 +05:30 |
|