Commit graph

8708 commits

Author SHA1 Message Date
ismailgulek
39e51fd400 Config 2020-08-10 18:16:07 +03:00
ismailgulek
f4b32dc4d5 Fix crash 2020-08-10 14:28:05 +03:00
ismailgulek
50b768766a Merge branch 'develop' into element_3452
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
2020-08-10 14:20:28 +03:00
ismailgulek
ab126993df Add push gateway rest client 2020-08-10 14:03:47 +03:00
ismailgulek
bbb18bdf09 Prepare for new sprint 2020-08-07 17:53:51 +03:00
ismailgulek
8ba0888992 Merge branch 'master' into develop 2020-08-07 17:53:45 +03:00
ismailgulek
9162e9ff50 Merge branch 'release/1.0.4/master' 2020-08-07 17:39:30 +03:00
ismailgulek
27acbe0c3f finish version++ 2020-08-07 17:39:30 +03:00
ismailgulek
884c8f9b0c
Merge pull request #3516 from vector-im/release/1.0.4/release
Release 1.0.4
2020-08-07 16:35:05 +03:00
ismailgulek
bb22056dc4 version++ 2020-08-07 16:12:22 +03:00
ismailgulek
7f0794139a Enable CallKit again 2020-08-07 15:20:11 +03:00
ismailgulek
a39edb81b8
Merge pull request #3515 from vector-im/element_3514
Polish Pin Screen
2020-08-06 18:33:58 +03:00
ismailgulek
2deb970bc8 Force orientation to portrait on phones 2020-08-06 16:54:58 +03:00
ismailgulek
66f4afc552 Hide cancel button if pin forced 2020-08-06 16:35:07 +03:00
ismailgulek
ad0d6b348f Make modal fullscreen 2020-08-06 16:34:21 +03:00
ismailgulek
d9dc80ec36 Introduce isPhone 2020-08-06 16:32:58 +03:00
ismailgulek
4c3b0a3db8
Merge pull request #3503 from vector-im/element_3483
Update Provisioning Link's Domain
2020-08-06 13:59:18 +03:00
ismailgulek
5532518447 Merge branch 'element_3483' of https://github.com/vector-im/element-ios into element_3483 2020-08-06 12:51:14 +03:00
ismailgulek
c021afcebf Fix paths 2020-08-06 12:48:20 +03:00
ismailgulek
4fe406d767
Merge branch 'develop' into element_3483 2020-08-06 11:38:25 +03:00
ismailgulek
ee6b0b88c3
Merge pull request #3511 from vector-im/reuse_base_bundle_identifier
Reuse Base Bundle Identifier
2020-08-06 11:37:42 +03:00
ismailgulek
1afb3de80f Fix path 2020-08-06 11:05:15 +03:00
ismailgulek
f7596b2994 Adapt new path 2020-08-06 11:02:37 +03:00
ismailgulek
324ae809c5
Merge pull request #3510 from vector-im/fix_repo_url
Read Repo Url and Name from the Current git Repository
2020-08-06 10:56:36 +03:00
ismailgulek
ddf71022fe Compose pusher app ids in BuildSettings 2020-08-06 10:51:39 +03:00
ismailgulek
d7ebbfca90 Fix interface orientation 2020-08-06 10:48:19 +03:00
ismailgulek
2f9b1842c5
Merge pull request #3504 from vector-im/element_3499
Rename Project
2020-08-06 10:46:53 +03:00
manuroe
2a810082a8 Prepare for new sprint 2020-08-06 07:49:01 +02:00
manuroe
2421c223cc Merge remote-tracking branch 'origin/master' into develop 2020-08-05 19:58:35 +02:00
Manu
42d1467b0b Merge branch 'release/1.0.3/master' 2020-08-05 19:39:36 +02:00
Manu
842b3179bf finish version++ 2020-08-05 19:39:36 +02:00
manuroe
85bac55770
Merge pull request #3512 from vector-im/release/1.0.3/release
Release 1.0.3
2020-08-05 18:58:43 +02:00
Manu
76ba80ab40 version++ 2020-08-05 18:31:26 +02:00
ismailgulek
1a947ae759 Merge branch 'develop' into reuse_base_bundle_identifier 2020-08-05 19:12:05 +03:00
ismailgulek
2b9f10ed87 Update CHANGES.rst 2020-08-05 18:59:48 +03:00
ismailgulek
3824896ef5 Remove redundant keys manually 2020-08-05 18:58:24 +03:00
SBiOSoftWhare
68b0200482
Merge pull request #3491 from vector-im/sizable_cell
Room: Create a base cell to manage default UI structure and create a self sizing base cell for child using auto layout
2020-08-05 16:40:26 +02:00
ismailgulek
dbb94e5114 Remove pusher ids from plist 2020-08-05 17:12:21 +03:00
ismailgulek
8e9806da65 Use new variables 2020-08-05 17:11:46 +03:00
ismailgulek
2f9fc18702 Add Info.plist values to BuildSettings 2020-08-05 17:11:06 +03:00
ismailgulek
71131a208d Add Info.plist variables 2020-08-05 17:10:32 +03:00
ismailgulek
ae70a4bed0 Use keychain access group config in entitlements 2020-08-05 17:05:10 +03:00
ismailgulek
db4110ab46 Add keychain access group common config 2020-08-05 17:04:30 +03:00
ismailgulek
0439ce6c2f
Merge pull request #3505 from vector-im/element_3467
Fix Custom Homeserver Textfield on AuthenticationViewController
2020-08-05 16:40:51 +03:00
ismailgulek
2aef5f33f0 Move scroll method to an extension 2020-08-05 15:22:27 +03:00
manuroe
1ff5de918b
Merge pull request #3509 from vector-im/fix-ci
[Internal] [CI] Fix switcheroo logic
2020-08-05 14:13:54 +02:00
ismailgulek
09208741d9 Read repo url and name from current git repo 2020-08-05 15:10:26 +03:00
Olivier Halligon
0d10dd7509 Fix switcheroo logic: we need to also edit the :tag => s.version.to_s from the MatrixKit.podspec
So that it downloads from the branch and not the tag when using that podspec in the Podfile
2020-08-05 13:58:32 +02:00
ismailgulek
e78c5db15d Move scroll logic to KeyboardAvoider 2020-08-05 14:49:37 +03:00
ismailgulek
38bd9fe85a Call super initializer on KeyboardAvoider 2020-08-05 14:16:42 +03:00