toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2130 from mattermost/release-1.12

Browse source 
Merge Release 1.12
This commit is contained in:
Elias Nahum 2018-09-17 09:12:27 -03:00 committed by GitHub
commit 6471bcbed3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/app/build.gradle
View file

@ -113,7 +113,7 @@ android {
applicationId "com.mattermost.rnbeta"
minSdkVersion 21
targetSdkVersion 26
versionCode 141
versionCode 142
versionName "1.12.0"
multiDexEnabled = true
ndk {

7
app/components/options_context/options_context.ios.js
View file

@ -50,10 +50,14 @@ export default class OptionsContext extends PureComponent {
}
};
handleShow = () => {
this.isShowing = true;
this.props.toggleSelected(true);
}
handleShowUnderlay = () => {
this.beforeShow();
this.props.toggleSelected(true);
this.isShowing = this.state.actions.length > 0;
};
hide = () => {
@ -93,6 +97,7 @@ export default class OptionsContext extends PureComponent {
arrowDirection='down'
longPress={true}
onHide={this.handleHide}
onShow={this.handleShow}
onPress={this.handlePress}
underlayColor='transparent'
>

4
ios/Mattermost.xcodeproj/project.pbxproj
View file

@ -2427,7 +2427,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 141;
CURRENT_PROJECT_VERSION = 142;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;
@ -2476,7 +2476,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 141;
CURRENT_PROJECT_VERSION = 142;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;

2
ios/Mattermost/Info.plist
View file

@ -34,7 +34,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>141</string>
<string>142</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

2
ios/MattermostShare/Info.plist
View file

@ -23,7 +23,7 @@
<key>CFBundleShortVersionString</key>
<string>1.12.0</string>
<key>CFBundleVersion</key>
<string>141</string>
<string>142</string>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>

2
ios/MattermostTests/Info.plist
View file

@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>141</string>
<string>142</string>
</dict>
</plist>