Skip to content

[FIX] SAML issues#11135

Merged
sampaiodiego merged 39 commits intodevelopfrom
saml_repair
Jul 21, 2018
Merged

[FIX] SAML issues#11135
sampaiodiego merged 39 commits intodevelopfrom
saml_repair

Conversation

@Hudell
Copy link
Copy Markdown
Contributor

@Hudell Hudell commented Jun 13, 2018

Merges #10210 with the current develop branch, solving conflicts and lint problems.

The code of that PR includes several fixes for SAML, including encryption.

@Hudell Hudell requested a review from rodrigok June 13, 2018 19:42
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11135 June 13, 2018 19:43 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11135 June 13, 2018 19:44 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11135 June 20, 2018 14:43 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11135 June 26, 2018 19:35 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11135 June 28, 2018 13:50 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11135 July 2, 2018 19:04 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11135 July 2, 2018 21:24 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11135 July 4, 2018 17:19 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11135 July 4, 2018 17:31 Inactive
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-11135 July 10, 2018 16:36 Inactive
@sampaiodiego sampaiodiego added this to the 0.68.0 milestone Jul 19, 2018
@Hudell Hudell mentioned this pull request Jul 19, 2018
@sampaiodiego sampaiodiego modified the milestones: 0.68.0, 0.67.0 Jul 20, 2018
@theorenck theorenck modified the milestones: 0.67.0, 0.68.0 Jul 20, 2018
@sampaiodiego sampaiodiego changed the title [FIX] SAML Repair [FIX] SAML issues Jul 21, 2018
@sampaiodiego sampaiodiego merged commit 4802ed1 into develop Jul 21, 2018
@sampaiodiego sampaiodiego deleted the saml_repair branch July 21, 2018 00:37
@sampaiodiego sampaiodiego mentioned this pull request Jul 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants