Commit Graph

15809 Commits

Author SHA1 Message Date
Pierre Boyer
6e4c3bfe56 Remove now unused code 2019-06-04 12:18:29 +02:00
Pierre Boyer
6cb59f7071 Allow left/right arrow keys to navigate through the autocompletion list 2019-06-04 11:58:16 +02:00
Travis Ralston
a6995ae10a
Merge pull request #3060 from matrix-org/hs/remove-settingsstore
Renove SettingsStore reference in RoomSettingsDialog
2019-06-03 17:45:16 -06:00
Will Hunt
d752389cfd
Renove SettingsStore 2019-06-03 23:31:28 +01:00
Travis Ralston
635b1ff612
Merge pull request #2928 from Half-Shot/hs/custom-notif-sounds
Custom notification sounds for rooms
2019-06-03 14:31:38 -06:00
Will Hunt
721607b696
Remove whitespace 2019-06-03 21:19:58 +01:00
Will Hunt
673a8fcb9d
Update src/Notifier.js
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-06-03 21:19:17 +01:00
J. Ryan Stinnett
42c8a9b5f9
Merge pull request #3054 from matrix-org/jryans/unread-room-coomments
Fix comments in unread room tracking
2019-06-03 17:48:03 +01:00
J. Ryan Stinnett
b13f6b8c52
Merge pull request #3057 from matrix-org/jryans/show-hidden-replacements
Allow source tile handler for replacements
2019-06-03 17:43:53 +01:00
Will Hunt
300095f50f Remove labs flag for custom notif sounds 2019-06-03 17:35:15 +01:00
J. Ryan Stinnett
b309ebf99d Allow source tile handler for replacements
If the debugging mode of showing hidden events in the timeline is enabled, we
should also show replacements using the same view source tile as we do for
reactions. This allows easy debugging of replacement event data and also makes
the edit event look visually distinct from regular messages.

Fixes https://github.com/vector-im/riot-web/issues/9937
2019-06-03 16:29:20 +01:00
J. Ryan Stinnett
12684c396c
Merge pull request #3055 from matrix-org/jryans/message-panel-linting
Fix linting in MessagePanel
2019-06-03 16:14:41 +01:00
J. Ryan Stinnett
91e86d2b02 Fix linting in MessagePanel 2019-06-03 15:03:59 +01:00
J. Ryan Stinnett
1a37055fc3 Fix comments in unread room tracking
A few comments mention read marker where they really mean read receipt.
2019-06-03 15:01:28 +01:00
Travis Ralston
ad84144543
Merge pull request #3053 from matrix-org/travis/bc-labs
Convert breadcrumbs from labs to real setting
2019-06-03 07:10:51 -06:00
Travis Ralston
78a0488317
Merge pull request #3052 from matrix-org/travis/bc-debounce-notifs
Add local echo on badges in breadcrumbs
2019-06-03 07:10:13 -06:00
Travis Ralston
8daef3f1e4
Merge pull request #3051 from matrix-org/travis/bc-sidescroller
Counteract smooth scrolling on breadcrumbs
2019-06-03 07:09:36 -06:00
Matthew Hodgson
1515f8de17
Merge pull request #3050 from matrix-org/matthew/sbix
add sbix fallback twemoji font (and bump to emoji 12)
2019-06-03 10:01:39 +01:00
Travis Ralston
a71b4f5b4c Appease the linter 2019-06-03 00:17:08 -06:00
Travis Ralston
7f0282a2e8 Convert breadcrumbs from labs to real setting
Fixes https://github.com/vector-im/riot-web/issues/9391
2019-06-03 00:15:33 -06:00
Travis Ralston
dd42e87c3c Add local echo on badges in breadcrumbs
Fixes https://github.com/vector-im/riot-web/issues/9890
2019-06-03 00:07:32 -06:00
Travis Ralston
8c414a9333 Counteract smooth scrolling on breadcrumbs
Smooth scrolling browsers (Firefox) use the relative area to determine how much scroll to apply. Because breadcrumbs are short vertically, the scroll amount is minimal (3 units) in the Y direction. On browsers which don't smooth scroll the units are usually much higher (100 in Chrome on Win 10). Users seem to expect the scrolling to be quicker due to the horizontal space on breadcrumbs, so we add a bit more power to their scroll when it looks small.

