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

738 commits

Author SHA1 Message Date
Matthew Hodgson
e7074ef9af apply FilePanel css and fix filtering 2016-09-07 22:54:37 +01:00
Matthew Hodgson
e5dd2e0b46 make FilePanel work, superficially at least 2016-09-07 22:54:37 +01:00
Matthew Hodgson
e22d0a53b6 WIP switch-over of TimePanel from taking Rooms to taking EventTimelineSets 2016-09-07 22:54:37 +01:00
Matthew Hodgson
c3de035964 filepanel 2016-09-07 22:54:37 +01:00
Matthew Hodgson
ae34f2ed5c placeholder NotificationPanel 2016-09-07 22:53:15 +01:00
Matthew Hodgson
d9ffe30a0d WIP notif panel 2016-09-07 22:53:15 +01:00
David Baker
df1cc8748f Change references to MatrixTools to Rooms 
or remove where they were unused
 2016-09-07 11:33:58 +01:00
Matthew Hodgson
b5f9c2a5ac Merge branch 'master' into develop 2016-09-02 17:17:24 +01:00
Matthew Hodgson
d5062f1ff7 gah, revert debug 2016-09-02 17:15:21 +01:00
Matthew Hodgson
fd664e893f Merge branch 'master' into develop 2016-09-02 17:14:24 +01:00
Matthew Hodgson
6de2e8bda5 update changelog 2016-09-02 17:13:52 +01:00
Richard van der Hoff
b4521bc44c review feedback 2016-09-01 22:45:09 +01:00
Richard van der Hoff
ba341c11fb Show session restore errors on the login screen 
If we are unable to load the matrix session on startup, don't just get stuck at
a spinner; instead, show the error on the login screen.
 2016-09-01 11:08:40 +01:00
wmwragg
769e7d3b2e Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-30 11:19:54 +01:00
Matthew Hodgson
5e105e1be6 make /user URLs work 2016-08-28 14:04:11 +01:00
Matthew Hodgson
de82ac3bc0 don't change URL bar when clicking on linkified rooms or users. 
be aware of /user paths.
 2016-08-28 02:05:31 +01:00
Matthew Hodgson
ad873c2b60 handle matrix.to links correctly. add partial support for #/user URLs 2016-08-28 01:55:42 +01:00
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
wmwragg
6a4d02ffc5 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-23 12:49:21 +01:00
wmwragg
6d1f9003e2 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-23 10:52:50 +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
Aviral Dasgupta
ff39d52431 add fancy changelog dialog 2016-08-16 03:33:47 +05:30
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
Richard van der Hoff
df22768f1b Use server-generated deviceId 2016-08-12 07:31:15 +01:00
wmwragg
434115ccda Bugifx: 'background-color' in react should be 'backgroundColor' 2016-08-11 17:34:05 +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
Richard van der Hoff
e06763d421 Move guest registration into the login logic 2016-08-11 13:05:16 +01:00
Richard van der Hoff
bbfb9291f8 Refactor login token 
move the logic for handling login tokens into Lifecycle.loadSession

This means it needs access to the (real) query parmeters, so it depends on
corresponding changes in vector-web.
 2016-08-11 11:02:52 +01:00
David Baker
6802db05bd Merge pull request #405 from matrix-org/rav/use_right_hs_for_guest_login 
Use the current HS for guest login
 2016-08-11 10:32:37 +01:00
David Baker
46899a0086 Merge pull request #395 from aviraldg/fix-emoji 
Various fixes and improvements to emojification.
 2016-08-11 10:23:00 +01:00
Aviral Dasgupta
4c1dcb924b reskindex and use sdk.getComponent for EmojiText 2016-08-11 07:55:12 +05:30
Richard van der Hoff
1fbddcf6af Use the current HS for guest login 
Make sure that we use the homeserver from localstorage for guest regsistration,
in preference to the default.

Also rename the parameters for loadSession
 2016-08-11 01:39:33 +01:00
wmwragg
e2d3631e7c Menu colour now changeable, and leave room item hooked up 2016-08-10 16:34:49 +01:00
David Baker
f08519a496 Merge pull request #401 from matrix-org/rav/avoid_login_for_guest 
Avoid flashing up login screen during guest registration
 2016-08-10 15:38:34 +01:00
Richard van der Hoff
68f8db3834 Avoid flashing up login screen during guest registration 
Fix a bug where we would flash up the login screen during guest registration if
you followed a room link.
 2016-08-10 14:34:44 +01:00
Richard van der Hoff
8fe470bce1 Cancel calls to rate-limited funcs on unmount 
The tests were throwing up warnings about state being accessed, and null
MatrixClients being called, after component unmount.
 2016-08-10 13:39:47 +01:00
David Baker
e0f71977b4 Merge pull request #397 from matrix-org/rav/factor_out_sessionloader 
Start to factor out session-loading magic
 2016-08-10 11:40:58 +01:00
Richard van der Hoff
26c7c9e994 Make SessionLoader a function 
There's no point in it being a React component.
 2016-08-10 11:36:26 +01:00
David Baker
13a4bfa8fe Merge pull request #396 from matrix-org/rav/fix_react_warning 
Hack around a react warning
 2016-08-10 10:09:18 +01:00
Richard van der Hoff
24841cc5c4 Start to factor out session-loading magic 
Take some of the magic out of MatrixChat.componentDidMount() into a new
component.

Also delete the MatrixChat test. It wasn't really doing much, is broken by the
change, and I am replacing it with (better) app-level tests in the vector
project.
 2016-08-10 00:05:44 +01:00
Richard van der Hoff
a1d3db76e5 Hack around a react warning 
when login completes, we replace the whole state, which means we unset
collapse_lhs, which then leads to complaints from the RoomList.

I think the 'default view' for MatrixChat ought to be factored out to another
component, which could manage collapse_lhs properly; but for now, hack around
it.
 2016-08-09 23:57:36 +01:00
Aviral Dasgupta
09e8a45cde Add EmojiText component for emoji replacement. 2016-08-10 00:31:51 +05:30
Aviral Dasgupta
dbbea63227 Various fixes and improvements to emojification. 
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Add emoji shortcodes as titles
 2016-08-09 22:09:28 +05:30
David Baker
4b8ad3c102 Merge pull request #393 from matrix-org/dbkr/enable_labs 
Add config to hide the labs section
 2016-08-05 17:25:25 +01:00