Skip to content
GitLab
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
fde1d0f3
Commit
fde1d0f3
authored
Sep 10, 2018
by
Gijs Hendriksen
Browse files
Merge branch 'fix/events-deeplink' into 'master'
Fix events calendar deeplink See merge request
!202
parents
3dc6bb6b
b6652762
Changes
3
Hide whitespace changes
Inline
Side-by-side
android/app/build.gradle
View file @
fde1d0f3
...
...
@@ -108,8 +108,8 @@ android {
applicationId
"com.thaliapp"
minSdkVersion
rootProject
.
ext
.
minSdkVersion
targetSdkVersion
rootProject
.
ext
.
targetSdkVersion
versionCode
42
7
versionName
"2.4.
1
"
versionCode
42
8
versionName
"2.4.
2
"
ndk
{
abiFilters
"armeabi-v7a"
,
"x86"
}
...
...
app/sagas/deepLinking.js
View file @
fde1d0f3
...
...
@@ -8,7 +8,7 @@ import * as deepLinkingActions from '../actions/deepLinking';
import
*
as
pizzaActions
from
'
../actions/pizza
'
;
import
*
as
loginActions
from
'
../actions/session
'
;
import
*
as
eventActions
from
'
../actions/event
'
;
import
*
as
navigation
Actions
from
'
../actions/
navigation
'
;
import
*
as
calendar
Actions
from
'
../actions/
calendar
'
;
export
const
parseURL
=
(
url
)
=>
{
const
matches
=
new
RegExp
(
`^
${
siteURL
}
(/[^?]+)(?:\\?(.+))?`
).
exec
(
url
);
...
...
@@ -61,8 +61,8 @@ const deepLink = function* deepLink(action) {
},
{
regexp
:
new
RegExp
(
'
^/events/$
'
),
action
:
navigationActions
.
navigate
,
args
:
[
'
eventList
'
],
action
:
calendarActions
.
open
,
args
:
[],
},
];
...
...
ios/ThaliApp/Info.plist
View file @
fde1d0f3
...
...
@@ -17,11 +17,16 @@
<key>
CFBundlePackageType
</key>
<string>
APPL
</string>
<key>
CFBundleShortVersionString
</key>
<string>
2.4.
0
</string>
<string>
2.4.
2
</string>
<key>
CFBundleSignature
</key>
<string>
????
</string>
<key>
CFBundleVersion
</key>
<string>
12
</string>
<string>
13
</string>
<key>
LSApplicationQueriesSchemes
</key>
<array>
<string>
whatsapp
</string>
<string>
mailto
</string>
</array>
<key>
LSRequiresIPhoneOS
</key>
<true/>
<key>
NSAppTransportSecurity
</key>
...
...
@@ -71,10 +76,5 @@
</array>
<key>
UIViewControllerBasedStatusBarAppearance
</key>
<false/>
<key>
LSApplicationQueriesSchemes
</key>
<array>
<string>
whatsapp
</string>
<string>
mailto
</string>
</array>
</dict>
</plist>
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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