mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-05 00:39:07 +03:00
Code Issues Projects Releases Packages Wiki Activity
22309 commits 219 branches 562 tags 474 MiB
Commit graph

22309 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ben Parsons
c99db2c385 sanitise quotes 2020-02-27 18:54:11 +00:00
J. Ryan Stinnett
b6a21509d5 Ignore cursor jumping shortcuts with shift 
This tweaks the new cursor jumping shortcuts in the composer so that they only
activate without shift. When shift _is_ pressed, you want to extend the
selection instead of just moving.

Fixes https://github.com/vector-im/riot-web/issues/12549
 2020-02-27 16:09:52 +00:00
J. Ryan Stinnett
5325b5677f
Merge pull request #4142 from matrix-org/jryans/shift-composer-shortcut 
Ignore cursor jumping shortcuts with shift
 2020-02-27 16:09:20 +00:00
Bruno Windels
f45dd311f9
Merge pull request #4138 from matrix-org/bwindels/moreverifuifeedback 
add local echo for clicking 'start verification' button
 2020-02-27 15:56:19 +00:00
Michael Telatynski
a5ca649eda
Merge pull request #4141 from matrix-org/t3chguy/editing_formatting 
Fix formatting buttons not marking the composer as modified
 2020-02-27 15:00:16 +00:00
Michael Telatynski
4480abf09c Clear selected tags when disabling tag panel 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-27 12:52:22 +00:00
J. Ryan Stinnett
95bb6f0d76 Ignore cursor jumping shortcuts with shift 
This tweaks the new cursor jumping shortcuts in the composer so that they only
activate without shift. When shift _is_ pressed, you want to extend the
selection instead of just moving.

Fixes https://github.com/vector-im/riot-web/issues/12549
 2020-02-27 11:39:11 +00:00
Bruno Windels
400cb33247 put state declaration on top 2020-02-27 12:35:34 +01:00
J. Ryan Stinnett
d07d7d188f
Merge pull request #4136 from matrix-org/jryans/upgrade-deps-2020-02-26 
Upgrade deps
 2020-02-27 11:24:39 +00:00
Michael Telatynski
b3fbcd4521 Fix formatting buttons not marking the composer as modified 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-27 11:01:22 +00:00
Michael Telatynski
248e467537
Merge pull request #4137 from matrix-org/t3chguy/remove_debug 
Remove debug line from Analytics
 2020-02-27 10:22:35 +00:00
Michael Telatynski
e0fdfa1c1c fix default value for alphabetic sorting setting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 23:21:37 +00:00
Michael Telatynski
75c593b2f4 get rid of unused stuff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 23:19:50 +00:00
Michael Telatynski
f036f0bd83 Fix copy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 23:19:05 +00:00
Michael Telatynski
1875bf4bfe remove the first preference section's margin 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 23:18:01 +00:00
Michael Telatynski
6a66c4162b Space preference sections out more significantly to make the section headers obvious 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 23:16:27 +00:00
Michael Telatynski
cada584c25 i18n 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 23:09:34 +00:00
Michael Telatynski
ed650d5b90 Move Room List preferences section to be first 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 23:07:43 +00:00
Michael Telatynski
3ad8b6e9cc Use RoomList.orderAlphabetically as the inverse of RoomList.orderByRecents for migration 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 23:05:08 +00:00
Michael Telatynski
a1908a208e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list 
 Conflicts:
	src/components/views/rooms/RoomList.js
	src/stores/RoomListStore.js
 2020-02-26 23:02:06 +00:00
Stuart Mumford
c96dd9715a
Fix no cancel button just for Registration 2020-02-26 21:56:01 +00:00
Stuart Mumford
75a4289f54
fix i18n 2020-02-26 21:55:10 +00:00
Stuart Mumford
ae9c2f2c4a
Keep cancel button for now and make login unfilled 2020-02-26 21:55:10 +00:00
Stuart Mumford
f980bfec9e
Improve copy 2020-02-26 21:55:10 +00:00
Stuart Mumford
de05965fc0
Update src/Registration.js 
Co-Authored-By: Will Hunt <will@half-shot.uk>
 2020-02-26 21:55:09 +00:00
