Luke Barnard
515222c25f
Track action button click event
2017-09-20 17:16:49 +01:00
Luke Barnard
979b580e1f
Merge branch 'develop' into luke/fix-ugly-integ-button
2017-09-19 17:04:06 +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
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
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
David Baker
5087da9247
Merge remote-tracking branch 'origin/develop' into luke/feature-flair
2017-09-13 16:52:12 +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
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
Luke Barnard
ebc1993530
Implement Flair
...
Add 14x14 group avatars next to sender profiles.
2017-08-30 11:10:49 +01:00
Richard Lewis
2ff1888054
Make staging widgets work with live and vice versa.
2017-08-30 10:36:22 +01:00
Michael Telatynski
ec6867dc8b
Fix React crying on machines without internet due to return undefined
2017-08-24 12:32:37 +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
Richard Lewis
a69cc9169f
lint fix.
2017-08-22 10:04:57 +01:00
Richard Lewis
6c8391e3ea
Remove beta tag.
2017-08-21 11:39:06 +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
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
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
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
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
Luke Barnard
57505c3a61
Add behaviour to toggle app draw on app tile header click
2017-08-18 10:56:35 +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
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
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
81273ec855
Move non-invite specific stuff to UserAddress
2017-08-15 13:42:23 +01:00
David Baker
fa660c8211
PR feedback
2017-08-15 10:57:24 +01:00
David Baker
1b66e88b6e
ChatInviteDialog -> UserPickerDialog pt 2
...
The other changes I forgot to add
2017-08-14 17:43:00 +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
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
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
