Luke Barnard
20d65535c0
Use all known rooms instead of public rooms
2017-09-26 17:11:54 +01:00
Luke Barnard
ddab8d7b5c
Implement "Add room to group" feature
2017-09-26 14:49:13 +01:00
Robert Swain
24de01e21d
AppTile: Test if widgetUrl startsWith instead of has a substring
...
The event origin should be at the beginning of the URL.
2017-09-25 17:14:25 +02:00
Robert Swain
6e49926228
AppTile: Do not test for electron platform
...
The method platform method is instead stubbed on all other platforms.
2017-09-25 17:13:18 +02:00
Robert Swain
b047f1caaa
Merge branch 'develop' into rob/electron-screensharing
2017-09-25 17:02:30 +02:00
David Baker
2ab860f487
Merge pull request #1427 from matrix-org/luke/feature-flair-cache-bust
...
Bust the flair caches after 30mins
2017-09-25 15:39:06 +01:00
Luke Barnard
20c731f627
Bust the flair caches after 30mins
...
Group profile data and the groups a user has publicised will be removed from the cache 30mins after retrieval.
There may be some benefits to caching the group profiles for longer than the group memberships but for now they're naively busted after the same 30mins.
2017-09-25 15:21:56 +01:00
David Baker
d9c2f6e610
Merge pull request #1426 from matrix-org/dbkr/profile_in_group_member_info
...
Show displayname / avatar in group member info
2017-09-25 15:14:30 +01:00
David Baker
0b96871be4
Lint
2017-09-25 15:07:02 +01:00
David Baker
58ec732fb3
Add width/height/resizeMethod params
2017-09-25 14:51:21 +01:00
Luke Barnard
1bd200f1b1
Merge pull request #1417 from matrix-org/dbkr/member_list_show_more
...
MemberList: show 100 more on overflow tile click
2017-09-25 14:50:33 +01:00
David Baker
5b312ffb03
Show displayname / avatar in group member info
2017-09-25 14:38:43 +01:00
Richard van der Hoff
e2f8bb2ec0
Fix NPE in MemberList
...
_getChildCountInvited would throw an NPE if invoked before the js-sdk had found
the room. Make sure we initialise the state correctly.
2017-09-25 10:25:21 +01:00
Stefan Parviainen
2b5b708057
Translate unknown presence label
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-24 10:14:04 +02:00
Stefan Parviainen
dbae5a66e3
Use translation in img alt text
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-24 09:43:52 +02:00
Stefan Parviainen
f2f5302a7b
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-09-23 09:47:51 +02:00
Stefan Parviainen
cc441f42f9
Some more translatable strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-23 09:02:51 +02:00
Stefan Parviainen
d4929b558e
Add dummy translation function to mark translatable strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-09-22 21:43:27 +02:00
Michael Telatynski
6d530eeb6e
apply i18n _t to string which has already been translated
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-22 20:04:04 +01:00
David Baker
25da0f6a7a
MemberList: show 100 more on overflow tile click
...
Not the full list because on HQ that causes your browser to implode.
This should really be a decent paginated list at this point, but this is better
for now.
2017-09-22 17:01:14 +01:00
David Baker
9cbfc22352
Make the invite section a truncatedlist too
...
For uniformity and to speed up rooms like HQ with have a lot of
lingering invites.
2017-09-22 16:50:54 +01:00
David Baker
a868fa4be9
Merge pull request #1412 from matrix-org/dbkr/truncatedlist_experiment
...
Allow TruncatedList to get children via a callback
2017-09-22 16:25:45 +01:00
David Baker
621a108b5e
Use flow style function definition for doc
2017-09-22 15:15:10 +01:00
David Baker
dba48e2f8f
use start, end rather than min, max
2017-09-22 15:07:45 +01:00
David Baker
0f9f1c85a8
Remove done todo
2017-09-22 14:58:49 +01:00
David Baker
4a36e32c8d
Show displayname & avatar url in group member list
2017-09-22 14:52:52 +01:00
David Baker
f1a2b6d327
lint
2017-09-22 13:35:49 +01:00
David Baker
16398fbfc2
Allow TruncatedList to get children via a callback
...
And update MemberList to use it as such. This means that the parent
only needs to make react elements for the elements that will
actually be rendered, rather than all of them.
In practive this doesn't make a huge difference as making React
elements is fairly fast, but experimentally (with all profiling
turned on), MemberList went from 25ms in the constructor and
81ms in render to 38ms in constructor but sub 1ms render for
Matrix HQ.
2017-09-22 13:15:02 +01:00
David Baker
29d8df2c9e
De-lint TruncatedList
2017-09-22 10:00:46 +01:00
Luke Barnard
cf23ac5931
Merge branch 'develop' into luke/groups-add-feature-rooms
2017-09-21 17:20:12 +01:00
Luke Barnard
5f840a3031
Implement adding rooms to the group summary
...
This includes making UserPickerDialog more generic such that it can also pick rooms from groups.
2017-09-21 16:53:10 +01:00
David Baker
add91f9a7d
Update when a group arrives
2017-09-21 16:28:49 +01:00
David Baker
5940b11fd2
Merge pull request #1404 from matrix-org/luke/feature-flair-click-for-group
...
Implement `view_group` dispatch when clicking flair
2017-09-21 15:18:28 +01:00
Luke Barnard
41a9ff22fb
Rename profile object properties to camelCase
...
Also, add correct PropTypes for FlairAvatar
2017-09-21 14:22:43 +01:00
David Baker
60d444b841
Merge pull request #1402 from matrix-org/luke/groups-add-featured-rooms-and-users
...
GroupView: Add a User
2017-09-21 14:19:58 +01:00
Luke Barnard
e64cc3b666
Implement view_group
dispatch when clicking flair
2017-09-21 13:25:36 +01:00
Luke Barnard
9cd4cdf6df
Filter group users results based on query
2017-09-21 10:52:28 +01:00
Luke Barnard
515222c25f
Track action button click event
2017-09-20 17:16:49 +01:00
Luke Barnard
7ef55946da
Fix console error log statement
2017-09-20 17:04:05 +01:00
Luke Barnard
1c1bf82c2a
Add users to group summary using new API
2017-09-20 16:32:02 +01:00
Luke Barnard
44c38652ab
Implement UserPickerDialog for adding users
...
Also, use AccessibleButtons.
2017-09-20 15:44:42 +01:00
David Baker
6ad4ba767b
Merge pull request #1401 from matrix-org/luke/fix-separate-sender-profile
...
Separate sender profile into elements with classes
2017-09-19 17:21:52 +01:00
Luke Barnard
979b580e1f
Merge branch 'develop' into luke/fix-ugly-integ-button
2017-09-19 17:04:06 +01:00
Luke Barnard
e2ae6e6235
Separate sender profile into elements with classes
...
For separate CSS manipulation so that we can vary opacity independently for flair/name/aux
2017-09-19 16:56:14 +01:00
Luke Barnard
668e096194
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop
2017-09-19 16:36:51 +01:00
Luke Barnard
7414d4d1f9
Fix issue with "props.aux" being inserted instead of e.g. "sent an image"
2017-09-19 16:36:30 +01:00
David Baker
80e0205b78
Fix promise error in flair
...
Import bluebird other wise it gets a native promise on my dev box
which does not have a finally method
2017-09-19 15:53:54 +01:00
Luke Barnard
5295d7f058
Merge branch 'develop' into luke/feature-flair
2017-09-19 14:55:54 +01:00
Luke Barnard
e9fb5712bd
Merge branch 'develop' into dbkr/group_userlist
2017-09-19 13:26:55 +01:00
Luke Barnard
61a0f1ef67
Fix ugly integration button, use hover to show error
...
This simplifies the implementation of the button but also adjusts the appeareance such that a warning triangle appears in the top-right of button if an error has occured. The error popup will now appear when hovering over the button (with related CSS).
2017-09-19 11:57:23 +01:00
Luke Barnard
241d442284
Fail gracefully for non-supporting servers
2017-09-18 15:12:38 +01:00
Luke Barnard
6add06db44
Fix big with rejecting promises upon error
2017-09-18 15:11:49 +01:00
Luke Barnard
26941e994f
Merge branch 'develop' into luke/feature-flair
2017-09-18 14:46:50 +01:00
Luke Barnard
3476cfca79
getPublicGroups->getPublicisedGroups
...
To match dbkrs js-sdk wrappers for flair: matrix-org/matrix-js-sdk/pull#542
2017-09-18 14:44:35 +01:00
Luke Barnard
548e5f516c
Put flair into labs
2017-09-18 14:38:41 +01:00
Luke Barnard
caaf5cca14
Only show the integ management button if user is joined
2017-09-18 13:34:33 +01:00
Matthew Hodgson
09e6ea00c5
Merge pull request #1273 from matrix-org/t3chguy/hide_chevron_memberlist_3pid_notarget
...
suppressOnHover for member entity tiles which have no onClick
2017-09-17 23:19:35 +01:00
Matthew Hodgson
141ae916ce
Merge pull request #1387 from turt2live/travis/tooltip_redacter
...
Show who redacted an event on hover
2017-09-17 22:36:18 +01:00
Matthew Hodgson
b06d540f4c
Merge pull request #1388 from matrix-org/t3chguy/start_mels_expanded
...
start MELS expanded if it contains a highlighted/permalinked event.
2017-09-17 22:09:44 +01:00
turt2live
2e72d6cd7c
Hide events that were sent by ignored users
...
This code only kicks in if the user was ignored after an event was sent. The homeserver should prevent other events from coming in.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 20:16:56 -06:00
Travis Ralston
3889df6b08
Add (un)ignore button to MemberInfo
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 19:42:09 -06:00
Michael Telatynski
f612b1933b
start MELS expanded if it contains a highlighted/permalinked event.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-14 17:53:47 +01:00
turt2live
8dc2604d63
Show who redacted an event on hover
...
This should fix #3931 although it's not obvious who actually performed the redaction.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-09-14 09:03:05 -06:00
Matthew Hodgson
bb8538cd1a
Merge pull request #1381 from matrix-org/dbkr/remove_spurious_cancel_button
...
Remove spurious cancel button
2017-09-14 10:38:26 +01:00
David Baker
5087da9247
Merge remote-tracking branch 'origin/develop' into luke/feature-flair
2017-09-13 16:52:12 +01:00
David Baker
3c3328c5f1
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-09-13 16:34:39 +01:00
David Baker
081a900524
Merge pull request #1363 from matrix-org/t3chguy/on_copy_tooltip
...
respond on copy code block
2017-09-13 14:27:35 +01:00
Michael Telatynski
fea7af11b4
Merge remote-tracking branch 'origin/t3chguy/on_copy_tooltip' into t3chguy/on_copy_tooltip
2017-09-13 14:18:56 +01:00
Michael Telatynski
d3bfdf495c
initialize value with false to prevent undefined.
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-13 14:18:31 +01:00
David Baker
8abd35f581
Remove spurious cancel button
...
That appeared if you clicked on a room from the room directory
(it didn't do anything). It's only supposed to be shown when
editing room settings.
2017-09-12 15:48:13 +01:00
David Baker
757bc9fe32
Update roomlist when an event is decrypted
...
Events are now decrypted asynchronously, so are not decrypted
at the time of the Room.timeline which is when our RoomList
got the chance to update. It needs to update once the event has
been decrypted.
Ideally we would not update the whole room list order, but this is
how all the room list re-ordering happens right now, so staying
consistent with this.
Fixes https://github.com/vector-im/riot-web/issues/5020
2017-09-12 14:47:26 +01:00
Robert Swain
aa82be1fb1
Merge branch 'develop' into rob/electron-screensharing
2017-09-12 10:54:20 +02:00
David Baker
3c70b86668
Merge pull request #1375 from matrix-org/dbkr/active_room_observer
...
Avoid re-rendering RoomList on room switch
2017-09-11 18:52:09 +01:00
David Baker
be8f0991a6
Avoid re-rendering RoomList on room switch
...
Introduce a class that consumes updates from the RoomViewStore and
announces to listeners if the active room ID is now or is no longer
the room ID they specified. Naming suggestions welcome: it's
currently called ActiveRoomObserver.
Avoids passing the selectedRoomId down from MatrixChat all the way
through the LeftPanel / RoomList / RoomSubList to the RoomTiles.
Also introduce a CallPreview class that listens directly for
RoomViewStore changes as the call preview in the left panel needs
to know when the room changes, so this allows this component to
update without having to update the entire left panel.
2017-09-11 16:59:09 +01:00
Michael Telatynski
0580d536ad
Merge branch 'develop' into t3chguy/on_copy_tooltip
2017-09-10 18:54:52 +01:00
David Baker
7617788345
Merge pull request #1372 from matrix-org/dbkr/emoji_fast_path
...
Fast path for emojifying strings
2017-09-10 17:44:02 +01:00
David Baker
05a986334d
Separate function to add code copy button
...
For neatness and also so it can show up separately in the profiler.
2017-09-10 15:58:17 +01:00
David Baker
876257f4e2
Consolidate the code copy button
...
Adding the code code button was done by manipulating the HTML of
the event body to add a span tag, then adding the onclick handler
after the thing was mounted. Apart from splitting the code between
two places, adding the span tag was, according to Chrome's
profiler, taking up quite a lot of CPU cycles (apparently as soon
as you set the innerHTML on a div). Instead, just build the whole
lot together after the component mounts.
2017-09-10 14:23:33 +01:00
David Baker
ea5726aa4e
Copyright
2017-09-08 23:14:06 +01:00
David Baker
ec3ff529e7
Fast path for emojifying strings
...
Emojione's regex for detecting emoji is *enourmous* and we were
running it on every display name, room name, message etc every time
those components mounted. Add a much simpler regex to rule out the
majority of strings that contain no emoji and fast-path them.
Makes room switching about 10% faster (in my tests with all the
profiling turned on).
2017-09-08 23:05:27 +01:00
Michael Telatynski
b10b0e573d
i18n and change message depending on success of copy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-06 11:29:55 +01:00
Michael Telatynski
269f1f33e3
show response on copy so you don't mash it
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-09-06 11:27:25 +01:00
Robert Swain
53574541c3
AppTile: Add Jitsi electron screensharing support
2017-09-04 09:31:25 +02:00
Luke Barnard
0ded4acba0
Mark TODO for https://github.com/vector-im/riot-web/issues/4951
2017-08-31 17:52:53 +01:00
Luke Barnard
d84190f58d
Explain Flair debounce
2017-08-31 17:49:19 +01:00
Luke Barnard
e89d52ccbf
Do not get avatars when no groups were/could be retrieved
2017-08-31 16:46:39 +01:00
Luke Barnard
86e8a4c7e2
Make componentWillMount not async
...
This was left over from a previous refactor
2017-08-31 16:44:14 +01:00
David Baker
9efa604706
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-30 17:39:47 +01:00
David Baker
cf747fcb57
Lint
2017-08-30 17:34:44 +01:00
Luke Barnard
ebc1993530
Implement Flair
...
Add 14x14 group avatars next to sender profiles.
2017-08-30 11:10:49 +01:00
Richard Lewis
84481f1a1e
Merge pull request #1350 from matrix-org/rxl881/scalarTokenFix
...
Make staging widgets work with live and vice versa.
2017-08-30 11:04:50 +01:00
Richard Lewis
2ff1888054
Make staging widgets work with live and vice versa.
2017-08-30 10:36:22 +01:00
Richard van der Hoff
b9e047f0ff
Avoid breaking /sync with uncaught exceptions
...
For reasons I don't fully understand, it appears that sometimes the
ReadReceiptMarker has no offsetParent. Rather than dying with an uncaught
exception when that happens (and taking out half of React as well as the /sync
handler), log a warning and suppress the animation.
2017-08-30 10:01:45 +01:00
David Baker
824b29dc1f
PR feedback
2017-08-30 09:22:26 +01:00
David Baker
d86fe0df6e
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-29 13:29:55 +01:00
Michael Telatynski
edb449dfe5
we need to pass whether it is an invite RoomSubList explicitly (i18n)
2017-08-27 23:38:25 +01:00
Michael Telatynski
cd1e58cb61
_tJsx returns a React Object, the sub fn must return a React Object
...
not a string
2017-08-26 08:18:55 +01:00
David Baker
299db845ff
PR feedback
2017-08-25 12:10:13 +01:00
David Baker
5cfec247f0
Merge pull request #1331 from matrix-org/luke/fix-completion-click-to-insert
...
Fix click to insert completion
2017-08-24 14:56:15 +01:00
Michael Telatynski
ec6867dc8b
Fix React crying on machines without internet due to return undefined
2017-08-24 12:32:37 +01:00
David Baker
c11432c3e3
Catch the promise rejection if scalar fails
...
Otherwise this is incredibly annoying when developing if you don't
have a scalar that will allow you to register (ie. if you're
testing against an HS on your dev box)
2017-08-23 19:35:33 +01:00
Luke Barnard
8ed5422a45
Fix click to insert completion
...
And remedy weird API in the process. Autocomplete now exposes `onSelectionChange` to indicate that the user has selected another completion, rather than returning the chosen completion via onUpArrow etc.
Fixes vector-im/riot-web#4835
2017-08-23 16:22:14 +01:00
Richard Lewis
502a0480a0
Merge pull request #1327 from matrix-org/matthew/multiple-widgets
...
Matthew/multiple widgets
2017-08-22 10:53:51 +01:00
David Baker
e72bdffd62
Remove unused import
2017-08-22 10:22:51 +01:00
David Baker
5f816666e1
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-22 10:08:02 +01:00
Richard Lewis
a69cc9169f
lint fix.
2017-08-22 10:04:57 +01:00
David Baker
ac64e9b705
Lint
2017-08-21 19:34:07 +01:00
David Baker
b898d15580
Specify default number of members to load
2017-08-21 19:30:28 +01:00
David Baker
e77ea352e4
Support full group membership cycle
...
Apart from knocking, ie. Invite / accept / reject / leave
2017-08-21 19:18:32 +01:00
David Baker
a0fe3d1cb0
Merge pull request #1326 from matrix-org/rav/userpicker_proptypes
...
Fix proptypes on UserPickerDialog
2017-08-21 16:43:15 +01:00
Richard van der Hoff
764d5891ad
Fix proptypes on UserPickerDialog
...
... so that it doesn't log an error
2017-08-21 16:30:49 +01:00
Richard Lewis
b7569a9831
Revert auxPanel changes (this should already have been fixed in a separate PR).
2017-08-21 15:29:11 +01:00
Robert Swain
385205471b
AppsDrawer: Remove unnecessary bind
2017-08-21 15:34:13 +02:00
Richard Lewis
c0f0425907
Merge pull request #1322 from matrix-org/rxl881/styling
...
Position add app widget link
2017-08-21 14:03:27 +01:00
Richard Lewis
6c8391e3ea
Remove beta tag.
2017-08-21 11:39:06 +01:00
Richard Lewis
e93a1fac3d
Position add app widget link
2017-08-21 11:29:42 +01:00
Robert Swain
2eac869e27
Merge branch 'develop' into rob/apps-not-e2ee
2017-08-21 10:30:38 +02:00
Robert Swain
70824960ee
AppPermission: Make strings translatable
2017-08-21 10:23:55 +02:00
Matthew Hodgson
d7f5295949
untested WIP for supporting multiple widgets properly
2017-08-18 18:40:00 +01:00
Richard Lewis
1862057695
Only render appTile body (including warnings) if drawer shown.
2017-08-18 18:33:56 +01:00
Luke Barnard
b678c2cf0f
Don't bind Pill function, React does this for us
2017-08-18 17:15:27 +01:00
Robert Swain
2e00968bcd
AppPermission: Note that apps are not E2E encrypted in E2E rooms
2017-08-18 17:44:33 +02:00
Richard Lewis
1c36e47403
Fix add widget link
2017-08-18 15:59:12 +01:00
Richard Lewis
b7d46d91ed
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-18 15:35:01 +01:00
Luke Barnard
bf07333915
Merge pull request #1316 from matrix-org/luke/fix-app-name-case
...
Don't apply case logic to app names
2017-08-18 15:08:40 +01:00
Luke Barnard
5e0a7212d9
Don't apply case logic to app names
...
As they should have the Correct Case in integrations land now
2017-08-18 14:57:28 +01:00
Luke Barnard
36fffa1696
Stop integ manager opening on every room switch
...
This was caused by a broken assumption which was AppsDrawer component mounting === clicking on apps draw toggle.
This was introduced in matrix-org/matrix-react-sdk#1312 .
Known issue with this fix: deleting the last app doesn't hide the app drawer.
2017-08-18 14:48:58 +01:00
Richard Lewis
857a8c9519
Remove empty defaultProps.
2017-08-18 13:28:47 +01:00
Richard Lewis
84f5e5aad2
REmove unused onCancelClick
2017-08-18 12:21:48 +01:00
Luke Barnard
1a1a80b633
Merge branch 'develop' into luke/feature-app-tile-ux
2017-08-18 12:12:00 +01:00
Luke Barnard
cab3123bd8
Merge pull request #1312 from matrix-org/luke/feature-widget-timeline-events
...
Implement TextualEvent tiles for im.vector.modular.widgets
2017-08-18 12:10:22 +01:00
Richard Lewis
96900e76a0
Move error logging to where it is first caught.
2017-08-18 11:51:32 +01:00
Richard Lewis
4b5cdac032
Don't show widget security warning to the person who added it to the room.
2017-08-18 11:41:27 +01:00
David Baker
55998028b4
Show group invites in 'invites' section
2017-08-18 11:22:50 +01:00
Luke Barnard
57505c3a61
Add behaviour to toggle app draw on app tile header click
2017-08-18 10:56:35 +01:00
Luke Barnard
9382689675
Merge branch 'develop' into luke/feature-widget-timeline-events
2017-08-18 10:47:25 +01:00
Luke Barnard
acc54b97f1
Implement TextualEvent tiles for im.vector.modular.widgets
...
E.g. "Bob added a Acme widget", "Susan removed a Giraffe widget"
The name is calculated by taking the `name` in the event content, falling back on the `type`, falling back on the previous content `type`. This is then capitalised.
2017-08-18 10:35:33 +01:00
Matthew Hodgson
bb0845954d
improve wording for directory listings
2017-08-17 19:10:45 +01:00
Matthew Hodgson
7c04a6671d
expand auxPanel when showing apps
2017-08-17 19:06:19 +01:00
Richard Lewis
120a4f4f44
Check for valid roomId before renering manageIntegsButton.
2017-08-17 18:10:50 +01:00
Richard Lewis
0907fff080
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-17 17:47:46 +01:00
David Baker
91fe308f06
Merge pull request #1310 from matrix-org/t3chguy/hotfix1
...
hotfix bad fn signature regression
2017-08-17 17:31:55 +01:00
Michael Telatynski
766c188a1e
hotfix bad fn signature regression
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-08-17 17:15:18 +01:00
Michael Telatynski
bdb2d6b475
Merge remote-tracking branch 'remotes/origin/develop' into set_default_federate_by_settings
...
# Conflicts:
# src/components/structures/MatrixChat.js
2017-08-17 13:39:19 +01:00
Michael Telatynski
ca5e26744f
Make dialog more specific and hide options behind advanced spoiler
2017-08-17 13:33:07 +01:00
Richard Lewis
02edadbd15
Don't bubble cancel click to room header.
2017-08-17 12:21:44 +01:00
Richard Lewis
d1ee257b5a
Pass roomId rather than whole room object.
2017-08-17 12:15:01 +01:00
Richard Lewis
eb77dcc8e3
Camel case variable name
2017-08-17 11:24:25 +01:00
Richard Lewis
2c25639a61
Fix copyright header
2017-08-17 11:22:42 +01:00
Richard Lewis
9111cb421e
Merge pull request #1291 from matrix-org/rxl881/maxWidgets
...
Show a dialog if the maximum number of widgets allowed has been reached.
2017-08-17 10:03:42 +01:00
MTRNord
59815359f8
Add misiing _tJsx import
2017-08-16 23:55:43 +02:00
MTRNord
fceccfc503
Add missing Robot string to translation
2017-08-16 23:54:36 +02:00
David Baker
252ab208e4
Merge pull request #1300 from matrix-org/dbkr/userpicker
...
Refactor ChatInviteDialog to be UserPickerDialog
2017-08-16 14:29:07 +01:00
David Baker
e1ddd3781d
Merge branch 'dbkr/userpicker' into dbkr/group_userlist
2017-08-15 14:10:45 +01:00
David Baker
81273ec855
Move non-invite specific stuff to UserAddress
2017-08-15 13:42:23 +01:00
David Baker
bbcf7e1d9b
s/inviteList/userList/
2017-08-15 13:30:13 +01:00
David Baker
fa660c8211
PR feedback
2017-08-15 10:57:24 +01:00
David Baker
64f352dda7
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-15 10:49:07 +01:00
Luke Barnard
004cc42cfc
Merge pull request #1298 from matrix-org/luke/store-history-as-raw-content
...
Store history as raw content
2017-08-15 09:18:22 +01:00
Luke Barnard
6baca05968
Merge pull request #1297 from matrix-org/luke/fix-user-pill-onclick
...
Add onClick to user pills
2017-08-15 09:15:50 +01:00
David Baker
b7b449434d
Lint
2017-08-15 09:10:13 +01:00
David Baker
1b66e88b6e
ChatInviteDialog -> UserPickerDialog pt 2
...
The other changes I forgot to add
2017-08-14 17:43:00 +01:00
David Baker
447aa1e5a0
Refactor ChatInviteDialog to be UserPickerDialog
...
Now it's just a means of choosing users and all the actual inviting
functionality is moved out to Invite.js. This will allow us to
reuse it for inviting to groups.
Adds the ability to restrict what types of addresses may be chosen,
although this isn;t used yet, it will be necessary for groups
because groups don't support 3pid invites.
2017-08-14 17:38:59 +01:00
Luke Barnard
6b1b643d41
Merge branch 'develop' into luke/store-history-as-raw-content
2017-08-14 16:42:22 +01:00
Luke Barnard
9742962d61
preventDefault when moving autocomplete selection with vertical arrow
...
Otherwise the composer selection updates, in turn hiding the autocomplete box - fixes vector-im/riot-web#4790
2017-08-14 15:16:13 +01:00
Luke Barnard
bb229d33a4
Add onClick to user pills
...
instead of using the converted matrix.to href. This is undesirable and a better solution would be to fix routing in Riot in general and then change user pills to do something like `/room/../member/@userId`.
2017-08-14 14:44:08 +01:00
Richard Lewis
454ec40b00
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-11 10:35:20 +01:00
Richard Lewis
0323151bee
Show a dialog if the maximum number of widgets allowed has been reached.
2017-08-10 23:53:43 +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
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
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
David Baker
4daf9064d9
Convert to API objects
...
& remove redundant power label
2017-08-09 18:15:31 +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
Richard Lewis
185379b037
Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/appFixes
2017-08-09 14:07:45 +01:00
David Baker
c1546ceb59
Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist
2017-08-09 13:46:15 +01:00
Richard Lewis
4bc25f12cb
Move manage integrations button in to stand-alone component
2017-08-09 11:44:24 +01:00
Luke Barnard
610b2a3a42
For mentions, always use rawDisplayName and remove (IRC)
2017-08-09 10:40:06 +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
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
cb8a66b5a1
When hide
ing autocomplete, also remove completion state
2017-08-08 17:25:11 +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
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
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
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
Richard Lewis
18ae5fd129
Send messages on widget addition and deletion
2017-08-06 11:01:14 +01:00
Richard Lewis
308d932b2f
CancelClick prop.
2017-08-06 10:29:43 +01:00