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

1359 commits

Author SHA1 Message Date
Richard van der Hoff
c1db6fb42d Merge pull request #429 from matrix-org/rav/timelinepanel_test 
Update annoying TimelinePanel test
 2016-08-25 15:40:03 +01:00
Matthew Hodgson
ae910d82a8 Merge pull request #416 from aviraldg/feature-changelog 
add fancy changelog dialog
 2016-08-24 18:01:39 +01:00
Richard van der Hoff
cdd2902b01 Update annoying TimelinePanel test 
* Actually test what we were supposed to be testing (viz, that we can paginate
  back down after we hit the top of the room)

* Make the cap on the number of events we show in the timeline a configurable
  property, so that we can set it in the test

* Use a smaller cap in the test, so that we have to do less paginating to hit
  the cap, to make the test run quicker.

* add some more logging so that we can see how far it's got if it gets stuck.
 2016-08-24 16:28:00 +01:00
Matthew Hodgson
2f0599aae1 Merge pull request #419 from aviraldg/feature-autocomplete-improvements 
Update autocomplete design and scroll it correctly
 2016-08-24 14:47:22 +01:00
Matthew Hodgson
08c0d7e298 Merge pull request #426 from matrix-org/wmwragg/chat-message-presentation 
Added event/info message avatars back in
 2016-08-23 17:14:11 +01:00
wmwragg
ae8234ffe3 Added event/info message avatars back in 2016-08-23 15:58:27 +01:00
Kegsay
c10208a203 Merge pull request #423 from matrix-org/kegan/scalar-postmessage-api 
Add postMessage API required for integration provisioning
 2016-08-23 15:00:44 +01:00
Kegan Dougal
9162a0ff01 Add postMessage API required for integration provisioning 
Supports querying member state and creating invites only.
 2016-08-23 12:00:11 +01:00
Aviral Dasgupta
884abbd7e9 Cleanup autocomplete 2016-08-23 00:36:31 +05:30
wmwragg
48a2567b82 Merge branch 'develop' into wmwragg/chat-message-presentation 2016-08-19 17:19:30 +01:00
wmwragg
993333490d Removal of the mini avatars for action (info) messages 2016-08-19 16:38:05 +01:00
wmwragg
afd1ab1582 Comment to describe what info messages are 2016-08-18 22:19:23 +01:00
wmwragg
ddda435e9e Updated the MessagePanel to now take account of /me messages when working out if an event is a continuation message or not 2016-08-18 22:15:53 +01:00
wmwragg
a55c4a2a52 Initial pass at the /me and action messages, without name highlighting, and missing avatar for continuation messages after a /me or action message 2016-08-18 21:53:37 +01:00
Richard van der Hoff
e29be619c9 Merge pull request #420 from matrix-org/dbkr/make_notif_silder_work 
Make the notification slider work
 2016-08-18 15:23:45 +01:00
David Baker
fc2c62e896 We can use the new consts here 2016-08-18 15:19:24 +01:00
David Baker
af48b8920e Various PR feedback 2016-08-18 14:00:14 +01:00
David Baker
9e45279894 Use enumalike thing 2016-08-18 13:44:58 +01:00
David Baker
73e486cc58 Hide red highlight badge in mute mode 2016-08-18 11:58:27 +01:00
David Baker
dd088794c2 Remove the mute toggle from room settings 
As it now incorrectly represents the mute as a binary toggle rather than a quad-state
 2016-08-17 18:50:34 +01:00
David Baker
87f94bde62 Fix up notification setting listener in roomtile 
The previous dispatch only did binary muted/non-muted but we now have 4 states. We now just listen for the push rules account data and update on that so it stays in sync if the pishrules are changed elsewhere.

Also add util functions used here for getting the notif state and in vector for both getting and setting it.
 2016-08-17 18:26:37 +01:00
Richard van der Hoff
69e8cb6f44 Merge branch 'rav/no_deviceload_if_disabled' into develop 2016-08-17 14:41:18 +01:00
Richard van der Hoff
0356f04b9c MemberInfo: initialise _enableDevices in componentWillMount 
... to avoid referencing it in render() before it is set
 2016-08-17 14:40:10 +01:00
Aviral Dasgupta
e173900808 Update autocomplete design and scroll it correctly 2016-08-17 17:27:19 +05:30
Richard van der Hoff
30168a1b9c Don't download E2E devices if feature disabled 
If the user hasn't enabled the E2E setting in the labs, there is no point in
firing off the device download request when the MemberInfo is opened.
 2016-08-17 09:57:06 +01:00
wmwragg
52f5061cc5 Made the menu button a clickable image rather than an input element 2016-08-16 17:34:33 +01:00
wmwragg
58d9789645 Increase main avatar size 2016-08-16 16:03:34 +01:00
wmwragg
c359358101 Initial context menu positioning and style change 2016-08-16 11:59:26 +01:00
wmwragg
6fd61f5816 Initial reposition of the timestamp 2016-08-16 10:26:27 +01:00
Aviral Dasgupta
ff39d52431 add fancy changelog dialog 2016-08-16 03:33:47 +05:30
Matthew Hodgson
2a3b0e85ea add rel='noopener' wherever we do target='_blank' because https://mathiasbynens.github.io/rel-noopener/ 2016-08-15 21:37:26 +01:00
David Baker
5a83adc2b6 Merge pull request #414 from matrix-org/rav/fix_device_display_name 
defaultDeviceDisplayName should be a prop
 2016-08-12 11:44:57 +01:00
Richard van der Hoff
b9870f2c23 defaultDeviceDisplayName should be a prop 
... not a bit of config.
 2016-08-12 11:41:45 +01:00
David Baker
33e9abe421 Merge pull request #410 from matrix-org/rav/use_server_device_id 
Use server-generated deviceId
 2016-08-12 11:40:55 +01:00
Richard van der Hoff
a29325cc46 Set initial_device_display_name on login and register 
Let Vector pass in a default device name, and thread it through everywhere to
set it on login and register calls
 2016-08-12 10:55:02 +01:00
David Baker
cb905dbaef Merge pull request #409 from matrix-org/rav/device_panel_stuff 
Add device_id to devices display
 2016-08-12 10:43:44 +01:00
David Baker
5f61464195 Merge pull request #408 from matrix-org/rav/refactor_matrix_client 
Don't use MatrixClientPeg for temporary clients
 2016-08-12 10:42:58 +01:00
David Baker
fc0c5a5c58 Tidy up fix to multi-invite 2016-08-12 10:02:55 +01:00
Richard van der Hoff
df22768f1b Use server-generated deviceId 2016-08-12 07:31:15 +01:00
Matthew Hodgson
d1eec57118 fix inviting some more 2016-08-11 17:11:51 -05:00
Matthew Hodgson
3bedad69cd unbreak inviting :( 2016-08-11 17:08:17 -05:00
David Baker
109184aab7 Merge pull request #411 from matrix-org/dbkr/fix_messagecomposer_style 
Only show Autocomplete if autocomplete is enabled
 2016-08-11 16:47:07 +01:00
David Baker
7cb663d39d Only show Autocomplete if autocomplete is enabled 
It was just never used, but it has 1px top border which makes the top border on chat look too big
 2016-08-11 16:28:32 +01:00
Richard van der Hoff
55a28564b9 Add device_id to devices display 
(it turns out to be quite useful)
 2016-08-11 16:24:09 +01:00
Richard van der Hoff
e32c325863 Don't use MatrixClientPeg for temporary clients 
Get rid of MatrixClientPeg.replaceUsingUrls, and instead create local,
temporary MatrixClients for the unauthed steps; we therefore only use
MatrixClientPeg for logged-in clients.
 2016-08-11 16:23:03 +01:00
Matthew Hodgson
3704e2c648 Merge pull request #402 from matrix-org/wmwragg/room-tag-menu 
Wmwragg/room tag menu
 2016-08-11 08:59:32 -05:00
David Baker
4f76398b29 Merge pull request #407 from matrix-org/rav/refactor_guest_registration 
Move guest registration into the login logic
 2016-08-11 13:13:51 +01:00
Richard van der Hoff
e06763d421 Move guest registration into the login logic 2016-08-11 13:05:16 +01:00
David Baker
4780f9000d Merge pull request #403 from matrix-org/dbkr/multi_invite 
Better support for inviting multiple people
 2016-08-11 12:34:16 +01:00
David Baker
f42d619e7d Missing comma 2016-08-11 12:30:37 +01:00