Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-18 06:35:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,760 Commits 206 Branches 552 Tags 519 MiB
a71b4f5b4c
Commit Graph

15760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Travis Ralston
a71b4f5b4c Appease the linter 2019-06-03 00:17:08 -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
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
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
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
Travis Ralston
af86cdfe9a Disable avatars in desktop notifs when in LB mode 2019-05-30 20:02:25 -06:00
Travis Ralston
a935e26ee3 Add flag to config to always show labs settings 2019-05-30 19:57:37 -06:00
Travis Ralston
0d47222132 Add LB setting to new user settings 
Put under labs out of concern for https://github.com/vector-im/riot-meta/issues/66
 2019-05-30 19:57:17 -06:00
Travis Ralston
d81804e0fe Merge branch 'develop' into matthew/low_bandwidth 2019-05-30 19:42:09 -06:00
J. Ryan Stinnett
7d4d09e8ac
Merge pull request #3042 from matrix-org/jryans/username-on-hs 
Remove username on HS input label
 2019-05-30 11:01:04 +01:00
J. Ryan Stinnett
2be00ee0e0 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-30 10:26:12 +01:00
Travis Ralston
5c85f4609e Accept JSX into the GenericErrorPage and expose local session vars 2019-05-29 12:09:04 -06:00
J. Ryan Stinnett
1e3e9f4f87 Remove username on HS input label 
Removes redundant HS name on the username input that duplicates the header above
it.

Fixes https://github.com/vector-im/riot-web/issues/9884
 2019-05-29 17:48:16 +01:00
RiotRobot
76cd829ac9 Merge branch 'master' into develop 2019-05-29 16:03:17 +01:00
RiotRobot
6d383bea1f v1.2.0 2019-05-29 16:02:26 +01:00
RiotRobot
5e156f12b8 Prepare changelog for v1.2.0 2019-05-29 16:02:25 +01:00
RiotRobot
3f1bb494e2 Upgrade JS SDK to 1.2.0 2019-05-29 15:58:17 +01:00
J. Ryan Stinnett
1216e5d586
Merge pull request #3041 from matrix-org/jryans/colr-fixes-release 
COLR font check fixes for release
 2019-05-29 15:24:48 +01:00
Bruno Windels
aeaa4c0848 always log on return false 2019-05-29 15:13:20 +01:00
Bruno Windels
22efb31781 exclude chrome in ua from safari version check for colr support 2019-05-29 15:13:20 +01:00
Bruno Windels
729806b9b4 fix lint & make regex more robust 2019-05-29 15:13:20 +01:00
Bruno Windels
f2a649e611 Update src/utils/FontManager.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-05-29 15:13:20 +01:00
Bruno Windels
2fb451c43f Update src/utils/FontManager.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-05-29 15:13:20 +01:00
Bruno Windels
a295d7bada Update src/utils/FontManager.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2019-05-29 15:13:20 +01:00
Bruno Windels
ced55552da make sure the check doesn't blow up 2019-05-29 15:13:20 +01:00
Bruno Windels
43f642a8fe sniff safari 12, macos 10.14 to support COLR, as safari doesn't wait for the font to load to emit load 2019-05-29 15:13:20 +01:00
Bruno Windels
85b0107f6c fix COLR font check being racy 
also make sure it doesn't run more than once.
keeping the FF sniffing because missing "extract canvas data" permissions
would still break the check.
 2019-05-29 15:13:20 +01:00
Travis Ralston
d17ea516cc Minus one log 2019-05-29 15:13:20 +01:00
Travis Ralston
fc1ac53ef3 Add some logging for COLR checks 2019-05-29 15:13:20 +01:00
Bruno Windels
686045b46a rewrite HTML>MD conversion,handle (nested) block elements&quotes better 
Re-use walkDOMDepthFirst we already had for turning the editor into
a string, which also allows us to detect when leaving a node better,
which is needed to decide how block elements create newline parts
is more centralized and robust manner, more in line with
how html works (consecutive block elements break the line)
instead of hacky special casing from before.

Also, to support every line of MD generated
within a BLOCKQUOTE, the parts an element creates are returned
and then centrally prepended with "> ", instead of passing in
the parts array and doing it in every parse... function.
 2019-05-29 14:46:15 +02:00
Bruno Windels
b0d87e7e47 allow enterNodeCallback to decide whether to decend into a node 2019-05-29 14:27:36 +02:00
Bruno Windels
d34d5f1660
Merge pull request #3038 from matrix-org/bwindels/colr-check-race2 
Exclude chrome in ua from safari version check for colr support
 2019-05-29 11:56:57 +00:00