Merge branch 'improvement.move-to-ee' into no-ee
# Conflicts: # app/sagas/index.js # app/sagas/login.js # app/sagas/selectServer.js # app/views/RoomView/index.js # app/views/RoomsListView/ListHeader/index.js # app/views/RoomsListView/index.js
This commit is contained in:
commit
be40312fe6
|
@ -0,0 +1,4 @@
|
|||
### How to remove ee folder
|
||||
|
||||
If you're willing to remove Enterprise Edition features from your app, follow this diff:
|
||||
https://github.com/RocketChat/Rocket.Chat.ReactNative/compare/develop...no-ee?expand=1
|
|
@ -18,6 +18,8 @@ import inviteLinks from './inviteLinks';
|
|||
import createDiscussion from './createDiscussion';
|
||||
import enterpriseModules from './enterpriseModules';
|
||||
|
||||
import inquiry from '../ee/omnichannel/reducers/inquiry';
|
||||
|
||||
export default combineReducers({
|
||||
settings,
|
||||
login,
|
||||
|
|
|
@ -58,6 +58,8 @@ import StatusView from '../views/StatusView';
|
|||
import ShareView from '../views/ShareView';
|
||||
import CreateDiscussionView from '../views/CreateDiscussionView';
|
||||
|
||||
import QueueListView from '../ee/omnichannel/views/QueueListView';
|
||||
|
||||
// ChatsStackNavigator
|
||||
const ChatsStack = createStackNavigator();
|
||||
const ChatsStackNavigator = () => {
|
||||
|
|
|
@ -54,6 +54,8 @@ import CreateDiscussionView from '../../views/CreateDiscussionView';
|
|||
import { setKeyCommands, deleteKeyCommands } from '../../commands';
|
||||
import ShareView from '../../views/ShareView';
|
||||
|
||||
import QueueListView from '../../ee/omnichannel/views/QueueListView';
|
||||
|
||||
// ChatsStackNavigator
|
||||
const ChatsStack = createStackNavigator();
|
||||
const ChatsStackNavigator = React.memo(() => {
|
||||
|
|
Loading…
Reference in New Issue