Merge pull request #2686 from matrix-org/travis/old-room-sorting

Support the old room sorting algorithm and SettingsStore watchers
This commit is contained in:
Travis Ralston 2019-02-25 10:51:10 -07:00 committed by GitHub
commit e0a5eeca75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 532 additions and 9 deletions

View file

@ -306,6 +306,7 @@
"Enable widget screenshots on supported widgets": "Enable widget screenshots on supported widgets",
"Prompt before sending invites to potentially invalid matrix IDs": "Prompt before sending invites to potentially invalid matrix IDs",
"Show developer tools": "Show developer tools",
"Order rooms in the room list by most important first instead of most recent": "Order rooms in the room list by most important first instead of most recent",
"Collecting app version information": "Collecting app version information",
"Collecting logs": "Collecting logs",
"Uploading report": "Uploading report",
@ -555,6 +556,7 @@
"Preferences": "Preferences",
"Composer": "Composer",
"Timeline": "Timeline",
"Room list": "Room list",
"Autocomplete delay (ms)": "Autocomplete delay (ms)",
"To change the room's avatar, you must be a": "To change the room's avatar, you must be a",
"To change the room's name, you must be a": "To change the room's name, you must be a",