From ffa62528f18938f820d19e9e37f211287b35f292 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Thu, 26 Apr 2018 18:34:22 -0400 Subject: [PATCH 1/4] Improved performance while autolinking emails (#1632) --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 52a7b2add..3875d080a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2763,7 +2763,7 @@ "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==" }, "commonmark": { - "version": "github:mattermost/commonmark.js#c9c29834005af6eedd1a979d913b75e34f16a83b", + "version": "github:mattermost/commonmark.js#21742b9d51070b6abba82d88590a0c51ee552a47", "requires": { "entities": "1.1.1", "mdurl": "1.0.1", diff --git a/package.json b/package.json index 051efb1d4..76d32a56a 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "analytics-react-native": "1.2.0", "babel-polyfill": "6.26.0", "base-64": "0.1.0", - "commonmark": "github:mattermost/commonmark.js#c9c29834005af6eedd1a979d913b75e34f16a83b", + "commonmark": "github:mattermost/commonmark.js#21742b9d51070b6abba82d88590a0c51ee552a47", "commonmark-react-renderer": "mattermost/commonmark-react-renderer#86fa63f898802953842526c2030f3b63c5d1ae7a", "deep-equal": "1.0.1", "fuse.js": "^3.2.0", From 79a35d25addaf3ce7c6cf0e14a271ebaab8818b8 Mon Sep 17 00:00:00 2001 From: Saturnino Abril Date: Fri, 27 Apr 2018 09:01:26 +0800 Subject: [PATCH 2/4] [MM-10341] Remove "Add Reaction" on posts of flagged, recent mentions and search results (#1631) * remove "Add Reaction" on posts of flagged, recent mentions and search results * set default props to true for showAddReaction --- app/components/post/post.js | 4 ++++ app/components/post_body/post_body.js | 6 ++++-- .../search/channel_display_name/channel_display_name.js | 2 +- app/screens/search/channel_display_name/index.js | 2 +- app/screens/search/search_result_post/search_result_post.js | 1 + 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/components/post/post.js b/app/components/post/post.js index efcd0eacf..9f67070bc 100644 --- a/app/components/post/post.js +++ b/app/components/post/post.js @@ -60,6 +60,7 @@ export default class Post extends PureComponent { canDelete: PropTypes.bool.isRequired, onPermalinkPress: PropTypes.func, shouldRenderReplyButton: PropTypes.bool, + showAddReaction: PropTypes.bool, showFullDate: PropTypes.bool, showLongPost: PropTypes.bool, theme: PropTypes.object.isRequired, @@ -70,6 +71,7 @@ export default class Post extends PureComponent { static defaultProps = { isSearchResult: false, + showAddReaction: true, showLongPost: false, channelIsReadOnly: false, }; @@ -386,6 +388,7 @@ export default class Post extends PureComponent { post, renderReplies, shouldRenderReplyButton, + showAddReaction, showFullDate, showLongPost, theme, @@ -461,6 +464,7 @@ export default class Post extends PureComponent { managedConfig={managedConfig} isFlagged={isFlagged} isReplyPost={isReplyPost} + showAddReaction={showAddReaction} showLongPost={showLongPost} /> diff --git a/app/components/post_body/post_body.js b/app/components/post_body/post_body.js index 66db41a2f..18a755643 100644 --- a/app/components/post_body/post_body.js +++ b/app/components/post_body/post_body.js @@ -35,6 +35,7 @@ export default class PostBody extends PureComponent { flagPost: PropTypes.func.isRequired, unflagPost: PropTypes.func.isRequired, }).isRequired, + canAddReaction: PropTypes.bool, canDelete: PropTypes.bool, canEdit: PropTypes.bool, channelIsReadOnly: PropTypes.bool.isRequired, @@ -54,7 +55,6 @@ export default class PostBody extends PureComponent { managedConfig: PropTypes.object, message: PropTypes.string, navigator: PropTypes.object.isRequired, - canAddReaction: PropTypes.bool, onAddReaction: PropTypes.func, onCopyPermalink: PropTypes.func, onCopyText: PropTypes.func, @@ -66,6 +66,7 @@ export default class PostBody extends PureComponent { postId: PropTypes.string.isRequired, postProps: PropTypes.object, renderReplyBar: PropTypes.func, + showAddReaction: PropTypes.bool, showLongPost: PropTypes.bool.isRequired, theme: PropTypes.object, toggleSelected: PropTypes.func, @@ -128,13 +129,14 @@ export default class PostBody extends PureComponent { onCopyText, onPostDelete, onPostEdit, + showAddReaction, } = this.props; const actions = []; const isPendingOrFailedPost = isPending || isFailed; // we should check for the user roles and permissions if (!isPendingOrFailedPost && !isSystemMessage && !isPostEphemeral) { - if (canAddReaction && !channelIsReadOnly) { + if (showAddReaction && canAddReaction && !channelIsReadOnly) { actions.push({ text: formatMessage({id: 'mobile.post_info.add_reaction', defaultMessage: 'Add Reaction'}), onPress: this.props.onAddReaction, diff --git a/app/screens/search/channel_display_name/channel_display_name.js b/app/screens/search/channel_display_name/channel_display_name.js index e30b2a5dc..f13227544 100644 --- a/app/screens/search/channel_display_name/channel_display_name.js +++ b/app/screens/search/channel_display_name/channel_display_name.js @@ -9,7 +9,7 @@ import {changeOpacity, makeStyleSheetFromTheme} from 'app/utils/theme'; export default class ChannelDisplayName extends PureComponent { static propTypes = { - displayName: PropTypes.string.isRequired, + displayName: PropTypes.string, theme: PropTypes.object.isRequired, }; diff --git a/app/screens/search/channel_display_name/index.js b/app/screens/search/channel_display_name/index.js index e4614e087..39b4f369d 100644 --- a/app/screens/search/channel_display_name/index.js +++ b/app/screens/search/channel_display_name/index.js @@ -16,7 +16,7 @@ function makeMapStateToProps() { const channel = getChannel(state, {id: post.channel_id}); return { - displayName: channel.display_name, + displayName: channel ? channel.display_name : '', theme: getTheme(state), }; }; diff --git a/app/screens/search/search_result_post/search_result_post.js b/app/screens/search/search_result_post/search_result_post.js index 93a5c86fa..566d2079d 100644 --- a/app/screens/search/search_result_post/search_result_post.js +++ b/app/screens/search/search_result_post/search_result_post.js @@ -40,6 +40,7 @@ export default class SearchResultPost extends PureComponent { postId={this.props.postId} {...postComponentProps} isSearchResult={true} + showAddReaction={false} showFullDate={this.props.showFullDate} navigator={this.props.navigator} /> From c3868251e1a8a0449a2fb47fbf814129bae2c6ae Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Fri, 27 Apr 2018 08:52:28 -0300 Subject: [PATCH 3/4] Bump iOS build number to 99 (#1635) --- ios/Mattermost.xcodeproj/project.pbxproj | 4 ++-- ios/Mattermost/Info.plist | 2 +- ios/MattermostShare/Info.plist | 2 +- ios/MattermostTests/Info.plist | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index 1e53b42f8..7598e3277 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -2468,7 +2468,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 98; + CURRENT_PROJECT_VERSION = 99; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; @@ -2517,7 +2517,7 @@ CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements; CODE_SIGN_IDENTITY = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 98; + CURRENT_PROJECT_VERSION = 99; DEAD_CODE_STRIPPING = NO; DEVELOPMENT_TEAM = UQ8HT4Q2XM; ENABLE_BITCODE = NO; diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist index beb6ca299..42318ba5a 100644 --- a/ios/Mattermost/Info.plist +++ b/ios/Mattermost/Info.plist @@ -34,7 +34,7 @@ CFBundleVersion - 98 + 99 ITSAppUsesNonExemptEncryption LSRequiresIPhoneOS diff --git a/ios/MattermostShare/Info.plist b/ios/MattermostShare/Info.plist index f62e4b23a..34af44e27 100644 --- a/ios/MattermostShare/Info.plist +++ b/ios/MattermostShare/Info.plist @@ -23,7 +23,7 @@ CFBundleShortVersionString 1.8.0 CFBundleVersion - 98 + 99 NSAppTransportSecurity NSAllowsArbitraryLoads diff --git a/ios/MattermostTests/Info.plist b/ios/MattermostTests/Info.plist index 17a6ff104..a93b4cbdf 100644 --- a/ios/MattermostTests/Info.plist +++ b/ios/MattermostTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 98 + 99 From 481197ba5d24e0da085a876b5257aa11bf62ed0e Mon Sep 17 00:00:00 2001 From: Elias Nahum Date: Fri, 27 Apr 2018 08:52:47 -0300 Subject: [PATCH 4/4] Bump Android build number to 99 (#1636) * Finish Android Share activity * Bump Android build number to 99 --- android/app/build.gradle | 2 +- android/app/src/main/AndroidManifest.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 6bd26a4ee..6a8b3f043 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -111,7 +111,7 @@ android { applicationId "com.mattermost.rnbeta" minSdkVersion 21 targetSdkVersion 23 - versionCode 98 + versionCode 99 versionName "1.8.0" multiDexEnabled true ndk { diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 5c2258d8a..dd03b9e4f 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -57,7 +57,8 @@ android:name="com.reactnativenavigation.controllers.NavigationActivity" android:configChanges="keyboard|keyboardHidden|orientation|screenSize"/>