Commit Graph

425 Commits

Author SHA1 Message Date
ismailgulek 0fbadef41a Merge branch 'element_3483' of https://github.com/vector-im/element-ios into element_3483 2020-08-06 12:51:14 +03:00
ismailgulek 0f53a5d5fb Fix paths 2020-08-06 12:48:20 +03:00
ismailgulek afc641a0a4 Merge branch 'develop' into element_3483 2020-08-06 11:38:25 +03:00
ismailgulek e028c1205d Adapt new path 2020-08-06 11:02:37 +03:00
ismailgulek 272b9909e1 Remove pusher ids from plist 2020-08-05 17:12:21 +03:00
ismailgulek 704f09e65b Namespace some settings 2020-08-03 16:07:39 +03:00
manuroe 406f64e666 BuildSettings: Integrate Sygnal URL 2020-07-31 12:12:05 +02:00
manuroe 6601c60755 BuildSettings: Integrate integrations 2020-07-31 11:33:29 +02:00
manuroe 0258bdddf6 BuildSettings: Integrate stunServerFallback 2020-07-31 08:49:30 +02:00
ismailgulek 3b65378fa3 Integrate alloLocalContactsAccess at more points 2020-07-30 16:54:54 +03:00
manuroe 98923bfc91 Merge branch 'develop' into no_voip_stack_build 2020-07-29 11:00:55 +02:00
manuroe a423e9f636 Merge branch 'develop' into appConfig 2020-07-29 10:59:23 +02:00
manuroe c4e4812394 AppConfig: Rename files to CommonConfiguration and AppConfiguration 2020-07-29 10:13:43 +02:00
manuroe 2e0ee3bb7d AppConfig: Fix Steve's remarks 2020-07-29 10:05:45 +02:00
manuroe 5587dbb9bf Config: Cut AppConfig into Config and AppConfig
so that the app can have its own configuration
2020-07-28 17:20:14 +02:00
manuroe c70f859470 AppConfig: Gather more configuration settings 2020-07-28 16:17:22 +02:00
manuroe 3f67b4d0e3 AppConfig: A central point to configure app settings 2020-07-24 18:35:37 +02:00
ismailgulek 26938fca0b Use unlock view mode from app delegate 2020-07-24 17:55:03 +03:00
manuroe 26cf320488 Build: Make the app build if JitsiMeetSDK is not in the Podfile.
We already had a mechanism to automatically build VoIP according to the presence of the webrtc pod file. Do the same but for conference calls.
2020-07-23 17:25:24 +02:00
ismailgulek 98edf7558a Fix Manus comments 2020-07-22 22:45:20 +03:00
ismailgulek daaf51e730 Fix comments of Steve 2020-07-22 17:47:45 +03:00
ismailgulek 608d7bd381 Merge branch 'develop' into element_3436 2020-07-21 19:38:24 +03:00
ismailgulek fe7dff7533 UI arrangements 2020-07-21 19:32:48 +03:00
manuroe d975abe08d MajorUpdateManager: Attempt a dispatch_async
to make the "Riot is now element" popup displayed
2020-07-21 16:41:31 +02:00
ismailgulek 5ce6a3799a Implement unlocker 2020-07-21 16:16:52 +03:00
ismailgulek 96c0b8c2b1 Merge branch 'develop' into riot_3389 2020-07-16 10:38:25 +03:00
ismailgulek 48348e6dd6 Enable lazy loading by default 2020-07-14 16:11:32 +03:00
SBiOSoftWhare abb4af8d00 Major update: Fix learn more acrtion. 2020-07-11 09:53:19 +02:00
Steve Barré a6f0ed3c83 Merge branch 'add_major_update_modal' into 'rebranding'
Add major update modal

See merge request new-vector/element/element-ios!29
2020-07-10 19:35:18 +00:00
SBiOSoftWhare 5978de0e28 AppDelegate: Handle major update display. 2020-07-10 21:28:57 +02:00
Neil Alexander 17931cbebb Load animation, colour corrections, fixed launch screen
Squashed commit of the following:

