[NEW] User preference for 24- or 12-hour clock#11169
Merged
ggazzo merged 4 commits intoRocketChat:developfrom Sep 19, 2018
Merged
[NEW] User preference for 24- or 12-hour clock#11169ggazzo merged 4 commits intoRocketChat:developfrom
ggazzo merged 4 commits intoRocketChat:developfrom
Conversation
…wenty-four-hour-clock
ggazzo
previously approved these changes
Sep 18, 2018
ggazzo
approved these changes
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 file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #2922
Closes #4706
This PR adds a personal preference for what timestamp format to use:
Default uses the timestamp formats (usually
LTandLLL) defined in admin settings.12-hour uses a 12-hour format (
6:30 PMorJanuary 3, 2018 6:30 PM)24-hour uses a 24-hour format (
18:30orJanuary 3, 2018 18:30)