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

Merge pull request #1924 from mattermost/release-1.10

Browse source 
Merge Release 1.10 into master
This commit is contained in:
Elias Nahum 2018-07-13 09:35:07 -04:00 committed by GitHub
commit 977575e4b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 13 additions and 14 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 23
versionCode 126
versionCode 127
versionName "1.10.0"
ndk {
abiFilters "armeabi-v7a", "x86"

5
app/components/autocomplete/autocomplete.js
View file

@ -85,10 +85,6 @@ export default class Autocomplete extends PureComponent {
}
render() {
if (!this.props.value) {
return null;
}
const style = getStyleFromTheme(this.props.theme);
const wrapperStyle = [];
@ -110,6 +106,7 @@ export default class Autocomplete extends PureComponent {
}
}
const listHeight = this.listHeight();
return (
<View style={wrapperStyle}>
<View style={containerStyle}>

2
app/components/post_textbox/post_textbox.js
View file

@ -424,6 +424,8 @@ export default class PostTextbox extends PureComponent {
const {error} = await actions.executeCommand(msg, channelId, rootId);
if (error) {
this.handleTextChange(msg);
this.changeDraft(msg);
Alert.alert(
intl.formatMessage({
id: 'mobile.commands.error_title',

2
app/components/sidebars/main/main_sidebar.js
View file

@ -226,7 +226,7 @@ export default class ChannelSidebar extends Component {
return;
}
this.selectChannel(result.data.channel, currentChannelId);
this.selectChannel(result.data.channel || result.data, currentChannelId);
};
onPageSelected = (index) => {

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

@ -2531,7 +2531,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 126;
CURRENT_PROJECT_VERSION = 127;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = UQ8HT4Q2XM;
ENABLE_BITCODE = NO;
@ -2581,7 +2581,7 @@
CODE_SIGN_ENTITLEMENTS = Mattermost/Mattermost.entitlements;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CURRENT_PROJECT_VERSION = 126;
CURRENT_PROJECT_VERSION = 127;
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>126</string>
<string>127</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

2
ios/MattermostShare/Info.plist
View file

@ -23,7 +23,7 @@
<key>CFBundleShortVersionString</key>
<string>1.10.0</string>
<key>CFBundleVersion</key>
<string>126</string>
<string>127</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>126</string>
<string>127</string>
</dict>
</plist>

4
package-lock.json generated
View file

@ -14703,8 +14703,8 @@
}
},
"react-native-fetch-blob": {
"version": "github:enahum/react-native-fetch-blob#729c4b49b2e2195b1793c4d3490ab67cb9a8e472",
"from": "github:enahum/react-native-fetch-blob#729c4b49b2e2195b1793c4d3490ab67cb9a8e472",
"version": "github:enahum/react-native-fetch-blob#d6017264dce8704b43a365791be42f09b66b9e9f",
"from": "github:enahum/react-native-fetch-blob#d6017264dce8704b43a365791be42f09b66b9e9f",
"requires": {
"base-64": "0.1.0",
"glob": "7.0.6"

2
package.json
View file

@ -32,7 +32,7 @@
"react-native-drawer-layout": "2.0.0",
"react-native-exception-handler": "2.7.5",
"react-native-fast-image": "4.0.8",
"react-native-fetch-blob": "enahum/react-native-fetch-blob.git#729c4b49b2e2195b1793c4d3490ab67cb9a8e472",
"react-native-fetch-blob": "enahum/react-native-fetch-blob.git#d6017264dce8704b43a365791be42f09b66b9e9f",
"react-native-image-gallery": "enahum/react-native-image-gallery#a98b1051e94f5a394541ca1ff9b15e2c9ffed84f",
"react-native-image-picker": "0.26.7",
"react-native-keyboard-aware-scroll-view": "0.5.0",