 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
|
11455f7702
|
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 13:22:38 +05:30 |
|
|
Gagan290
|
046b361e80
|
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 13:21:37 +05:30 |
|
|
Gagan290
|
3a2fb11823
|
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 13:21:02 +05:30 |
|
|
Gagan290
|
2b7f9fe882
|
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 13:04:42 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
dc4057b97d
|
Merge pull request #39 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StockFacing_MSL_Availability_Change
Gg stock facing msl availability change
|
2017-01-12 13:01:21 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
a5f158ad3b
|
Merge pull request #38 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_T2P_upload
T2P upload data
|
2017-01-12 12:38:11 +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 |
|
|
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
|
740d384df7
|
Delete PDR_done.png
|
2017-01-12 10:23:01 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
fb8dce4660
|
Delete PDR.png
|
2017-01-12 10:22:48 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
9b06016641
|
Delete OHC_done.png
|
2017-01-12 10:22:36 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
98afe0e18b
|
Delete OHC.png
|
2017-01-12 10:22:22 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
cbaba8350b
|
Delete HFD_done.png
|
2017-01-12 10:22:11 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
6c33cfd2e8
|
Delete HFD.png
|
2017-01-12 10:21:59 +05:30 |
|
|
Gagan290
|
4a73e327ed
|
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 10:19:00 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
0623cf4919
|
Merge pull request #37 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_StorePerformance
Gg store performance
|
2017-01-12 10:07:44 +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 |
|
|
YadavendraSinghYaduvanshi
|
3fc2fe38b5
|
Merge pull request #36 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/AC_VisibilityUpload
newcode
|
2017-01-11 17:40:09 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
ce7e7c0f9e
|
Merge branch 'master' into AC_VisibilityUpload
|
2017-01-11 17:39:50 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
77a9b49ca4
|
Merge pull request #35 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/ysy_t2p_latest
T2P insert update complete
|
2017-01-11 16:52:52 +05:30 |
|
|
yadavendras
|
ef976db07c
|
T2P insert update complete
|
2017-01-11 16:49:36 +05:30 |
|
|
Gagan290
|
fc5e21f9d0
|
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 16:30:33 +05:30 |
|
|
ashishandroid
|
8a6056a10b
|
newcode
|
2017-01-11 16:13:47 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
a52544c0bc
|
Merge pull request #34 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/NewchangesAC
download
|
2017-01-11 13:40:29 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
a5f7b982a9
|
Merge branch 'master' into NewchangesAC
|
2017-01-11 13:40:22 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
b7399210fd
|
Merge pull request #32 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Ashishnewcode
newcode
|
2017-01-11 12:52:47 +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
|
b76acb7bfd
|
Merge pull request #29 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/NewVisibilityCode
New visibility code
|
2017-01-11 12:24:21 +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 |
|
|
ashishandroid
|
ba0ff03370
|
download
|
2017-01-11 12:07:32 +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
|
e91239deb2
|
Merge pull request #28 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Additional
Merge remote-tracking branch 'origin/GeoT' into GeoT
|
2017-01-10 18:29:33 +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
|
f6a0e466b4
|
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 17:59:55 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
98a9749b23
|
Merge pull request #27 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Update_Manifest
Gg update manifest
|
2017-01-10 17:49:53 +05:30 |
|
|
Gagan290
|
084cfd7b70
|
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 17:43:29 +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
|
c9a7aeed86
|
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 18:13:14 +05:30 |
|
|
Gagan290
|
5d6f153018
|
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 18:11:20 +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
|
d8b4050c9a
|
Merge pull request #26 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/T2P_save_Y
T2 p save y
|
2017-01-09 15:57:24 +05:30 |
|