Merge branch '6-add-method-for-blocking-users' into 'master'
Resolve "add method for blocking users" Closes #6 See merge request chat/RocketChatMobileEngine!9
Showing
- CustomModels/channelmodel.cpp 36 additions, 3 deletionsCustomModels/channelmodel.cpp
- CustomModels/channelmodel.h 3 additions, 1 deletionCustomModels/channelmodel.h
- api/meteorddp.cpp 2 additions, 3 deletionsapi/meteorddp.cpp
- config.h 1 addition, 1 deletionconfig.h
- ddpRequests/rocketchatblockuserrequest.cpp 11 additions, 0 deletionsddpRequests/rocketchatblockuserrequest.cpp
- ddpRequests/rocketchatblockuserrequest.h 12 additions, 0 deletionsddpRequests/rocketchatblockuserrequest.h
- ddpRequests/rocketchatunblockuserrequest.cpp 11 additions, 0 deletionsddpRequests/rocketchatunblockuserrequest.cpp
- ddpRequests/rocketchatunblockuserrequest.h 12 additions, 0 deletionsddpRequests/rocketchatunblockuserrequest.h
- engine.pro 6 additions, 2 deletionsengine.pro
- persistancelayer.cpp 16 additions, 5 deletionspersistancelayer.cpp
- persistancelayer.h 4 additions, 4 deletionspersistancelayer.h
- repos/channelrepository.cpp.orig 0 additions, 105 deletionsrepos/channelrepository.cpp.orig
- repos/channelrepository.h.orig 0 additions, 47 deletionsrepos/channelrepository.h.orig
- repos/entities/rocketchatchannel.cpp 11 additions, 0 deletionsrepos/entities/rocketchatchannel.cpp
- repos/entities/rocketchatchannel.h 5 additions, 0 deletionsrepos/entities/rocketchatchannel.h
- repos/messagerepository.cpp.orig 0 additions, 110 deletionsrepos/messagerepository.cpp.orig
- rocketchat.cpp 10 additions, 0 deletionsrocketchat.cpp
- rocketchat.h 5 additions, 0 deletionsrocketchat.h
- rocketchatserver.cpp 31 additions, 73 deletionsrocketchatserver.cpp
- rocketchatserver.h 6 additions, 6 deletionsrocketchatserver.h
Loading
Please register or sign in to comment