verdnatura-chat/ios
Diego Mello 3650a3fe94 Merge branch 'single-server' into single-server-4.29
# Conflicts:
#	android/app/build.gradle
#	android/app/src/main/assets/fonts/custom.ttf
#	app.json
#	app/AppContainer.tsx
#	app/actions/actionsTypes.ts
#	app/actions/login.ts
#	app/actions/room.ts
#	app/containers/ActionSheet/ActionSheet.tsx
#	app/containers/ActionSheet/BottomSheetContent.tsx
#	app/containers/ActionSheet/Button.ts
#	app/containers/ActionSheet/Handle.tsx
#	app/containers/ActionSheet/Provider.tsx
#	app/containers/ActionSheet/styles.ts
#	app/containers/AppVersion.tsx
#	app/containers/Avatar/Avatar.tsx
#	app/containers/Avatar/index.tsx
#	app/containers/Avatar/interfaces.ts
#	app/containers/CustomIcon/index.tsx
#	app/containers/CustomIcon/mappedIcons.js
#	app/containers/CustomIcon/selection.json
#	app/containers/DirectoryItem/index.tsx
#	app/containers/EmojiPicker/CustomEmoji.tsx
#	app/containers/EmojiPicker/EmojiCategory.tsx
#	app/containers/EmojiPicker/index.tsx
#	app/containers/FormContainer.tsx
#	app/containers/HeaderButton/Common.tsx
#	app/containers/HeaderButton/HeaderButtonItem.tsx
#	app/containers/HeaderButton/HeaderButtonItemBadge.tsx
#	app/containers/ImageViewer/index.ts
#	app/containers/ImageViewer/types.ts
#	app/containers/InAppNotification/NotifierComponent.tsx
#	app/containers/InAppNotification/index.tsx
#	app/containers/KeyboardView.tsx
#	app/containers/List/ListContainer.tsx
#	app/containers/List/ListItem.tsx
#	app/containers/MessageActions/Header.tsx
#	app/containers/MessageActions/index.tsx
#	app/containers/MessageBox/CommandsPreview/Item.tsx
#	app/containers/MessageBox/Mentions/MentionEmoji.tsx
#	app/containers/MessageBox/RecordAudio.tsx
#	app/containers/MessageBox/forceJpgExtension.ts
#	app/containers/MessageBox/index.tsx
#	app/containers/MessageBox/styles.ts
#	app/containers/MessageErrorActions.tsx
#	app/containers/Passcode/Base/Button.tsx
#	app/containers/Passcode/Base/Locked.tsx
#	app/containers/Passcode/PasscodeEnter.tsx
#	app/containers/RoomHeader/RoomHeader.stories.js
#	app/containers/RoomHeader/RoomHeader.tsx
#	app/containers/RoomHeader/__snapshots__/RoomHeader.stories.storyshot
#	app/containers/RoomHeader/index.tsx
#	app/containers/RoomItem/Actions.tsx
#	app/containers/RoomItem/LastMessage.tsx
#	app/containers/RoomItem/RoomItem.tsx
#	app/containers/RoomItem/Title.tsx
#	app/containers/RoomItem/Touchable.tsx
#	app/containers/RoomItem/UpdatedAt.tsx
#	app/containers/RoomItem/Wrapper.tsx
#	app/containers/RoomItem/index.tsx
#	app/containers/RoomItem/interfaces.ts
#	app/containers/RoomItem/styles.ts
#	app/containers/SearchHeader.tsx
#	app/containers/ServerItem/index.tsx
#	app/containers/TextInput/FormTextInput.tsx
#	app/containers/TextInput/TextInput.stories.js
#	app/containers/Toast.tsx
#	app/containers/TwoFactor/index.tsx
#	app/containers/UIKit/DatePicker.tsx
#	app/containers/UIKit/Image.tsx
#	app/containers/UIKit/MultiSelect/Chips.tsx
#	app/containers/UIKit/MultiSelect/Input.tsx
#	app/containers/UIKit/MultiSelect/Items.tsx
#	app/containers/UIKit/MultiSelect/index.tsx
#	app/containers/UIKit/MultiSelect/styles.ts
#	app/containers/UIKit/Select.tsx
#	app/containers/UIKit/index.tsx
#	app/containers/UIKit/utils.ts
#	app/containers/UnreadBadge/index.tsx
#	app/containers/UserItem.tsx
#	app/containers/markdown/AtMention.tsx
#	app/containers/markdown/Emoji.tsx
#	app/containers/markdown/Hashtag.tsx
#	app/containers/markdown/Link.tsx
#	app/containers/markdown/Preview.tsx
#	app/containers/markdown/index.tsx
#	app/containers/markdown/new/BigEmoji.tsx
#	app/containers/markdown/new/Emoji.tsx
#	app/containers/markdown/new/Image.tsx
#	app/containers/markdown/new/Inline.tsx
#	app/containers/markdown/new/Link.tsx
#	app/containers/message/Attachments.tsx
#	app/containers/message/Audio.tsx
#	app/containers/message/Components/CollapsibleQuote/__snapshots__/CollapsibleQuote.stories.storyshot
#	app/containers/message/Discussion.tsx
#	app/containers/message/Emoji.tsx
#	app/containers/message/Image.tsx
#	app/containers/message/Message.tsx
#	app/containers/message/Reply.tsx
#	app/containers/message/Urls.tsx
#	app/containers/message/Video.tsx
#	app/containers/message/index.tsx
#	app/containers/message/interfaces.ts
#	app/containers/message/styles.ts
#	app/definitions/IEmoji.ts
#	app/definitions/IRoom.ts
#	app/definitions/ISubscription.ts
#	app/definitions/rest/v1/users.ts
#	app/definitions/rest/v1/videoConference.ts
#	app/ee/omnichannel/containers/OmnichannelHeader/index.tsx
#	app/ee/omnichannel/lib/index.ts
#	app/ee/omnichannel/lib/subscriptions/inquiry.ts
#	app/ee/omnichannel/sagas/inquiry.js
#	app/ee/omnichannel/views/QueueListView.tsx
#	app/externalModules.d.ts
#	app/i18n/index.ts
#	app/i18n/locales/ar.json
#	app/i18n/locales/de.json
#	app/i18n/locales/en.json
#	app/i18n/locales/es-ES.json
#	app/i18n/locales/fr.json
#	app/i18n/locales/it.json
#	app/i18n/locales/ja.json
#	app/i18n/locales/nl.json
#	app/i18n/locales/pt-BR.json
#	app/i18n/locales/ru.json
#	app/i18n/locales/tr.json
#	app/i18n/locales/zh-CN.json
#	app/i18n/locales/zh-TW.json
#	app/index.tsx
#	app/lib/constants/colors.ts
#	app/lib/constants/defaultSettings.ts
#	app/lib/constants/links.ts
#	app/lib/database/index.ts
#	app/lib/database/model/migrations.js
#	app/lib/database/schema/app.js
#	app/lib/encryption/encryption.ts
#	app/lib/encryption/room.ts
#	app/lib/encryption/utils.ts
#	app/lib/hooks/index.ts
#	app/lib/methods/actions.ts
#	app/lib/methods/callJitsi.ts
#	app/lib/methods/enterpriseModules.ts
#	app/lib/methods/getCustomEmojis.ts
#	app/lib/methods/getPermalinks.ts
#	app/lib/methods/getPermissions.ts
#	app/lib/methods/getRoles.ts
#	app/lib/methods/getSettings.ts
#	app/lib/methods/getSlashCommands.ts
#	app/lib/methods/getThreadName.ts
#	app/lib/methods/getUsersPresence.ts
#	app/lib/methods/helpers/mergeSubscriptionsRooms.ts
#	app/lib/methods/helpers/showToast.ts
#	app/lib/methods/index.ts
#	app/lib/methods/loadMessagesForRoom.ts
#	app/lib/methods/loadMissedMessages.ts
#	app/lib/methods/loadNextMessages.ts
#	app/lib/methods/loadSurroundingMessages.ts
#	app/lib/methods/loadThreadMessages.ts
#	app/lib/methods/logout.ts
#	app/lib/methods/readMessages.ts
#	app/lib/methods/search.ts
#	app/lib/methods/sendFileMessage.ts
#	app/lib/methods/sendMessage.ts
#	app/lib/methods/setUser.ts
#	app/lib/methods/shareExtension.ts
#	app/lib/methods/subscribeRooms.ts
#	app/lib/methods/subscriptions/room.ts
#	app/lib/methods/subscriptions/rooms.ts
#	app/lib/navigation/appNavigation.ts
#	app/lib/navigation/shareNavigation.ts
#	app/lib/notifications/push.ts
#	app/lib/services/connect.ts
#	app/lib/services/restApi.ts
#	app/lib/services/sdk.ts
#	app/presentation/ImageViewer/index.js
#	app/presentation/ImageViewer/index.ts
#	app/presentation/ImageViewer/types.js
#	app/presentation/ImageViewer/types.ts
#	app/reducers/login.ts
#	app/reducers/room.test.ts
#	app/sagas/createChannel.js
#	app/sagas/createDiscussion.js
#	app/sagas/deepLinking.js
#	app/sagas/encryption.js
#	app/sagas/init.js
#	app/sagas/inviteLinks.js
#	app/sagas/login.js
#	app/sagas/messages.js
#	app/sagas/room.js
#	app/sagas/selectServer.js
#	app/sagas/state.js
#	app/share.tsx
#	app/stacks/InsideStack.tsx
#	app/stacks/MasterDetailStack/index.tsx
#	app/stacks/MasterDetailStack/types.ts
#	app/stacks/OutsideStack.tsx
#	app/stacks/types.ts
#	app/views/AddExistingChannelView.tsx
#	app/views/AttachmentView.tsx
#	app/views/AuthenticationWebView.tsx
#	app/views/AutoTranslateView/index.tsx
#	app/views/CannedResponseDetail.tsx
#	app/views/CannedResponsesListView/Dropdown/DropdownItem.tsx
#	app/views/CannedResponsesListView/index.tsx
#	app/views/ChangePasscodeView.tsx
#	app/views/CreateChannelView.tsx
#	app/views/CreateDiscussionView/SelectChannel.tsx
#	app/views/CreateDiscussionView/SelectUsers.tsx
#	app/views/CreateDiscussionView/index.tsx
#	app/views/CreateDiscussionView/interfaces.ts
#	app/views/DefaultBrowserView.tsx
#	app/views/DirectoryView/Options.tsx
#	app/views/DirectoryView/index.tsx
#	app/views/DiscussionsView/Item.tsx
#	app/views/DiscussionsView/__snapshots__/Item.stories.storyshot
#	app/views/DiscussionsView/index.tsx
#	app/views/DisplayPrefsView.tsx
#	app/views/E2EEncryptionSecurityView.tsx
#	app/views/E2EEnterYourPasswordView.tsx
#	app/views/E2ESaveYourPasswordView.tsx
#	app/views/ForgotPasswordView.tsx
#	app/views/ForwardLivechatView.tsx
#	app/views/InviteUsersEditView/index.tsx
#	app/views/InviteUsersView/index.tsx
#	app/views/JitsiMeetView.tsx
#	app/views/LanguageView/index.tsx
#	app/views/LegalView.tsx
#	app/views/LivechatEditView.tsx
#	app/views/LoginView.tsx
#	app/views/MarkdownTableView.tsx
#	app/views/MessagesView/index.tsx
#	app/views/ModalBlockView.tsx
#	app/views/NewMessageView.tsx
#	app/views/NewServerView/ServerInput/Item.tsx
#	app/views/NewServerView/ServerInput/index.tsx
#	app/views/NewServerView/index.tsx
#	app/views/NotificationPreferencesView/index.tsx
#	app/views/PickerView.tsx
#	app/views/ProfileView/index.tsx
#	app/views/RegisterView.tsx
#	app/views/RoomActionsView/index.tsx
#	app/views/RoomInfoEditView/index.tsx
#	app/views/RoomInfoView/index.tsx
#	app/views/RoomMembersView/index.tsx
#	app/views/RoomView/JoinCode.tsx
#	app/views/RoomView/LeftButtons.tsx
#	app/views/RoomView/List/List.tsx
#	app/views/RoomView/List/NavBottomFAB.tsx
#	app/views/RoomView/List/index.tsx
#	app/views/RoomView/LoadMore/__snapshots__/LoadMore.stories.storyshot
#	app/views/RoomView/LoadMore/index.tsx
#	app/views/RoomView/ReactionPicker.tsx
#	app/views/RoomView/RightButtons.tsx
#	app/views/RoomView/UploadProgress.tsx
#	app/views/RoomView/index.tsx
#	app/views/RoomsListView/Header/Header.tsx
#	app/views/RoomsListView/Header/index.tsx
#	app/views/RoomsListView/ServerDropdown.tsx
#	app/views/RoomsListView/index.tsx
#	app/views/ScreenLockConfigView.tsx
#	app/views/ScreenLockedView.tsx
#	app/views/SearchMessagesView/index.tsx
#	app/views/SecurityPrivacyView.tsx
#	app/views/SelectListView.tsx
#	app/views/SelectedUsersView.tsx
#	app/views/SendEmailConfirmationView.tsx
#	app/views/SetUsernameView.tsx
#	app/views/SettingsView/index.tsx
#	app/views/ShareListView/Header/Header.ios.tsx
#	app/views/ShareListView/Header/Header.tsx
#	app/views/ShareListView/index.tsx
#	app/views/ShareListView/styles.ts
#	app/views/ShareView/Header.tsx
#	app/views/ShareView/Preview.tsx
#	app/views/ShareView/Thumbs.tsx
#	app/views/ShareView/index.tsx
#	app/views/ShareView/utils.ts
#	app/views/SidebarView/SidebarItem.tsx
#	app/views/SidebarView/index.tsx
#	app/views/StatusView/index.tsx
#	app/views/TeamChannelsView.tsx
#	app/views/ThemeView.tsx
#	app/views/ThreadMessagesView/Dropdown/DropdownItem.tsx
#	app/views/ThreadMessagesView/Dropdown/index.tsx
#	app/views/ThreadMessagesView/Item.tsx
#	app/views/ThreadMessagesView/__snapshots__/Item.stories.storyshot
#	app/views/ThreadMessagesView/index.tsx
#	app/views/UserPreferencesView/index.tsx
#	app/views/WorkspaceView/ServerAvatar.tsx
#	docs/icons.md
#	e2e/tests/assorted/03-profile.spec.js
#	e2e/tests/assorted/06-status.spec.js
#	e2e/tests/room/03-roomactions.spec.js
#	e2e/tests/room/08-roominfo.spec.js
#	ios/Gemfile.lock
#	ios/Podfile.lock
#	ios/RocketChatRN.xcodeproj/project.pbxproj
#	ios/RocketChatRN/Info.plist
#	ios/ShareRocketChatRN/Info.plist
#	ios/custom.ttf
#	jest.setup.js
#	package.json
#	storybook/stories/HeaderButtons.js
#	storybook/stories/Markdown.tsx
#	storybook/stories/NewMarkdown.js
#	storybook/stories/RoomItem.js
#	storybook/stories/__snapshots__/Avatar.storyshot
#	storybook/stories/__snapshots__/HeaderButtons.storyshot
#	storybook/stories/__snapshots__/List.storyshot
#	storybook/stories/__snapshots__/Markdown.storyshot
#	storybook/stories/__snapshots__/Message.storyshot
#	storybook/stories/__snapshots__/NewMarkdown.storyshot
#	storybook/stories/__snapshots__/RoomItem.storyshot
#	storybook/stories/__snapshots__/ServerItem.storyshot
#	storybook/stories/index.js
#	yarn.lock
2022-07-18 14:48:17 -03:00
..
AppGroup [CHORE] App Group path as a iOS constant (#2439) 2020-08-31 17:29:44 -03:00
Crashlytics.framework Crashlytics (#258) 2018-04-03 13:24:58 -03:00
Experimental.xcassets [CHORE] Build official apps on CI (#2701) 2020-12-14 13:20:32 -03:00
Fabric.framework Crashlytics (#258) 2018-04-03 13:24:58 -03:00
NotificationService Merge 4.21.0 into single-server (#3468) 2021-10-28 14:49:08 -03:00
Official.xcassets [CHORE] Build official apps on CI (#2701) 2020-12-14 13:20:32 -03:00
RocketChatRN Bump version to 4.29.0 (#4259) 2022-05-30 19:14:21 -03:00
RocketChatRN.xcodeproj Merge branch 'single-server' into single-server-4.29 2022-07-18 14:48:17 -03:00
RocketChatRN.xcworkspace Update all dependencies (#2008) 2020-05-08 13:37:49 -03:00
ShareRocketChatRN Bump version to 4.29.0 (#4259) 2022-05-30 19:14:21 -03:00
Shared Merge 4.26.1 into single-server (#3981) 2022-03-29 15:53:27 -03:00
fastlane Merge 4.27.0 into single-server (#4138) 2022-04-28 15:44:40 -03:00
Gemfile Merge 4.19.0 into single-server (#3360) 2021-08-31 17:35:31 -03:00
Gemfile.lock Chore: Update gems (#4318) 2022-06-24 17:50:44 -03:00
LaunchScreen.storyboard [CHORE] Build official apps on CI (#2701) 2020-12-14 13:20:32 -03:00
Podfile Merge 4.26.1 into single-server (#3981) 2022-03-29 15:53:27 -03:00
Podfile.lock Chore: Upgrade react-native-vector-icons from 8.1.0 to 9.1.0 (#4175) 2022-06-27 15:15:15 -03:00
ReplyNotification.swift Merge 4.15.0 into single-server (#2986) 2021-03-15 17:16:34 -03:00
RocketChatRN-Bridging-Header.h Merge 4.15.0 into single-server (#2986) 2021-03-15 17:16:34 -03:00
custom.ttf Chore: Update icon set (#4355) 2022-07-13 14:09:15 -03:00