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

2787 Commits (0ab46df94af2d3858c750b1f25390a232e35566b)

Author SHA1 Message Date
David Baker 6281d76ade Merge remote-tracking branch 'origin/develop' into dbkr/directory_search_box 2016-09-23 14:43:13 +01:00
Richard van der Hoff 18cbd452b0 Merge pull request #495 from matrix-org/dbkr/irc_links 
Fix links to IRC rooms
 2016-09-23 14:31:30 +01:00
David Baker d0a15975c8 Merge pull request #492 from matrix-org/dbkr/make_markdown_less_aggressive 
Make markdown less aggressive
 2016-09-23 14:31:20 +01:00
David Baker 90c9d51c7d Typos 2016-09-23 14:15:48 +01:00
David Baker 898d792336 Update to linkifyjs 2.1.1 2016-09-23 14:05:31 +01:00
David Baker 2120963c7a More linkifier fixes 
* Accept underscores in usernames
 * Accept usernames & room aliases on localhost
 * Accept #localhost:foo.com and @localhost:foo.com
 2016-09-23 14:02:14 +01:00
David Baker fae9b048dd Merge remote-tracking branch 'origin/develop' into dbkr/irc_links 2016-09-23 13:50:03 +01:00
David Baker eeac0619f4 reskindex 2016-09-23 13:49:35 +01:00
David Baker 61b48a5b1a Add component for the directory search box 2016-09-23 13:48:24 +01:00
David Baker c8f6902da8 Merge pull request #494 from matrix-org/rav/reinstate_device_id 
Add the deviceId back to memberdeviceinfo
 2016-09-23 09:40:06 +01:00
Richard van der Hoff dd2da20031 Add the deviceId back to memberdeviceinfo 
It was removed by @ara4n in 5fa5489, but it's still useful!
 2016-09-22 19:28:50 +01:00
Richard van der Hoff 2f7b4f74fd Move the device verification buttons to their own class 
Instead of pulling in the whole of MemberDeviceInfo into EncryptedEventDialog
for utterly no reason and breaking everything
 2016-09-22 19:24:09 +01:00
David Baker 6ba20ec012 Better logic for wrapping in p tags or not 2016-09-22 18:57:46 +01:00
David Baker de0c92dadf Remove unused code 2016-09-22 18:37:14 +01:00
David Baker ca240b0b85 Don't wrap everything in p tags 
Preserves the old behaviour of not wrapping everything in p tags,
but also returns valid markup if the resulting markdown contains
multiple paragraphs (previously it stripped the <p> from the start
and the </p> from the end, leaving closing and opening paragraph tags
in the middle of the returned markup).

Also turn on the 'xhtml' option so marked uses self-closing tags
for br's, hr's and so forth.
 2016-09-22 18:17:02 +01:00
David Baker 0eddea1937 Disable link detection, as per comment 2016-09-22 17:51:34 +01:00
David Baker 6c7259eec8 Better detection of when input contains markdown 2016-09-22 17:18:12 +01:00
David Baker 898fbcee30 Merge pull request #489 from aviraldg/fix-2128 
Force-hide autocomplete after sending message.
 2016-09-22 10:49:23 +01:00
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 77c4cd337e Merge branch 'develop' into dbkr/irc_links 2016-09-22 09:50:18 +01:00
David Baker fedc0f2ec6 Back to develop 2016-09-21 17:32:54 +01:00
David Baker be232bc1da 0.7.2 2016-09-21 17:28:08 +01:00
David Baker a9494252d5 Prepare changelog for v0.7.2 2016-09-21 17:28:08 +01:00
David Baker 58de14a4c6 Pin to released js-sdk 2016-09-21 17:26:15 +01:00
Richard van der Hoff da88dc53ee Merge pull request #491 from matrix-org/dbkr/revert_333 
Revert #333
 2016-09-21 16:48:18 +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 59117f1905 Fix linkifying rooms with underscores, try 2 
Fixes https://github.com/vector-im/vector-web/issues/500
 2016-09-21 14:11:43 +01:00
David Baker b83d1db24a Missed some Vectors 2016-09-21 14:03:35 +01:00
David Baker 765ae3a715 Move back to js-sdk develop 2016-09-21 12:00:37 +01:00
David Baker 1b01270202 Merge branch 'master' into develop 2016-09-21 11:59:17 +01:00
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