Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Donner la possibilité de créer un sondage depuis l'iPhone #900

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Btchap/Config/BuildSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ final class BuildSettings: NSObject {

// MARK: - Polls

static let pollsEnabled = false //true : Currently disabled in Tchap.
static let pollsEnabled = true
static var pollsHistoryEnabled: Bool = false

// MARK: - Location Sharing
Expand Down
2 changes: 1 addition & 1 deletion Config/BuildSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ final class BuildSettings: NSObject {

// MARK: - Polls

static let pollsEnabled = false //true : Currently disabled in Tchap.
static let pollsEnabled = true
static var pollsHistoryEnabled: Bool = false

// MARK: - Location Sharing
Expand Down
2 changes: 1 addition & 1 deletion DevTchap/Config/BuildSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ final class BuildSettings: NSObject {

// MARK: - Polls

static let pollsEnabled = false //true : Currently disabled in Tchap.
static let pollsEnabled = true
static var pollsHistoryEnabled: Bool = false

// MARK: - Location Sharing
Expand Down
2 changes: 1 addition & 1 deletion Riot/Modules/Room/RoomCoordinator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ extension RoomCoordinator: RoomViewControllerDelegate {
}

func roomViewControllerDidRequestPollCreationFormPresentation(_ roomViewController: RoomViewController) {
// startEditPollCoordinator()
startEditPollCoordinator()
}

func roomViewControllerDidRequestLocationSharingFormPresentation(_ roomViewController: RoomViewController) {
Expand Down
2 changes: 1 addition & 1 deletion Riot/Modules/Room/RoomDisplayConfiguration.swift
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class RoomDisplayConfiguration: NSObject {
super.init()
}

static let `default`: RoomDisplayConfiguration = RoomDisplayConfiguration(callsEnabled: true,
static let `default`: RoomDisplayConfiguration = RoomDisplayConfiguration(callsEnabled: false, // Tchap: don't allow calls.
integrationsEnabled: true,
jitsiWidgetRemoverEnabled: true,
sendingPollsEnabled: true)
Expand Down
4 changes: 2 additions & 2 deletions Riot/Modules/Room/RoomViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ + (instancetype)roomViewController
{
RoomViewController *controller = [[[self class] alloc] initWithNibName:NSStringFromClass(self.class)
bundle:[NSBundle bundleForClass:self.class]];
// controller.displayConfiguration = [RoomDisplayConfiguration default];
controller.displayConfiguration = [RoomDisplayConfiguration default];
return controller;
}

Expand All @@ -270,7 +270,7 @@ + (instancetype)instantiateWithConfiguration:(RoomDisplayConfiguration *)configu
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:[NSBundle mainBundle]];
NSString *storyboardId = [NSString stringWithFormat:@"%@StoryboardId", self.className];
RoomViewController *controller = [storyboard instantiateViewControllerWithIdentifier:storyboardId];
// controller.displayConfiguration = configuration;
controller.displayConfiguration = configuration;
return controller;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import GBDeviceInfo

extension RoomInputToolbarView {
open override func sendCurrentMessage() {
// Tchap fix : don't autocorrecxt if it is a command (starts with a '/')
// Tchap fix : don't autocorrect if it is a command (starts with a '/')
// Tchap fix will be removed when Element fix will come via rebase (https://github.com/vector-im/element-ios/pull/7462)
// Triggers auto-correct if needed and if it is not a command.
let isCommand = self.textMessage.hasPrefix("/")
Expand Down
2 changes: 1 addition & 1 deletion RiotNSE/BuildSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ final class BuildSettings: NSObject {

// MARK: - Polls

static let pollsEnabled = false //true : Currently disabled in Tchap.
static let pollsEnabled = true
static var pollsHistoryEnabled: Bool = false

// MARK: - Location Sharing
Expand Down
2 changes: 1 addition & 1 deletion RiotShareExtension/BuildSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ final class BuildSettings: NSObject {

// MARK: - Polls

static let pollsEnabled = false //true : Currently disabled in Tchap.
static let pollsEnabled = true
static var pollsHistoryEnabled: Bool = false

// MARK: - Location Sharing
Expand Down
2 changes: 1 addition & 1 deletion Tchap/Config/BuildSettings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ final class BuildSettings: NSObject {

// MARK: - Polls

static let pollsEnabled = false //true : Currently disabled in Tchap.
static let pollsEnabled = true
static var pollsHistoryEnabled: Bool = false

// MARK: - Location Sharing
Expand Down
1 change: 1 addition & 0 deletions changelog.d/899.feature
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Donner la possibilité de créer un sondage depuis l'iPhone
Loading