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

[RELEASE] Merge DEVELOP into BETA#2532

Merged
rafaelks merged 163 commits intobetafrom
develop
Feb 4, 2019
Merged

[RELEASE] Merge DEVELOP into BETA#2532
rafaelks merged 163 commits intobetafrom
develop

Conversation

@rafaelks
Copy link
Copy Markdown
Contributor

@rafaelks rafaelks commented Feb 4, 2019

@RocketChat/ios

rafaelks and others added 30 commits November 22, 2018 11:26
Did you missed me? 😛
Translated the remaining strings. 😁
This is probably the only approach I can find as `Favoritar/Desfavoritar` doesn't exist, at least in pt_PT 😛
Fixed some left typos 😄
[FIX][RCVC] Reintroduce "loading messages" indication
[I18N] Update Localizable.strings
[IMPROVEMENT] Show emojis and markdown in reply/quote popup
[IMPROVEMENT] Remove @ and add left & right spacing to mentions
rafaelks and others added 27 commits January 21, 2019 09:01
[I18N] Translate italian strings for video calls
…rom_the_app

[CHORE] Remove the feature to block users locally from the app
[FIX] Read receipts missing on the list of messages
…etails_titleview.2502

[CHORE] Replace DM icon by bubble on titleView
[CHORE] Remove unused code, resolve some SwiftLint warnings & suppress couple.
[CHORE] Remove @ from file attachments, autocomplete & quotes
…iption

[FIX] View models deallocation & Subscription object mapping fixing on updates
…sword.2505

[FIX] Fixed color into forgot password button
[FIX] Fixed issue on connecting to a server & having an invalid server after all in some edge cases
…_details_channel

[CHORE] Hide empty information from Channel Information
@rafaelks rafaelks added this to the 3.3.0 milestone Feb 4, 2019

XCTAssertEqual(
result.string,
"Hi \u{00a0}rafael.kellermann\u{00a0}, how are you doing? Is everyone \u{00a0}here\u{00a0} having a great day? How about you \u{00a0}filipe.alvarenga\u{00a0}? Wish you \u{00a0}all\u{00a0} a happy Christmas :) from \u{00a0}matheus.cardoso\u{00a0}",
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 259 characters (line_length)

// swiftlint:disable function_body_length
func testMentionParsing() {
let string = "Hi @rafael.kellermann, how are you doing? " +
"Is everyone @here having a great day? How about you @filipe.alvarenga? Wish you @all a happy Christmas :) from @matheus.cardoso"
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 150 characters (line_length)

ChannelInfoDescriptionCellData(
header = [ChannelInfoBasicCellData(title: "#\(subscription.name)")]


Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Vertical Whitespace Violation: Limit vertical whitespace to a single empty line. Currently 2. (vertical_whitespace)

self.reply(to: message)
})

let permalink = UIAlertAction(title: localized("chat.message.actions.permalink"), style: .default, handler: { _ in
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 122 characters (line_length)

let messageType: String?

init(id: String, roomId: String, text: String) {
init(id: String, roomId: String, text: String, messageType: String? = nil) {
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Identifier Name Violation: Variable name should be between 3 and 40 characters long: 'id' (identifier_name)

}

func sendMessage(text: String, subscription: UnmanagedSubscription, id: String = String.random(18), user: User? = AuthManager.currentUser(), realm: Realm? = Realm.current) {
func sendMessage(text: String, internalType: String? = nil, subscription: UnmanagedSubscription, id: String = String.random(18), user: User? = AuthManager.currentUser(), realm: Realm? = Realm.current) {
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Identifier Name Violation: Variable name should be between 3 and 40 characters long: 'id' (identifier_name)
Line Length Violation: Line should be 120 characters or less: currently 206 characters (line_length)

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants