mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-27 03:36:07 +03:00
Code Issues Projects Releases Packages Wiki Activity
5997 commits 215 branches 561 tags 411 MiB
Commit graph

5997 commits

This branch
This branch
All branches
Author SHA1 Message Date
Luke Barnard
cbd8018ac8 Support semi-perma-disabling of lab features 
Adding `override: true` will remove the feature from the labs section, and force Riot to always use the default value (i.e. ignoring localStorage). This is useful removing features entirely when they might be deliberately not working but we still want to do a release.
 2017-08-14 12:26:31 +01:00
David Baker
02217c8bd2 Merge pull request #1290 from matrix-org/luke/fix-user-url-no-middle-panel 
At /user, view member of current room
 2017-08-11 10:49:22 +01:00
Luke Barnard
12966d06cd Merge pull request #1255 from matrix-org/t3chguy/i18n_analytics 
un-i18n Modal Analytics
 2017-08-10 15:35:46 +01:00
Luke Barnard
d3ba1f40dc Merge pull request #1272 from matrix-org/t3chguy/hide_other_events 
allow hiding of avatar/display name changes
 2017-08-10 15:35:11 +01:00
Luke Barnard
89254e77f4 When no member, use null roomId 2017-08-10 15:23:14 +01:00
Michael Telatynski
5450d6b9ca
remove redundant check and add comment 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:22:53 +01:00
Michael Telatynski
41843f021d
don't track two more potential risks 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:21:01 +01:00
Michael Telatynski
56ea528f43
don't track error messages .2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:17:52 +01:00
Michael Telatynski
625ca96d86
add comment about why state key must be not undefined 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 14:01:24 +01:00
Michael Telatynski
a6064c53d3
export shouldHideEvent fn named 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 14:00:26 +01:00
Michael Telatynski
ab3abd2f7f
fix string casing 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:59:55 +01:00
Michael Telatynski
1603360c13
s/Membership/Member/ 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:58:19 +01:00
Michael Telatynski
b19c1010aa
Merge branches 'develop' and 't3chguy/i18n_analytics' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/Analytics.js
 2017-08-10 13:54:55 +01:00
Michael Telatynski
67f9c3774d
make string more human-friendly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:51:47 +01:00
Michael Telatynski
24599ace32
don't track error messages 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:49:11 +01:00
Marcel
60c1ba4f4d Add LanguageDropdown to LoginPage (#1284) 2017-08-10 13:29:10 +01:00
Luke Barnard
07633fe67f At /user, view member of current room 
With the fallback of existing behaviour, which is UserView (no middle panel and no avatar, display name).

To improve, MemberInfo should probably track the current roomId and userId and then update the view asynchronously by re-fetching the member object when either roomId or userId change.

Also, it should be hitting the profile API to get the user's avatar if a room hasn't been specified.
 2017-08-10 13:12:50 +01:00
Luke Barnard
b2fd4be166 Merge pull request #1289 from matrix-org/luke/fix-quote-innerText 
Quote by taking the innerText of eventTiles
 2017-08-10 10:35:49 +01:00
Luke Barnard
678c472b75 Quote by taking the innerText of eventTiles 
because using `body` gives inconsistent results - sometimes it will contain markdown and sometimes not, and this may not correspond with the `formatted_body`.

TODO: Do quoting proper - using `in_response_to`.
 2017-08-10 10:14:14 +01:00
Luke Barnard
390e77ee22 Merge pull request #1288 from matrix-org/luke/track-richtext-mode 
Track whether the user has richtext mode enabled
 2017-08-10 09:31:09 +01:00
Luke Barnard
fc6977e68d Track RT mode once we've retrieved the setting from account data 2017-08-09 19:00:38 +01:00
Luke Barnard
e121440d05 Track whether the user has richtext mode enabled 2017-08-09 18:39:06 +01:00
David Baker
f4092cc9b4 Merge pull request #1287 from matrix-org/luke/fix-hide-autocomp-on-selection-change 
Hide autocomplete when RTE selection state (cursor) changes
 2017-08-09 18:21:25 +01:00
Luke Barnard
794bf820cc Merge pull request #1259 from matrix-org/t3chguy/fix-select-mxid-dialog 
Fix Set MXID Dialog woes
 2017-08-09 17:53:50 +01:00
Luke Barnard
2d47d3d2c3 Hide autocomplete when RTE selection state (cursor) changes 2017-08-09 17:36:35 +01:00
Michael Telatynski
579090a4e3 add comment 2017-08-09 16:37:38 +01:00
David Baker
f496d2de8b Merge pull request #1285 from matrix-org/luke/fix-rte-mention-ambiguation 
For mentions, always use rawDisplayName and remove (IRC)
 2017-08-09 11:54:50 +01:00
Luke Barnard
610b2a3a42 For mentions, always use rawDisplayName and remove (IRC) 2017-08-09 10:40:06 +01:00
Luke Barnard
102b02054b Merge pull request #1283 from matrix-org/rav/matrix_chat_optimisations 
Make MatrixChat do fewer render cycles during mount
 2017-08-09 09:32:54 +01:00
Richard van der Hoff
38114711fd Make MatrixChat do fewer render cycles during mount 
This is mostly with the intent of making the login tests more reliable, but it
seems generally worthwhile:

* keep screenAfterLogin in the object props rather than `state` so that we can
  clear it without triggering a rerender

* also move our record of the window width to the object props, and call
  `handleResize` from componentWillMount rather than componentDidMount so that
  we don't trigger a rerender by updating `state.width`

* Remove update of unused `loading` state
 2017-08-08 22:31:40 +01:00
David Baker
8426ada24c Merge pull request #1282 from matrix-org/rav/show_unencrypted_messages_as_unencrypted 
Show unencrypted messages as unencrypted
 2017-08-08 18:11:56 +01:00
Richard van der Hoff
da85cb9f45 Show unencrypted messages as unencrypted 
Previously, we were special-casing outgoing messages such that they were shown
as encrypted even when encryption had failed for some reason.

There's no need for this: outgoing messages have a working isEncrypted() method
which we can use to show whether the event has been encrypted yet. Arguably we
could do better than an open padlock for events in the 'encrypting' send state,
but I'm not really sure what.
 2017-08-08 17:49:41 +01:00
David Baker
34adda590b Merge pull request #1280 from matrix-org/luke/fix-rte-prevent-completion-pills-in-commands 
Disable autocompletions for users and rooms when entering a command
 2017-08-08 17:48:56 +01:00
David Baker
b76b6791b2 Merge pull request #1279 from matrix-org/luke/fix-quoting-messages-with-mentions 
Always use message `body` when quoting
 2017-08-08 17:47:25 +01:00
Luke Barnard
b82fd02eb7 Merge pull request #1281 from matrix-org/luke/fix-autocomplete-cancel 
When `hide`ing autocomplete, also remove completion state
 2017-08-08 17:46:48 +01:00
Luke Barnard
cb8a66b5a1 When hideing autocomplete, also remove completion state 2017-08-08 17:25:11 +01:00
Luke Barnard
a72f38799f Disable autocompletions for users and rooms when entering a command 
This only affects commands that take a room alias or user ID as an argument. (Leaving commands such as `/me` unaffected)
 2017-08-08 15:58:15 +01:00
Luke Barnard
503fa6a7b3 Always use message body when quoting 
(not formatted_body)

This is because draft-js has regressed with a bug that causes some entities to not exist within a given ContentState - see vector-im/riot-web#4756
 2017-08-08 14:59:56 +01:00
David Baker
ca2273519d Merge pull request #1277 from matrix-org/luke/feature-pills-hide-avatar-setting 
Add optional setting for hiding avatars in <Pill>s
 2017-08-08 14:01:34 +01:00
David Baker
08fba3bb75 Merge pull request #1278 from matrix-org/luke/fix-rte-key-bindings 
Mandate ctrl/meta ONLY for a subset of key bindings
 2017-08-08 13:51:02 +01:00
Luke Barnard
bef6726290 Lint 2017-08-08 13:42:51 +01:00
Luke Barnard
91a1cc4431 Mandate ctrl/meta ONLY for a subset of key bindings 
Because by default dratf-js doesn't check that other modifiers are _not_ pressed.
 2017-08-08 13:36:43 +01:00
Luke Barnard
b08d32371d Add optional setting for hiding avatars in <Pill>s 
As part of https://github.com/vector-im/riot-web/issues/4640#issuecomment-316659445
 2017-08-08 11:13:29 +01:00
David Baker
3639fc0c3c Merge pull request #1276 from matrix-org/luke/fix-rte-completion-raw-disp-name 
Use the rawDisplayName for the user provider completion
 2017-08-08 10:38:24 +01:00
Luke Barnard
1743c047bd Use the rawDisplayName for the user provider completion 
to make sure that the length of text in the decoration (See <Pill>) is equal to the length of text in the completion (underlying text range that the Entity covers).
 2017-08-08 10:28:11 +01:00
Luke Barnard
aa4cc882e9 Merge pull request #1275 from matrix-org/luke/fix-rte-ctrl-a-backspace 
Fix ctrl+a, backspace toggling block format
 2017-08-07 17:58:07 +01:00
Luke Barnard
7018deee44 Fix ctrl+a, backspace toggling block format 
Now it will delete the selected range (and not toggle the block format). Fixes vector-im/riot-web#4753
 2017-08-07 17:16:42 +01:00
David Baker
8af6d6fc9f Merge pull request #1274 from matrix-org/luke/fix-rte-keyboard-intercepts 
Allow default for ctrl+shift+b, ctrl+shift+u in RTE
 2017-08-07 16:38:04 +01:00
Luke Barnard
641fda0162 Adjust comment 2017-08-07 16:29:22 +01:00
Luke Barnard
d9d8f2055f Allow default for ctrl+shift+b, ctrl+shift+u in RTE 
fixes vector-im/riot-web#4750
 2017-08-07 16:23:37 +01:00