Commit Graph

5764 Commits

Author SHA1 Message Date
SBiOSoftWhare 3a99cbf0b5 MXKRoomBubbleTableViewCell+Riot: Add possibility to hide edit button on selection. 2019-05-07 16:49:12 +02:00
manuroe dca451206a Merge pull request #2407 from vector-im/riot_2404_1
RoomInputToolbarView: Turn the boolean replyToEnabled into an enum: sendMode
2019-04-30 17:35:46 +02:00
manuroe dd486e9f22 RoomVC: When replying, use a "Reply" button instead of "Send" 2019-04-30 17:27:57 +02:00
manuroe 2376de39b5 RoomInputToolbarView: Turn the boolean replyToEnabled into an enum: sendMode
because message editing (#2404) is coming
2019-04-30 17:08:52 +02:00
manuroe ca060479ce Merge pull request #2390 from fridtjof/patch-1
Readme: 'pod update' should be 'pod setup' for updating CocoaPods repos
2019-04-30 11:09:22 +02:00
SBiOSoftWhare 8760164582 Merge pull request #2391 from vector-im/fix_room_details_navigation
Fix room details navigation
2019-04-29 16:08:52 +02:00
SBiOSoftWhare 76efbd8f1f Fix room details navigation from rooms list. 2019-04-29 14:24:20 +02:00
SBiOSoftWhare d04146d095 Add restoreInitialDisplay parameter on -[AppDelegate showRoom:andEventId:withMatrixSession:] method to choose to display a room from home tab or not. 2019-04-29 14:22:01 +02:00
Fridtjof Mund 6a29923c68 Readme: 'pod update' should be 'pod setup' for updating CocoaPods repos 2019-04-29 14:21:40 +02:00
SBiOSoftWhare 369498cfd0 Merge pull request #2388 from vector-im/clean_build_settings
Project configuration: Clean search paths and flags build settings
2019-04-29 13:56:34 +02:00
SBiOSoftWhare 62b67a8c7b Clean search paths and flags build settings in all targets and use $(inherited) value where needed. 2019-04-26 18:04:03 +02:00
manuroe 47941b2697 Add a description for NSCalendarsUsageDescription
This permission has been introduced by the jitsi update.
2019-04-26 15:42:05 +02:00
manuroe 72bb37af7d Strings.swift 2019-04-26 15:11:20 +02:00
manuroe 7dc29edca1 Add a description for NSCalendarsUsageDescription
This permission has been introduced by the jitsi update.
2019-04-26 15:10:56 +02:00
SBiOSoftWhare 35aac68b79 Set project and share extension deployment target to iOS 10.0. 2019-04-26 14:58:49 +02:00
manuroe 06f6b937ca Merge pull request #2387 from vector-im/build_release
Build: Add a sh build script
2019-04-26 11:43:47 +02:00
manuroe 9272d92063 Merge pull request #2378 from aaronraimist/homeserver
home server -> homeserver (#2345)
2019-04-26 11:41:47 +02:00
manuroe 6c3717b969 Build: Add a sh build script 2019-04-26 11:30:21 +02:00
manuroe e466265720 Build: Add a sh build script 2019-04-26 11:14:11 +02:00
SBiOSoftWhare fe5b287a0e Merge pull request #2365 from vector-im/prepare_riot_2231
Key backup: Display the restore button only if required (WIP)
2019-04-25 17:04:12 +02:00
SBiOSoftWhare 12ea51e67b Handle button title for restore action case in SettingsKeyBackupTableViewSection. 2019-04-25 16:10:22 +02:00
SBiOSoftWhare 866689f0a1 Merge develop into prepare_riot_2231 2019-04-25 15:59:32 +02:00
SBiOSoftWhare fe14d75e8a Merge pull request #2386 from vector-im/remove_iOS9_code
Remove code used for iOS 9 only
2019-04-25 12:33:55 +02:00
SBiOSoftWhare bd2dadfaad Merge branch 'develop' into remove_iOS9_code 2019-04-25 12:33:47 +02:00
SBiOSoftWhare 130fe72db3 Merge pull request #2385 from vector-im/fastfile_icloud
Fastfile: Set iCloud container environment
2019-04-25 12:33:09 +02:00
SBiOSoftWhare 7ad8790ca3 Remove check for +[UIFont systemFontOfSize:weight:] availability. 2019-04-25 12:27:31 +02:00
SBiOSoftWhare 079ac6335e Update changes 2019-04-25 11:57:16 +02:00
SBiOSoftWhare 29bb68cfc3 Remove iOS 10 availability condition in MasterTabBarController. 2019-04-25 11:53:38 +02:00
SBiOSoftWhare 5b5780bc19 Remove iOS 9 local notification API usage 2019-04-25 11:52:33 +02:00
SBiOSoftWhare 8957e3a71a Update changes 2019-04-25 11:23:07 +02:00
manuroe 13812d5869 Update Riot/Assets/de.lproj/Vector.strings
Co-Authored-By: aaronraimist <aaron@raim.ist>
2019-04-24 14:02:07 -05:00
manuroe 48cc2d1cc3 Update Riot/Assets/de.lproj/Vector.strings
Co-Authored-By: aaronraimist <aaron@raim.ist>
2019-04-24 14:02:02 -05:00
manuroe d084b65194 Update Riot/Assets/de.lproj/Vector.strings
Co-Authored-By: aaronraimist <aaron@raim.ist>
2019-04-24 14:01:49 -05:00
SBiOSoftWhare a2fb1fdb94 Merge pull request #2382 from vector-im/media_picker_retain_cycles
[Media picker] Fix some retain cycles
2019-04-24 20:39:26 +02:00
manuroe b925792ea3 Merge pull request #2369 from neutralinsomniac/fix_full_width_at
Fix remaining full-width '%' symbols in strings
2019-04-24 18:36:33 +02:00
SBiOSoftWhare c76bc0244c Update changes 2019-04-24 17:59:44 +02:00
SBiOSoftWhare 1a541713e2 Use a weak reference for mediaPicker property in RoomInputToobarView. 2019-04-24 17:56:59 +02:00
SBiOSoftWhare 59cc14fa6c [Media Picker] Fix some retain cycles and fix implicit self warnings. 2019-04-24 17:56:03 +02:00
SBiOSoftWhare 62dbb63e9b Merge pull request #2377 from vector-im/riot_1483
Jitsi integration: Use the matching WebRTC framework
2019-04-24 16:37:15 +02:00
SBiOSoftWhare 16bee22b6a Merge develop into riot_1483 2019-04-24 16:28:51 +02:00
manuroe 65b2128f6a Update Riot/Modules/Integrations/Widgets/Jitsi/JitsiViewController.m
Co-Authored-By: SBiOSoftWhare <SBiOSoftWhare@users.noreply.github.com>
2019-04-24 15:55:51 +02:00
manuroe c6cd2d0b46 Merge pull request #2372 from vector-im/riot_2323
E2E: SAS Verification
2019-04-24 14:51:04 +02:00
manuroe d1dab78c34 Device Verification: Add a view model to DeviceVerificationDataLoadingViewController 2019-04-24 14:42:16 +02:00
manuroe 3f669d39ee Device Verification: Update SDK constant names changes 2019-04-24 10:35:56 +02:00
manuroe e9cef1ccb1 Merge pull request #2381 from vector-im/riot_2375_more
Clarify key backup details when backup exists but is not trusted in b…
2019-04-24 10:30:05 +02:00
manuroe 620be4497a Clarify key backup details when backup exists but is not trusted in banner too
This follows changes made by https://github.com/vector-im/riot-ios/pull/2375
2019-04-24 10:23:27 +02:00
manuroe 74003e19bc Merge pull request #2375 from jryans/connect-key-backup
Clarify key backup details when backup exists but is not trusted
2019-04-24 09:58:46 +02:00
manuroe 6eb42328dd Template: BridgePresenter: Add a completion block to dismissWithAnimated method 2019-04-24 08:57:58 +02:00
manuroe 6b099d5a85 Device Verification: Make incoming requests dialogs dequeueing work without a random sleep 2019-04-24 08:55:45 +02:00
manuroe 7d73552fa2 Device Verification: Remove a TODO 2019-04-24 08:23:44 +02:00