SmartDukaan – /

Rev 21282 – Token Api and register, some refectoring

ashik.ali — Tue, 25 Apr 2017 19:46:43 +0530

ashik.ali – 14 file(s) modified
Token Api and register, some refectoring

Rev 21281 –

kshitij.sood — Tue, 25 Apr 2017 15:13:16 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/User.java

Rev 21280 –

ashik.ali — Tue, 25 Apr 2017 14:51:00 +0530

ashik.ali – 2 file(s) modified

+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/config/ConnectionFactories.java

Rev 21279 –

ashik.ali — Tue, 25 Apr 2017 13:00:47 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-web/pom.xml

Rev 21278 – Google login, User registeration

ashik.ali — Mon, 24 Apr 2017 19:32:16 +0530

ashik.ali – 26 file(s) modified
Google login, User registeration

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/SocialUser.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/User.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ConnectionFactories.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PostOfficeRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PostOfficeRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/SocialUserRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/SocialUserRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/client/RestClient.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/CreateUserRequestInterceptor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateApiJsonValidator.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateUserJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/GenericJsonValidator.java
~ /trunk/profitmandi-web/src/main/resources/response-codes.properties

Rev 21277 –

ashik.ali — Mon, 24 Apr 2017 13:47:16 +0530

ashik.ali – 44 file(s) modified

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/util/JWTUtil.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Api.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Permission.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/PostOffice.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Role.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/SocialUser.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/User.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/enumuration/Gender.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/enumuration/PermissionType.java (copied from /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/enumuration/PricePermission.java@21220)
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/enumuration/PricePermission.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/enumuration/SocialType.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepositoryImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PostOfficeRepository.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/PostOfficeRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepositoryImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/SocialUserRepository.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/SocialUserRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepositoryImpl.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/client
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/client/RestClient.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/PostOfficeController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/enumuration
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/enumuration/SchemeType.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/ApiRequestInterceptor.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/GoogleLoginRequestInterceptor.java
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/JsonProcessor.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/RoleRequestInterceptor.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/GoogleLoginProcessor.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/processor/JsonProcessor.java (copied from /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/JsonProcessor.java@21220)
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateApiJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateRoleJsonValidator.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/GenericJsonValidator.java (copied from /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/GenericRoleJsonValidator.java@21248)
x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/GenericRoleJsonValidator.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/GoogleLoginApiJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/UpdateApiJsonValidator.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/UpdateRoleJsonValidator.java
~ /trunk/profitmandi-web/src/main/resources/response-codes.properties

Rev 21276 – removed

ashik.ali — Mon, 24 Apr 2017 13:42:43 +0530

ashik.ali – 1 file(s) modified
removed

x /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/exception

Rev 21275 –

ashik.ali — Mon, 24 Apr 2017 13:20:27 +0530

ashik.ali – 1 file(s) modified

~ /trunk/profitmandi-web/src/main/resources/META-INF/persistence.xml

Rev 21274 – Connection Factory

ashik.ali — Mon, 24 Apr 2017 13:17:03 +0530

ashik.ali – 1 file(s) modified
Connection Factory

+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ConnectionFactories.java

Rev 21273 –

amit.gupta — Sun, 23 Apr 2017 15:40:33 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21272 –

kshitij.sood — Sun, 23 Apr 2017 15:10:58 +0530

kshitij.sood – 3 file(s) modified

~ /trunk/profitmandi-web/pom.xml
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/config/WebMVCConfig.java
~ /trunk/profitmandi-web/src/main/resources/META-INF/persistence.xml

Rev 21271 – commit changes

rajender — Sun, 23 Apr 2017 10:34:03 +0530

rajender – 1 file(s) modified
commit changes

/trunk/ProfitMandiAndroid/app/src/main/java/com/saholic/profittill/main/DealsHomeFragment.java

Rev 21270 –

amit.gupta — Sun, 23 Apr 2017 01:15:34 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21269 –

amit.gupta — Sat, 22 Apr 2017 23:52:23 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21268 –

amit.gupta — Sat, 22 Apr 2017 23:52:00 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/main.py

Rev 21267 –

amit.gupta — Sat, 22 Apr 2017 23:13:26 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21266 – fixed agent

amit.gupta — Sat, 22 Apr 2017 23:12:11 +0530

amit.gupta – 1 file(s) modified
fixed agent

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21265 –

amit.gupta — Sat, 22 Apr 2017 22:46:55 +0530

amit.gupta – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/utils/utils.py

Rev 21264 – fixed flipkart

