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

[NEW] User preference for 24- or 12-hour clock #11169

Merged
merged 4 commits into from
Sep 19, 2018

Conversation

vynmera
Copy link
Contributor

@vynmera vynmera commented Jun 16, 2018

Closes #2922
Closes #4706

This PR adds a personal preference for what timestamp format to use:
2018-06-16_21-26-48

Default uses the timestamp formats (usually LT and LLL) defined in admin settings.
12-hour uses a 12-hour format (6:30 PM or January 3, 2018 6:30 PM)
24-hour uses a 24-hour format (18:30 or January 3, 2018 18:30)

@ggazzo ggazzo added the ui/ux label Aug 13, 2018
@ggazzo ggazzo added this to the 0.69.0 milestone Aug 13, 2018
@ggazzo ggazzo self-requested a review August 13, 2018 20:08
@ggazzo ggazzo modified the milestones: 0.69.0, 0.70.0 Sep 11, 2018
ggazzo
ggazzo previously approved these changes Sep 18, 2018
@ggazzo ggazzo requested a deployment to rocket-chat-pr-11169 September 19, 2018 14:09 Abandoned
@ggazzo ggazzo merged commit 9a77976 into RocketChat:develop Sep 19, 2018
engelgabriel added a commit that referenced this pull request Sep 19, 2018
* develop: (27 commits)
  Fix stylelint
  [FIX]  Login error message not obvious if user not activated (#11785)
  [NEW] REST endpoints to get moderators from groups and channels (#11909)
  [NEW] User preference for 24- or 12-hour clock (#11169)
  [FIX] Adding scroll bar to read receipts modal (#11919)
  [FIX] Fixing translation on 'yesterday' word when calling timeAgo function (#11946)
  [FIX] Fixing spacement between tags and words on some labels (#12018)
  [FIX] video message recording, issue #11651 (#12031)
  [FIX] Prevent form submission in Files List search (#11999)
  [NEW] REST endpoint to set groups' announcement (#11905)
  [FIX] Re-add the eye-off icon (#12079)
  [NEW] Livechat trigger option to run only once (#12068)
  [IMPROVE] Use eslint-config package (#12044)
  [FIX] Internal error when cross-origin with CORS is disabled (#11953)
  [FIX] Message reaction in GraphQL API (#11967)
  [FIX] Direct messages leaking into logs (#11863)
  Fix the stylelint (#11991)
  [NEW] REST endpoints to create roles and assign roles to users (#11855)
  [FIX] Hidden admin sidenav on embedded layout (#12025)
  [FIX] Update user information not possible by admin if disabled to users (#11955)
  ...

# Conflicts:
#	package-lock.json
#	package.json
This was referenced Sep 28, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants