PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
2615 commits 1 branch 0 tags 338 MiB
Commit graph

2198 commits

Author SHA1 Message Date
David Baker
c228fac6d9 Merge pull request #488 from aviraldg/fix-2180 
force old selection state after creating entities
 2016-09-22 10:49:10 +01:00
David Baker
5fff3bdf24 Document brokenness 2016-09-21 16:25:18 +01:00
David Baker
8ae210cbe2 Revert #333 
Revert https://github.com/matrix-org/matrix-react-sdk/pull/333/files since sanitizer blindly allows urls with no scheme, meaning  // links can be used to fetch images over whatever scheme you serve vector over (ie. normally http/https).
 2016-09-21 16:19:41 +01:00
David Baker
b83d1db24a Missed some Vectors 2016-09-21 14:03:35 +01:00
David Baker
5fa67d9617 Merge pull request #490 from matrix-org/rav/encrypted_event_dialog 
EncryptedEventDialog updates
 2016-09-21 10:52:22 +01:00
Richard van der Hoff
2842506b27 EncryptedEventDialog updates 
* Separate info on the event from info on the device, and add a couple of new
   fields.

 * Use MatrixClient.getEventSenderDeviceInfo (requires
   https://github.com/matrix-org/matrix-js-sdk/pull/214)

 * Don't force a download of the device keys every time we open the dialog

 * Fix a react warning if the device query takes a while
 2016-09-21 10:36:23 +01:00
David Baker
5b216df28e Not joined members any more 2016-09-21 09:57:17 +01:00
Aviral Dasgupta
ea1419ff78 force old selection state after creating entities 
Fixes vector-im/vector-web#2180
 2016-09-21 07:20:50 +05:30
David Baker
d1a5e54a69 Check if a room looks like a DM rooms on joining 
and mark it as one if so.

Also change the heuristic to only count rooms with 2 total members rather than 2 joined members, otherwise this is going to mark any room as a DM if someone creates a room, invites a bunch of people and you happen to be first to join.
 2016-09-20 17:59:46 +01:00
David Baker
b66c449bd7 Comment typo 
and out comment in more sensible place
 2016-09-20 16:08:11 +01:00
Matthew Hodgson
a2904ad33f fix 'new chat' layout bug 2016-09-20 10:06:57 -04:00
David Baker
746aad9a18 Oops, missed one 2016-09-19 14:47:08 +01:00
David Baker
c40a7a696e Merge pull request #485 from matrix-org/dbkr/riot 
Rebrand
 2016-09-19 13:36:55 +01:00
David Baker
31753fc3f3 Rebrand 2016-09-19 13:26:59 +01:00
Matthew Hodgson
b348cf1244 actually apply scalar CSS :( 2016-09-19 07:01:46 -04:00
Kegan Dougal
993bb5c89d Pass close_scalar postMessage action through to the dispatcher 2016-09-19 10:38:42 +01:00
Matthew Hodgson
7691559e01 more disclaimer 2016-09-17 22:07:43 +01:00
Matthew Hodgson
53bb6b96ce don't warn when disabling crypto 2016-09-17 21:56:10 +01:00
Matthew Hodgson
5fa5489bbd disambiguate devices by ID in memberinfo 2016-09-17 20:12:56 +01:00
Matthew Hodgson
6e57faecb0 trim whitespace when adding to list 2016-09-17 16:14:02 +01:00
Matthew Hodgson
da85df9d1a let comma trigger autocomplete. hook up backspace. search displaynames that include space 2016-09-17 15:21:08 +01:00
Matthew Hodgson
88273e8065 move admin tools to the top 2016-09-17 15:07:41 +01:00
Matthew Hodgson
cf1b1442eb no labs for guests 2016-09-17 14:29:40 +01:00
Matthew Hodgson
0046ae50b5 switch to 3-digit formatting for counts 2016-09-17 02:39:19 +01:00
Matthew Hodgson
c51e6907f0 fix spinner on createroom 2016-09-17 02:19:32 +01:00
Matthew Hodgson
026a2e6c7c fix guest login when in a RoomView 2016-09-17 02:19:27 +01:00
Matthew Hodgson
671eacaac7 fix self/this crash, and don't let guests invite 2016-09-17 02:05:27 +01:00
Matthew Hodgson
736b6dac7a default labs correctly :/ 2016-09-17 00:54:56 +01:00
Matthew Hodgson
96fd460cc8 fix import 2016-09-16 23:29:35 +01:00
Matthew Hodgson
cfba600961 Merge pull request #482 from aviraldg/fix-2165 
Replace <p>s with <br/>s consistently
 2016-09-16 22:46:41 +01:00
Matthew Hodgson
00d2fd471d Merge pull request #483 from matrix-org/dbkr/scrollpanel_start_at_bottom 
Add 'startAtBottom' flag
 2016-09-16 22:38:21 +01:00
Matthew Hodgson
c322a191af turn on E2E and Scalar by default 2016-09-16 18:36:03 +01:00
Matthew Hodgson
08543a66c4 fix race between setting canonical alias and creating aliases 2016-09-16 18:01:14 +01:00
David Baker
d0fd6e985f Document paranoia on the startAtBottom param 2016-09-16 17:48:08 +01:00
Matthew Hodgson
67565f88fa Merge pull request #474 from matrix-org/markjh/olm_version 
Add the olm version to the settings page.
 2016-09-16 17:30:35 +01:00
David Baker
806ef11fde Add 'startAtBottom' flag 
Controls whether a scrollPanel starts off at the bottom.

This may not be necessary and could either be derived from stickyBottom, but
this means I can be sure that the behaviour of ScrollPanel is completely
unchanged for all other uses to avoid breaking any other uses of
ScrollPanel.
 2016-09-16 17:18:58 +01:00
Aviral Dasgupta
6befb09509 Replace <p>s with <br/>s consistently 
Also, allow newlines in /commands.
Fixes vector-im/vector-web#2114, vector-im/vector-web#2165.
 2016-09-16 21:40:00 +05:30
David Baker
1341ffca59 Merge pull request #479 from matrix-org/dbkr/directory_network_selector 
Pass through config for Room Directory
 2016-09-16 17:08:44 +01:00
Matthew Hodgson
a28aab42c4 fix NPE in guest access 2016-09-16 16:45:43 +01:00
Matthew Hodgson
891578d800 Merge pull request #481 from aviraldg/fix-autocomplete-unicode 
Fix unicode completions in autocomplete.
 2016-09-16 16:44:47 +01:00
Matthew Hodgson
e1bd97d509 don't try to set DM data for guests 2016-09-16 16:15:34 +01:00
Matthew Hodgson
88d92d1b61 Merge pull request #477 from matrix-org/luke/pm-plumbing-state 
Add ability to set plumbing state in a room
 2016-09-16 14:57:15 +01:00
Matthew Hodgson
b852756332 DM title 2016-09-16 14:35:43 +01:00
Aviral Dasgupta
2913e4605f Fix unicode completions in autocomplete. 
Fixes vector-im/vector-web#2208
 2016-09-16 15:38:29 +05:30
Matthew Hodgson
2b9258d377 use new rawDisplayName in AddressTile 2016-09-16 03:19:33 +01:00
Matthew Hodgson
1c1c31eafc fix tinter for LeftPanel 2016-09-16 02:53:41 +01:00
Matthew Hodgson
2c7c382d56 stop continuations leaking on filepanel 2016-09-16 02:40:09 +01:00
Matthew Hodgson
ff00474aa5 show RightPanel when people click on users 2016-09-16 02:37:06 +01:00
Matthew Hodgson
8519756c8c add dialog keyboard shortcuts. 2016-09-16 02:26:17 +01:00
Matthew Hodgson
eeb01563f8 add dialog keyboard shortcuts. download keys on demand 2016-09-16 02:26:09 +01:00