Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
ThaliApp
Commits
d0c8728f
Commit
d0c8728f
authored
May 30, 2019
by
Sébastiaan Versteeg
Browse files
Merge branch 'release-ready' into 'master'
Release ready See merge request
!265
parents
5536f3de
6af47279
Changes
5
Hide whitespace changes
Inline
Side-by-side
android/app/build.gradle
View file @
d0c8728f
...
...
@@ -37,7 +37,7 @@ android {
applicationId
"com.thaliapp"
minSdkVersion
rootProject
.
ext
.
minSdkVersion
targetSdkVersion
rootProject
.
ext
.
targetSdkVersion
versionCode
43
1
versionCode
43
3
versionName
"2.7.0"
}
...
...
android/app/src/main/AndroidManifest.xml
View file @
d0c8728f
...
...
@@ -49,7 +49,6 @@
<action
android:name=
"com.google.firebase.INSTANCE_ID_EVENT"
/>
</intent-filter>
</service>
<service
android:name=
"io.invertase.firebase.messaging.RNFirebaseBackgroundMessagingService"
/>
<meta-data
android:name=
"com.google.firebase.messaging.default_notification_color"
...
...
app/ui/components/searchHeader/style/SearchHeader.js
View file @
d0c8728f
...
...
@@ -17,6 +17,7 @@ const styles = StyleSheet.create({
borderBottomColor
:
Colors
.
darkMagenta
,
borderBottomWidth
:
1
,
},
overflow
:
'
hidden
'
,
},
appBar
:
{
backgroundColor
:
Colors
.
magenta
,
...
...
index.js
View file @
d0c8728f
...
...
@@ -10,5 +10,10 @@ import App from './app/app';
Sentry
.
config
(
SENTRY_DSN
).
install
();
Sentry
.
setTagsContext
({
// eslint-disable-next-line no-undef
environment
:
__DEV__
?
'
development
'
:
'
production
'
,
react
:
true
,
});
AppRegistry
.
registerComponent
(
'
ThaliApp
'
,
()
=>
App
);
ios/ThaliApp.xcodeproj/project.pbxproj
View file @
d0c8728f
...
...
@@ -8,7 +8,6 @@
/* Begin PBXBuildFile section */
00C302E51ABCBA2D00DB3ED1
/* libRCTActionSheet.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
00C302AC1ABCB8CE00DB3ED1
/* libRCTActionSheet.a */
;
};
00C302E71ABCBA2D00DB3ED1
/* libRCTGeolocation.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
00C302BA1ABCB90400DB3ED1
/* libRCTGeolocation.a */
;
};
00C302E81ABCBA2D00DB3ED1
/* libRCTImage.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
00C302C01ABCB91800DB3ED1
/* libRCTImage.a */
;
};
00C302E91ABCBA2D00DB3ED1
/* libRCTNetwork.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
00C302DC1ABCB9D200DB3ED1
/* libRCTNetwork.a */
;
};
00C302EA1ABCBA2D00DB3ED1
/* libRCTVibration.a in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
00C302E41ABCB9EE00DB3ED1
/* libRCTVibration.a */
;
};
...
...
@@ -78,13 +77,6 @@
remoteGlobalIDString
=
134814201AA4EA6300B7C361
;
remoteInfo
=
RCTActionSheet
;
};
00C302B91ABCB90400DB3ED1
/* PBXContainerItemProxy */
=
{
isa
=
PBXContainerItemProxy
;
containerPortal
=
00C302B51ABCB90400DB3ED1
/* RCTGeolocation.xcodeproj */
;
proxyType
=
2
;
remoteGlobalIDString
=
134814201AA4EA6300B7C361
;
remoteInfo
=
RCTGeolocation
;
};
00C302BF1ABCB91800DB3ED1
/* PBXContainerItemProxy */
=
{
isa
=
PBXContainerItemProxy
;
containerPortal
=
00C302BB1ABCB91800DB3ED1
/* RCTImage.xcodeproj */
;
...
...
@@ -447,7 +439,6 @@
/* Begin PBXFileReference section */
008F07F21AC5B25A0029DE68
/* main.jsbundle */
=
{
isa
=
PBXFileReference
;
fileEncoding
=
4
;
lastKnownFileType
=
text
;
path
=
main.jsbundle
;
sourceTree
=
"<group>"
;
};
00C302A71ABCB8CE00DB3ED1
/* RCTActionSheet.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
RCTActionSheet.xcodeproj
;
path
=
"../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj"
;
sourceTree
=
"<group>"
;
};
00C302B51ABCB90400DB3ED1
/* RCTGeolocation.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
RCTGeolocation.xcodeproj
;
path
=
"../node_modules/react-native/Libraries/Geolocation/RCTGeolocation.xcodeproj"
;
sourceTree
=
"<group>"
;
};
00C302BB1ABCB91800DB3ED1
/* RCTImage.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
RCTImage.xcodeproj
;
path
=
"../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"
;
sourceTree
=
"<group>"
;
};
00C302D31ABCB9D200DB3ED1
/* RCTNetwork.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
RCTNetwork.xcodeproj
;
path
=
"../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"
;
sourceTree
=
"<group>"
;
};
00C302DF1ABCB9EE00DB3ED1
/* RCTVibration.xcodeproj */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
"wrapper.pb-project"
;
name
=
RCTVibration.xcodeproj
;
path
=
"../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"
;
sourceTree
=
"<group>"
;
};
...
...
@@ -539,7 +530,6 @@
11D1A2F320CAFA9E000508D9
/* libRCTAnimation.a in Frameworks */
,
146834051AC3E58100842450
/* libReact.a in Frameworks */
,
00C302E51ABCBA2D00DB3ED1
/* libRCTActionSheet.a in Frameworks */
,
00C302E71ABCBA2D00DB3ED1
/* libRCTGeolocation.a in Frameworks */
,
00C302E81ABCBA2D00DB3ED1
/* libRCTImage.a in Frameworks */
,
133E29F31AD74F7200F7D852
/* libRCTLinking.a in Frameworks */
,
00C302E91ABCBA2D00DB3ED1
/* libRCTNetwork.a in Frameworks */
,
...
...
@@ -588,14 +578,6 @@
name
=
Products
;
sourceTree
=
"<group>"
;
};
00C302B61ABCB90400DB3ED1
/* Products */
=
{
isa
=
PBXGroup
;
children
=
(
00C302BA1ABCB90400DB3ED1
/* libRCTGeolocation.a */
,
);
name
=
Products
;
sourceTree
=
"<group>"
;
};
00C302BC1ABCB91800DB3ED1
/* Products */
=
{
isa
=
PBXGroup
;
children
=
(
...
...
@@ -862,7 +844,6 @@
146833FF1AC3E56700842450
/* React.xcodeproj */
,
00C302A71ABCB8CE00DB3ED1
/* RCTActionSheet.xcodeproj */
,
ADBDB91F1DFEBF0600ED6528
/* RCTBlob.xcodeproj */
,
00C302B51ABCB90400DB3ED1
/* RCTGeolocation.xcodeproj */
,
00C302BB1ABCB91800DB3ED1
/* RCTImage.xcodeproj */
,
78C398B01ACF4ADC00677621
/* RCTLinking.xcodeproj */
,
00C302D31ABCB9D200DB3ED1
/* RCTNetwork.xcodeproj */
,
...
...
@@ -1058,10 +1039,6 @@
ProductGroup
=
ADBDB9201DFEBF0600ED6528
/* Products */
;
ProjectRef
=
ADBDB91F1DFEBF0600ED6528
/* RCTBlob.xcodeproj */
;
},
{
ProductGroup
=
00C302B61ABCB90400DB3ED1
/* Products */
;
ProjectRef
=
00C302B51ABCB90400DB3ED1
/* RCTGeolocation.xcodeproj */
;
},
{
ProductGroup
=
00C302BC1ABCB91800DB3ED1
/* Products */
;
ProjectRef
=
00C302BB1ABCB91800DB3ED1
/* RCTImage.xcodeproj */
;
...
...
@@ -1145,13 +1122,6 @@
remoteRef
=
00C302AB1ABCB8CE00DB3ED1
/* PBXContainerItemProxy */
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
00C302BA1ABCB90400DB3ED1
/* libRCTGeolocation.a */
=
{
isa
=
PBXReferenceProxy
;
fileType
=
archive.ar
;
path
=
libRCTGeolocation.a
;
remoteRef
=
00C302B91ABCB90400DB3ED1
/* PBXContainerItemProxy */
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
00C302C01ABCB91800DB3ED1
/* libRCTImage.a */
=
{
isa
=
PBXReferenceProxy
;
fileType
=
archive.ar
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment