OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
2,806 Commits
203 Branches
553 Tags
456 MiB
Commit Graph

2806 Commits (f5bc8d1fe05a82b653e82539c419952fbc9ecbd9)

Author SHA1 Message Date
David Baker 041b10539a 0.7.1 2016-09-21 11:57:51 +01:00
David Baker 11db163c15 changelog 2016-09-21 11:56:24 +01:00
David Baker 681b45230e Pin to js-sdk 0.6.0 2016-09-21 11:50:17 +01:00
David Baker 165da6ca27 Pin to js-sdk 0.6.0 2016-09-21 11:47:53 +01:00
David Baker 1870cd0e2b Merge branch 'master' into develop 2016-09-21 11:45:10 +01:00
David Baker c34108eab5 0.7.0 2016-09-21 11:43:15 +01:00
David Baker 4e062447d2 Prepare changelog for v0.7.0 2016-09-21 11:43:15 +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 2fd3c7c5ac Merge pull request #487 from matrix-org/dbkr/incoming_dm_heuristic 
Apply heuristic on incoming DMs
 2016-09-21 10:29:30 +01:00
David Baker 5b216df28e Not joined members any more 2016-09-21 09:57:17 +01:00
Aviral Dasgupta f171985e4c Fix click-to-complete in RTE 
Closes vector-im/vector-web#2179
 2016-09-21 07:40:48 +05:30
Aviral Dasgupta 44217422d0 Force-hide autocomplete after sending message. 
Fixes vector-im/vector-web#2128
 2016-09-21 07:28:07 +05:30
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
Kegsay 9be1ab774d Merge pull request #484 from matrix-org/kegan/add-close-scalar-event 
Pass close_scalar postMessage action through to the dispatcher
 2016-09-19 10:47:51 +01: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