verdnatura-mirror
/
verdnatura-chat
forked from verdnatura-mirror/Rocket.Chat.ReactNative
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Diego Mello 2020-08-28 11:06:24 -03:00
parent dc3eec8b16 bcf4e2e144
commit be40312fe6
4 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/ee/README.md Normal file
View File

@ -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

2
app/reducers/index.js
View File

@ -18,6 +18,8 @@ import inviteLinks from './inviteLinks';
import createDiscussion from './createDiscussion'; import createDiscussion from './createDiscussion';
import enterpriseModules from './enterpriseModules'; import enterpriseModules from './enterpriseModules';
import inquiry from '../ee/omnichannel/reducers/inquiry';
export default combineReducers({ export default combineReducers({
settings, settings,
login, login,

2
app/stacks/InsideStack.js
View File

@ -58,6 +58,8 @@ import StatusView from '../views/StatusView';
import ShareView from '../views/ShareView'; import ShareView from '../views/ShareView';
import CreateDiscussionView from '../views/CreateDiscussionView'; import CreateDiscussionView from '../views/CreateDiscussionView';
import QueueListView from '../ee/omnichannel/views/QueueListView';
// ChatsStackNavigator // ChatsStackNavigator
const ChatsStack = createStackNavigator(); const ChatsStack = createStackNavigator();
const ChatsStackNavigator = () => { const ChatsStackNavigator = () => {

2
app/stacks/MasterDetailStack/index.js
View File

@ -54,6 +54,8 @@ import CreateDiscussionView from '../../views/CreateDiscussionView';
import { setKeyCommands, deleteKeyCommands } from '../../commands'; import { setKeyCommands, deleteKeyCommands } from '../../commands';
import ShareView from '../../views/ShareView'; import ShareView from '../../views/ShareView';
import QueueListView from '../../ee/omnichannel/views/QueueListView';
// ChatsStackNavigator // ChatsStackNavigator
const ChatsStack = createStackNavigator(); const ChatsStack = createStackNavigator();
const ChatsStackNavigator = React.memo(() => { const ChatsStackNavigator = React.memo(() => {