amit.gupta — Sat, 22 Apr 2017 22:46:14 +0530

amit.gupta – 1 file(s) modified
fixed flipkart

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21263 –

amit.gupta — Sat, 22 Apr 2017 18:23:02 +0530

amit.gupta – 1 file(s) modified

~ /trunk/ProfitMandiAndroid/app/src/main/java/com/saholic/profittill/main/DealsHomeFragment.java

Rev 21262 – Failed commit: Default

rajender — Sat, 22 Apr 2017 14:50:23 +0530

rajender – 1 file(s) modified
Failed commit: Default

~ /trunk/ProfitMandiAndroid/app/src/main/java/com/saholic/profittill/main/DealsHomeFragment.java

Rev 21261 –

kshitij.sood — Fri, 21 Apr 2017 14:15:42 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/PyDTR/src/dtr/dao.py

Rev 21260 –

amit.gupta — Fri, 21 Apr 2017 14:01:58 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/NotificationCampaigns/admin_send.ctp

Rev 21259 –

amit.gupta — Fri, 21 Apr 2017 13:54:53 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/NotificationCampaigns/admin_send.ctp

Rev 21258 –

amit.gupta — Fri, 21 Apr 2017 13:26:45 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/NotificationCampaigns/admin_send.ctp

Rev 21257 – Added Image Url

amit.gupta — Fri, 21 Apr 2017 13:15:07 +0530

amit.gupta – 1 file(s) modified
Added Image Url

~ /trunk/DtrMobileAppDashboard/app/View/NotificationCampaigns/admin_send.ctp

Rev 21256 –

amit.gupta — Wed, 19 Apr 2017 16:20:08 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Elements/header.ctp

Rev 21255 –

amit.gupta — Wed, 19 Apr 2017 16:17:19 +0530

amit.gupta – 1 file(s) modified

~ /trunk/DtrMobileAppDashboard/app/View/Elements/header.ctp

Rev 21254 – eclipse project file

ashik.ali — Wed, 19 Apr 2017 15:59:55 +0530

ashik.ali – 1 file(s) modified
eclipse project file

+ /trunk/profitmandi-web/.project

Rev 21253 –

kshitij.sood — Wed, 19 Apr 2017 13:14:18 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessBulkBilling.java

Rev 21252 –

kshitij.sood — Wed, 19 Apr 2017 12:25:27 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessBulkBilling.java

Rev 21251 –

kshitij.sood — Wed, 19 Apr 2017 12:25:00 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java

Rev 21250 –

kshitij.sood — Wed, 19 Apr 2017 12:13:43 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/BulkBillingServlet.java

Rev 21249 –

kshitij.sood — Wed, 19 Apr 2017 11:55:11 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/OrderDetails.java

Rev 21248 – User, Role, Api => Apis

ashik.ali — Wed, 19 Apr 2017 11:54:26 +0530

ashik.ali – 20 file(s) modified
User, Role, Api => Apis

~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/model/ProfitMandiConstants.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/common/util/StringUtils.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Api.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/Role.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/entity/User.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/ApiRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/RoleRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepository.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/dao/repository/UserRepositoryImpl.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/ApiController.java
~ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/RoleController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/UserController.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/interceptor/RoleRequestInterceptor.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/CreateRoleJsonValidator.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/GenericRoleJsonValidator.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/UpdateApiJsonValidator.java
+ /trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/rest/validation/exception/UpdateRoleJsonValidator.java
~ /trunk/profitmandi-web/src/main/resources/response-codes.properties

Rev 21247 –

kshitij.sood — Tue, 18 Apr 2017 20:25:10 +0530

kshitij.sood – 3 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/BulkBillingInfoBox.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/BulkBillingServlet.java
~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessBulkBilling.java

Rev 21246 – Fixed flipkart order tracking

amit.gupta — Tue, 18 Apr 2017 17:40:57 +0530

amit.gupta – 1 file(s) modified
Fixed flipkart order tracking

~ /trunk/PyDTR/src/dtr/sources/flipkart.py

Rev 21245 –

kshitij.sood — Tue, 18 Apr 2017 16:59:10 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/client/inbox/BulkBillingInfoBox.java

Rev 21244 –

kshitij.sood — Tue, 18 Apr 2017 15:26:26 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/ProcessBulkBilling.java

Rev 21243 –

kshitij.sood — Tue, 18 Apr 2017 15:25:37 +0530

kshitij.sood – 1 file(s) modified

~ /trunk/HotspotDashboard/src/main/java/in/shop2020/hotspot/dashbaord/server/BulkBillingServlet.java