Commit Graph

2939 Commits (61cf08ca1b51cfc0299c5f758b9b7842396f49a0)

Author SHA1 Message Date
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
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
Matthew Hodgson 77595320a7 close the RoomSettings when you close Scalar 2016-09-15 22:56:12 +01:00
Matthew Hodgson 3fcea1bfc7 only apply verified css to genuinely verified tiles 2016-09-15 22:56:12 +01:00
Matthew Hodgson c21309fdf6 remove stale state 2016-09-15 22:56:12 +01:00
Matthew Hodgson f2a8ead42a Merge pull request #480 from aviraldg/develop
Disable username and room decorators
2016-09-15 22:36:33 +01:00
Aviral Dasgupta 39d213429d Disable username and room decorators 2016-09-16 02:47:27 +05:30
Matthew Hodgson b98c2ae25e update crypto state of the room in realtime when turned on 2016-09-15 19:25:53 +01:00
David Baker 44fa851275 Pass through config for Room Directory 2016-09-15 17:18:53 +01:00
Matthew Hodgson 1899d61893 textual event for m.room.encryption 2016-09-15 17:01:02 +01:00
Matthew Hodgson db66d728c9 more e2e disclaimers 2016-09-15 16:38:37 +01:00
Matthew Hodgson 70011410cf Merge pull request #478 from matrix-org/wmwragg/correct-incoming-call-positioning
Wmwragg/correct incoming call positioning
2016-09-15 15:59:06 +01:00