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

[FIX] "Idle Time Limit" using milliseconds instead of seconds #9824

Merged
merged 17 commits into from
Apr 18, 2018
Merged

[FIX] "Idle Time Limit" using milliseconds instead of seconds #9824

merged 17 commits into from
Apr 18, 2018

Conversation

kaiiiiiiiii
Copy link
Contributor

@kaiiiiiiiii kaiiiiiiiii commented Feb 21, 2018

I've closed my other PR (#9675) in favor of this one, because I really messed up with almost everything.

This time I forked the latest develop branch and requested to merge the PR back into develop. I'm sorry for any inconvenience, but I'm pretty new to git group projects :)

Summary old PR
For users it's pretty unhandy to fill out the "Idle Time Limit" in milliseconds. As discussed with @geekgonecrazy and @JSzaszvari it would be more practical to set this value in seconds. @sampaiodiego targets version 0.63.0 for this fix.

@@ -999,7 +999,7 @@
"IssueLinks_LinkTemplate": "Template for issue links",
"IssueLinks_LinkTemplate_Description": "Template for issue links; %s will be replaced by the issue number.",
"It_works": "It works",
"Idle_Time_Limit": "Idle Time Limit",
"Idle_Time_Limit": "Idle Time Limit (Sec.)",
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you add a Idle_Time_Limit_Description property and describe what it does?

@graywolf336 graywolf336 dismissed their stale review February 22, 2018 00:18

Requested changes have been made.

@kaiiiiiiiii
Copy link
Contributor Author

@sampaiodiego Can you please add a milestone to this PR?

geekgonecrazy
geekgonecrazy previously approved these changes Mar 27, 2018
@geekgonecrazy
Copy link
Contributor

@kaiiiiiiiii can you rename your migration file to 109 and change from 108 to 109 inside the file also. Seems someone else added a migration for 108 and its already been merged

@geekgonecrazy geekgonecrazy dismissed their stale review March 27, 2018 15:13

Need to rename before it can actually be merged

@kaiiiiiiiii
Copy link
Contributor Author

kaiiiiiiiii commented Mar 27, 2018

@geekgonecrazy done mate :) I've also merged the latest develop state into my branch. All tests passed now.

@kaiiiiiiiii
Copy link
Contributor Author

kaiiiiiiiii commented Apr 1, 2018

@geekgonecrazy Changed migration version number again, as there had been a new merge conflict with another migration.

Cheers

@geekgonecrazy geekgonecrazy added this to the 0.64.0 milestone Apr 3, 2018
@graywolf336 graywolf336 changed the title [FIX] Change "Idle Time Limit" from milliseconds to seconds [FIX] "Idle Time Limit" using milliseconds instead of seconds Apr 18, 2018
@graywolf336 graywolf336 merged commit 6fe8e11 into RocketChat:develop Apr 18, 2018
@kaiiiiiiiii kaiiiiiiiii deleted the change_idle_time_limit_from_milliseconds_to_seconds branch April 18, 2018 12:41
MarcosSpessatto added a commit that referenced this pull request Apr 19, 2018
…-api-chat-postmessage-validations

* commit 'a9fb4da5c847a456990a5d60369f0f52ff4a8bd8': (137 commits)
  Remove "secret" from REST endpoint /settings.oauth response
  [FIX] Directory sort and column sizes were wrong (#10403)
  [FIX] Add oauth services missing fields, and indicate whether the oauth service is customized (#10299)
  Show error message when email verification fails (#10446)
  Correct the column positions in the directory search for users (#10454)
  Fixed custom fields misalignment in registration form (#10463)
  [FIX] Unique identifier file not really being unique (#10341)
  [OTHER] More Listeners for Apps & Utilize Promises inside Apps (#10335)
  [FIX] Empty panel after changing a user's username (#10404)
  [FIX] Russian translation of "False" (#10418)
  [FIX] Links being embedded inside of blockquotes (#10496)
  [FIX] The 'channel.messages' REST API Endpoint error (#10485)
  [OTHER] Develop sync (#10487)
  [FIX] Button on user info contextual bar scrolling with the content (#10358)
  [FIX] "Idle Time Limit" using milliseconds instead of seconds (#9824)
  [NEW] Body of the payload on an incoming webhook is included on the request object (#10259)
  [FIX] Missing i18n translation key for "Unread" (#10387)
  [FIX] Owner unable to delete channel or group from APIs (#9729)
  [NEW] REST endpoint to recover forgotten password (#10371)
  Add REST endpoint chat.reportMessage, to report a message (#10354)
  ...
@rodrigok rodrigok mentioned this pull request Apr 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.

4 participants