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

Merge branch 'release-1.8'

Browse source
This commit is contained in:
Elias Nahum 2018-04-27 15:18:16 -03:00
commit ef8e99759d
No known key found for this signature in database
GPG key ID: E038DB71E0B61702
6 changed files with 7 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

@ -111,7 +111,7 @@ android {
applicationId "com.mattermost.rnbeta"
minSdkVersion 21
targetSdkVersion 23
versionCode 99
versionCode 100
versionName "1.8.0"
multiDexEnabled true
ndk {

2
app/components/file_attachment_list/file_attachment_image.js
View file

@ -138,7 +138,7 @@ export default class FileAttachmentImage extends PureComponent {
ref={this.handleCapturePreviewRef}
style={imageStyle}
defaultSource={thumb}
tintDefaultSource={true}
tintDefaultSource={!file.localPath}
filename={file.name}
resizeMode={resizeMode}
resizeMethod={resizeMethod}

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

@ -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 = 99;
CURRENT_PROJECT_VERSION = 100;
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 = 99;
CURRENT_PROJECT_VERSION = 100;
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>99</string>
<string>100</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

2
ios/MattermostShare/Info.plist
View file

@ -23,7 +23,7 @@
<key>CFBundleShortVersionString</key>
<string>1.8.0</string>
<key>CFBundleVersion</key>
<string>99</string>
<string>100</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>99</string>
<string>100</string>
</dict>
</plist>