Stuart Mumford
5edb0ec912
Resolve correct screen not being shown after new registration 2020-02-26 21:55:09 +00:00
Stuart Mumford
e454d84e9d
Lint 
Signed-off-by: Stuart Mumford <stuart@cadair.com>
 2020-02-26 21:55:08 +00:00
Stuart Mumford
32eb2c13bf
Add support for specifying the screen after require_registration 
Also use it in start chat and join group

Signed-off-by: Stuart Mumford <stuart@cadair.com>
 2020-02-26 21:55:08 +00:00
Stuart Mumford
2c6045fe9f
close modal 2020-02-26 21:55:08 +00:00
Stuart Mumford
aad17a0be5
Add some buttons 2020-02-26 21:55:07 +00:00
Travis Ralston
b45a1c129f
Merge pull request #4140 from matrix-org/travis/fix-qr-length 
Use the right function for creating binary verification QR codes
 2020-02-26 13:44:59 -07:00
Travis Ralston
3abd3137c7 Use the right function for creating binary verification QR codes 
`writeInt8` happened to work because the strings we're writing happen to fit within a single byte so the LSB doesn't matter. We actually want a 16 bit (2 byte) number in big-endian format.
 2020-02-26 13:37:34 -07:00
Travis Ralston
fe0bab7c81
Merge pull request #4139 from matrix-org/travis/fix-qr-length 
Ensure verification QR codes use the right buffer size
 2020-02-26 13:28:41 -07:00
Travis Ralston
347f56b983 Ensure verification QR codes use the right buffer size 
The string length buffer only needs 2 bytes, not 4.
 2020-02-26 13:21:11 -07:00
Travis Ralston
49ec79515c
Merge pull request #4128 from matrix-org/travis/dont-prefix-length 
Don't prefix QR codes with the length of the static marker string
 2020-02-26 12:07:24 -07:00
Bruno Windels
50b64d8c55 add local echo for clicking 'start verification' button 2020-02-26 18:30:20 +01:00
Michael Telatynski
afe45241da Remove debug line from Analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 17:14:54 +00:00
David Baker
1edda88351
Merge pull request #4127 from benbucksch/patch-1 
Solve fixed-width digit display in flowed text
 2020-02-26 16:48:13 +00:00
Michael Telatynski
70a2f224f1
Merge pull request #4135 from matrix-org/t3chguy/userinfo_limit 
Limit UserInfo Displayname to 3 lines to get rid of scrollbars
 2020-02-26 15:45:36 +00:00
J. Ryan Stinnett
65e002cfe9 Upgrade deps 2020-02-26 15:03:24 +00:00
Ben Bucksch
c8493d5b08 Solve fixed-width digits display in flowed text 
Noto Color Emoji contains digits, in fixed-width, therefore causing digits in flowed text to stand out.

Fixes: https://github.com/vector-im/riot-web/issues/12504
Signed-off-by: Ben Bucksch <ben.bucksch@beonex.com>
 2020-02-26 15:32:29 +01:00
RiotRobot
c7246f8eab v2.2.0-rc.1 2020-02-26 14:29:31 +00:00
RiotRobot
9926b32f24 Prepare changelog for v2.2.0-rc.1 2020-02-26 14:29:31 +00:00
RiotRobot
9afa66364e Upgrade matrix-js-sdk to 5.1.0-rc.1 2020-02-26 14:24:58 +00:00
Michael Telatynski
2ce006a9ea delint css 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 13:48:22 +00:00
Michael Telatynski
c4ce9a310e Limit UserInfo Displayname to 3 lines to get rid of scrollbars and ugliness 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 13:44:35 +00:00
Michael Telatynski
d5177ddc04
Merge pull request #4133 from matrix-org/t3chguy/pinned 
Fix message context menu breaking on invalid m.room.pinned_events event
 2020-02-26 11:36:46 +00:00
J. Ryan Stinnett
2ea28275d2
Merge pull request #4134 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-02-26 11:33:00 +00:00
Michael Telatynski
9a1236a016 Fix message context menu breaking on invalid m.room.pinned_events event 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-02-26 10:40:33 +00:00
Weblate
9efb5acd6c Merge branch 'origin/develop' into Weblate. 2020-02-26 09:52:32 +00:00