Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

[RELEASE] Merge DEVELOP into BETA#2538

Merged
rafaelks merged 6 commits intobetafrom
develop
Feb 6, 2019
Merged

[RELEASE] Merge DEVELOP into BETA#2538
rafaelks merged 6 commits intobetafrom
develop

Conversation

@rafaelks
Copy link
Copy Markdown
Contributor

@rafaelks rafaelks commented Feb 6, 2019

@RocketChat/ios

@rafaelks rafaelks added this to the 3.3.0 milestone Feb 6, 2019
voiceCallButton?.setTitle(model.voiceCallButtonText, for: .normal)

videoCallButton?.isHidden = !(AuthSettingsManager.settings?.isJitsiEnabled ?? false)
videoCallButton?.isHidden = !(AuthSettingsManager.settings?.isJitsiEnabled ?? false && AppManager.isVideoCallAvailable)
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Line Length Violation: Line should be 120 characters or less: currently 127 characters (line_length)

moved.append((source: mapIndex(sourceIndex - deleteOffset), target: mapIndex(targetIndex)))
}
} else {
}
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Statement Position Violation: Else and catch should be on the same line, one space after the previous declaration. (statement_position)

} else {
updatedElements?(targetElement)
undeletedElements?(targetElement)
}
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Statement Position Violation: Else and catch should be on the same line, one space after the previous declaration. (statement_position)

@rafaelks rafaelks merged commit 2f6311d into beta Feb 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants