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.

Sign up for GitHub

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

Jump to bottom

[FIX] Discussions created from inside DMs were not working and some errors accessing recently created rooms #17282

Merged
merged 6 commits into from
Apr 14, 2020
Merged

[FIX] Discussions created from inside DMs were not working and some errors accessing recently created rooms #17282

merged 6 commits into from
Apr 14, 2020

Conversation

rodrigok
Copy link
Member

@rodrigok rodrigok commented Apr 13, 2020 •
edited by sampaiodiego
Loading

Closes #17260
Closes #17253

@rodrigok rodrigok added this to the 3.1.1 milestone Apr 13, 2020
@rodrigok rodrigok requested a review from sampaiodiego April 13, 2020 19:25
@rodrigok rodrigok merged commit 863b9b6 into develop Apr 14, 2020
@rodrigok rodrigok deleted the fix-discussions-dm branch April 14, 2020 13:37
@rodrigok rodrigok changed the title [FIX] Discussions created from inside DMs were not working [FIX] Discussions created from inside DMs were not working and some errors accessing recently created rooms Apr 14, 2020
@rodrigok rodrigok mentioned this pull request Apr 14, 2020
Closed
This was referenced Apr 14, 2020
Closed
Closed
sampaiodiego pushed a commit that referenced this pull request Apr 14, 2020
@rodrigok @sampaiodiego
[FIX] Discussions created from inside DMs were not working (#17282)
26bf32f
@sampaiodiego sampaiodiego mentioned this pull request Apr 14, 2020
Merged
gabriellsh added a commit that referenced this pull request Apr 14, 2020
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into adm/…
ad7b0a5 
…users_and_rooms

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [FIX] Omnichannel SMS / WhatsApp integration errors due to missing location data (#17288)
  [FIX] User search on directory not working correctly (#17299)
  [FIX] Can not save Unread Tray Icon Alert user preference (#16288) (#16313)
  [FIX] Variable rendering problem on Import recent history page (#15997)
  [FIX] Admin panel custom sounds, multiple sound playback fix and added single play/pause button (#16215)
  [FIX] Discussions created from inside DMs were not working (#17282)
  [FIX] translation for nl (#16742)
  [FIX] No maxlength defined for custom user status (#16534)
  [FIX] Directory users email sort button (#16606)
  [FIX] In Create a New Channel, input should be focused on channel name instead of invite users (#16405)
  [FIX] Email not verified message (#16236)
  [FIX] Directory default tab (#17283)
  Update ru.i18n.json (#16869)
  [FIX] Avatar on sidebar when showing real names (#17286)
  Update Apps-Engine to stable version (#17287)
  [NEW][ENTERPRISE] Auto close abandoned Omnichannel rooms (#17055)
  Static props for Administration route components (#17285)
  [NEW] Default favorite channels (#16025)
  Apply $and helper to message template (#17280)
gabriellsh added a commit that referenced this pull request Apr 15, 2020
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into adm/…
8739a89 
…mailer

* 'develop' of github.com:RocketChat/Rocket.Chat: (93 commits)
  [FIX] Red color error outline is not removed after password update (#16536)
  [FIX] Change wording to start DM from info panel (#8799)
  New hooks for RouterContext (#17305)
  [FIX] SAML assertion signature enforcement (#17278)
  [FIX] LDAP users lose session on refresh (#17302)
  [NEW] Add MMS support to Voxtelesys (#17217)
  [FIX] Popover component doesn't have scroll (#17198)
  [FIX] Omnichannel SMS / WhatsApp integration errors due to missing location data (#17288)
  [FIX] User search on directory not working correctly (#17299)
  [FIX] Can not save Unread Tray Icon Alert user preference (#16288) (#16313)
  [FIX] Variable rendering problem on Import recent history page (#15997)
  [FIX] Admin panel custom sounds, multiple sound playback fix and added single play/pause button (#16215)
  [FIX] Discussions created from inside DMs were not working (#17282)
  [FIX] translation for nl (#16742)
  [FIX] No maxlength defined for custom user status (#16534)
  [FIX] Directory users email sort button (#16606)
  [FIX] In Create a New Channel, input should be focused on channel name instead of invite users (#16405)
  [FIX] Email not verified message (#16236)
  [FIX] Directory default tab (#17283)
  Update ru.i18n.json (#16869)
  ...
ggazzo added a commit that referenced this pull request Apr 15, 2020
@ggazzo
Merge branch 'adm/mailer' of github.com:RocketChat/Rocket.Chat into a…
8ba9fb0 
…dm/mailer

* 'adm/mailer' of github.com:RocketChat/Rocket.Chat: (79 commits)
  removed unecessary prop
  Fixed sendMail function
  Removed Log, Success message
  Permissions
  added route component
  [FIX] "Invalid Invite" message when registration is disabled (#17226)
  Added route, error handling.
  [FIX] Red color error outline is not removed after password update (#16536)
  [FIX] Change wording to start DM from info panel (#8799)
  New hooks for RouterContext (#17305)
  [FIX] SAML assertion signature enforcement (#17278)
  [FIX] LDAP users lose session on refresh (#17302)
  [NEW] Add MMS support to Voxtelesys (#17217)
  [FIX] Popover component doesn't have scroll (#17198)
  [FIX] Omnichannel SMS / WhatsApp integration errors due to missing location data (#17288)
  [FIX] User search on directory not working correctly (#17299)
  [FIX] Can not save Unread Tray Icon Alert user preference (#16288) (#16313)
  [FIX] Variable rendering problem on Import recent history page (#15997)
  [FIX] Admin panel custom sounds, multiple sound playback fix and added single play/pause button (#16215)
  [FIX] Discussions created from inside DMs were not working (#17282)
  ...
dudizilla added a commit that referenced this pull request Apr 21, 2020
@dudizilla
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
960d7dd 
…nto view-logs

* 'develop' of https://github.com/RocketChat/Rocket.Chat: (31 commits)
  Fixed componentes width (#17322)
  [IMPROVE] Administration -> Mailer Rewrite to React. (#17191)
  Regression: Storybook  added flowrouter group mock (#17321)
  [NEW] Feature/custom oauth mail field and interpolation for mapped fields (#15690)
  [FIX] "Invalid Invite" message when registration is disabled (#17226)
  [FIX] Red color error outline is not removed after password update (#16536)
  [FIX] Change wording to start DM from info panel (#8799)
  New hooks for RouterContext (#17305)
  [FIX] SAML assertion signature enforcement (#17278)
  [FIX] LDAP users lose session on refresh (#17302)
  [NEW] Add MMS support to Voxtelesys (#17217)
  [FIX] Popover component doesn't have scroll (#17198)
  [FIX] Omnichannel SMS / WhatsApp integration errors due to missing location data (#17288)
  [FIX] User search on directory not working correctly (#17299)
  [FIX] Can not save Unread Tray Icon Alert user preference (#16288) (#16313)
  [FIX] Variable rendering problem on Import recent history page (#15997)
  [FIX] Admin panel custom sounds, multiple sound playback fix and added single play/pause button (#16215)
  [FIX] Discussions created from inside DMs were not working (#17282)
  [FIX] translation for nl (#16742)
  [FIX] No maxlength defined for custom user status (#16534)
  ...
@sampaiodiego sampaiodiego mentioned this pull request Apr 27, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ggazzo ggazzo ggazzo left review comments

@sampaiodiego sampaiodiego sampaiodiego approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.1.1
Development

Successfully merging this pull request may close these issues.

All other users are offline when login TypeError: Cannot read property 'filter' of undefined
3 participants
@rodrigok @ggazzo @sampaiodiego