Fixes https://github.com/vector-im/riot-web/issues/9394
2019-06-02 23:59:02 -06:00
Matthew Hodgson
f9d40940e8 upgrade to twemoji 12.0.4 2019-06-02 06:09:03 +01:00
Matthew Hodgson
e8d8eee67b fix ligatures fully 2019-06-02 05:36:59 +01:00
Matthew Hodgson
16ca31bf90 lint 2019-06-02 04:47:23 +01:00
Matthew Hodgson
1abd3db40c add extra ligatures 2019-06-02 04:46:00 +01:00
Matthew Hodgson
caa950f625 add SBIX fallback twemoji font 2019-06-02 04:24:36 +01:00
Travis Ralston
7a4d69f037
Merge pull request #3049 from matrix-org/travis/default-country-code
Add option to change the default country code
2019-06-01 12:11:21 -06:00
Travis Ralston
ecc0552e89 ToUpper the country code 2019-06-01 09:12:09 -06:00
Travis Ralston
c12ef8829c Remove debugging 2019-05-31 21:26:22 -06:00
Travis Ralston
3f646f13dd Add option to change the default country code
Fixes https://github.com/vector-im/riot-web/issues/9926
2019-05-31 21:25:13 -06:00
Travis Ralston
1c41629376
Merge pull request #3043 from matrix-org/travis/check-login-for-config
Accept JSX into the GenericErrorPage and expose local session vars
2019-05-31 11:03:41 -06:00
Travis Ralston
f512f51f54
Merge pull request #3048 from matrix-org/travis/fix-lowbandwidth-logout
Don't try and low encryption info when signing out in low bandwidth mode
2019-05-31 09:27:43 -06:00
Travis Ralston
16a46be00f Cache shouldLoadBackupStatus in state 2019-05-31 09:20:13 -06:00
Travis Ralston
1c84abae44 Fix logout dialog for low bandwidth 2019-05-31 09:14:49 -06:00
Bruno Windels
2f98d0edb7
Merge pull request #3047 from matrix-org/bwindels/autocomplete-enter-fix
only capture enter if something was selected in completions
2019-05-31 13:17:35 +00:00
Bruno Windels
716719187d only capture enter if something was selected in completions 2019-05-31 15:05:09 +02:00
Will Hunt
96c20ea536 Add missing keys to notif sound setting 2019-05-31 11:40:23 +01:00
RiotRobot
512c9b2ac8 Merge branch 'master' into develop 2019-05-31 11:26:49 +01:00
RiotRobot
21c8a64ce1 v1.2.1 2019-05-31 11:26:02 +01:00
RiotRobot
667232ded7 Prepare changelog for v1.2.1 2019-05-31 11:26:02 +01:00
J. Ryan Stinnett
cbcdd6bffb
Merge pull request #3045 from matrix-org/jryans/emoji-height-release
Native emoji require extra line-height
2019-05-31 11:18:12 +01:00
J. Ryan Stinnett
8e7933138f Native emoji require extra line-height
Increase line-height so that native emoji aren't cut off when we fall back to
them.

Fixes https://github.com/vector-im/riot-web/issues/9898
2019-05-31 11:11:22 +01:00
RiotRobot
2a41471df3 Upgrade to JS SDK 2.0.0 which fixes an error during key backup 2019-05-31 11:06:06 +01:00
Will Hunt
9369e964fa Merge remote-tracking branch 'upstream/develop' into hs/custom-notif-sounds 2019-05-31 10:44:30 +01:00
Bruno Windels
2d8c523642
Merge pull request #3040 from matrix-org/bwindels/editor-remaining-md
Fix: better HTML > MD conversion for editing, including lists and quotes
2019-05-31 09:21:43 +00:00
J. Ryan Stinnett
5593b499d9
Merge pull request #3044 from matrix-org/jryans/line-height-native-emoji
Native emoji require extra line-height
2019-05-31 10:17:26 +01:00
Bruno Windels
78fbea307c less escaping for backticks 2019-05-31 11:06:15 +02:00
J. Ryan Stinnett
6ab136bd9a
Merge pull request #2598 from matrix-org/matthew/low_bandwidth
port over low_bandwidth mode to develop
2019-05-31 09:57:04 +01:00
Bruno Windels
eb8dd52437
Merge pull request #3029 from matrix-org/bwindels/pill-n-newlines
Fix: maintain caret at current line when position is on newline part
2019-05-31 08:44:02 +00:00