commit e11d0e589469db9ead0d96449f9e31677edb2031
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:59:30 2020 +0100

    Fix colour in launch screen

commit aa59e85d309433a05992e446bdd789b59b87089d
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:57:01 2020 +0100

    Display -> display

commit 6da06421bedfe7aff6a0ff1dff4360685e708cf2
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:55:20 2020 +0100

    P3 colours

commit b1fc009ab9002eb75403c287ce75bdbf08e222cd
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:52:22 2020 +0100

    Update Riot.xcodeproj

commit ac1d994c6eb3f863f5310364ee4582476d59b76e
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:44:41 2020 +0100

    Revert changes to Images.swift and Storyboards.swift

commit 27c88f9b3ba7c22efd19f6e8aa17c2af17f3289b
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:25:08 2020 +0100

    Add animation source files

commit d19ccd50009280b45f3165e1a2a03a2bd241ccf7
Merge: 76500cda 2ed92204
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:18:04 2020 +0100

    Fix launch screen and update loading screen

    Merge commit '2ed92204' into rebranding

commit 2ed922045cd6381202b8d7bb80136f8b24a95141
Author: Neil Alexander <neilalexander@users.noreply.github.com>
Date:   Fri Jul 10 17:13:56 2020 +0100

    Fix launch screen, smooth transition to loading animation
2020-07-10 17:59:57 +01:00
SBiOSoftWhare 61e0e53458 Update CallKit icon. 2020-07-09 21:51:37 +02:00
SBiOSoftWhare a02da7d522 AppDelegate: Update launch loading view. 2020-07-08 23:28:24 +02:00
SBiOSoftWhare 22c736bfd1 Bot: Disable bot creation for the moment. 2020-07-08 17:34:50 +02:00
ismailgulek 9c9d8aebd8 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Gemfile.lock
#	Riot.xcodeproj/project.pbxproj
#	Riot/SupportingFiles/Info.plist
#	RiotShareExtension/SupportingFiles/Info.plist
#	SiriIntents/Info.plist
2020-07-01 09:59:29 +03:00
SBiOSoftWhare e4938d088c Refactor cross signing banner. 2020-06-30 21:46:10 +02:00
SBiOSoftWhare 09bc24e850 AppDelegate: Handle KeyVerificationBannerPreferences. 2020-06-30 17:33:42 +02:00
ismailgulek 7878354243 Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
2020-06-26 17:33:09 +03:00
SBiOSoftWhare 17c5cdf06e Refactoring secure backup references. 2020-06-26 13:07:53 +02:00
SBiOSoftWhare 42e49bc080 MXSession+Riot: Use vc prefix as other extensions. 2020-06-25 10:23:24 +02:00
manuroe 7901907770 E2E by default: Disable it if the HS admin disabled it
#3305
2020-06-24 17:08:14 +02:00
ismailgulek bd6546ca48 Disable message highlighting when app opened from a notification 2020-06-15 13:49:22 +03:00
ismailgulek ff2c8b8ab8 Pass eventId when navigating to room from notification 2020-06-09 17:51:07 +03:00
ismailgulek 3c383364ca Merge branch 'develop' into xcode11
# Conflicts:
#	CHANGES.rst
2020-06-05 16:00:24 +03:00
SBiOSoftWhare c353f2dd90 AppDelegate: Fix typo. 2020-06-05 12:47:50 +02:00
SBiOSoftWhare 80a3183099 Timeline: Hide undecryptable messages that were sent while the user was not in the room. 2020-06-04 17:31:23 +02:00
ismailgulek 422a0fc9dc Clear old notification handling from PushNotificationService, fix notification doubling 2020-06-03 15:08:53 +03:00
ismailgulek eb009704da Merge pull request #3268 from vector-im/remove_pushkit
Remove PushKit
2020-05-29 12:34:20 +03:00
SBiOSoftWhare d54a226614 Merge branch 'develop' into xcode11 2020-05-28 16:30:09 +02:00
SBiOSoftWhare c2d48946a7 Call: Improve new call observer in AppDelegate. 2020-05-27 16:02:39 +02:00