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

2664 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff
302074c71f Merge pull request #504 from matrix-org/dbkr/fix_login_if_joined 
Prevent error when clicking 'log in'
 2016-09-30 11:04:18 +01:00
Matthew Hodgson
ca5204c3f8 fix collapsed tooltip - https://github.com/vector-im/vector-web/issues/2381 2016-09-30 00:17:52 +01:00
David Baker
7b28dde263 Prevent error when clicking 'log in' 
If you joined a room before clicking 'log in', it would throw an
exception here and break.
 2016-09-29 16:57:10 +01:00
David Baker
60ce49910a Merge pull request #497 from matrix-org/dbkr/richtext_use_markdown_wrapper 
Make RTE mode use the new Markdown wrapper class
 2016-09-29 15:33:18 +01:00
David Baker
66ef1e8156 Merge pull request #501 from matrix-org/dbkr/get_hs_name 
Add 'getHomeServerName' util to client peg
 2016-09-28 10:22:11 +01:00
David Baker
4942f4f35c Typo 2016-09-28 10:17:47 +01:00
Matthew Hodgson
b366973151 let anyone create aliases - fixes https://github.com/vector-im/vector-web/issues/1585 2016-09-27 23:39:25 +01:00
David Baker
c7ad9bfdad Add 'getHomeServerName' util to client peg 2016-09-27 19:38:10 +01:00
David Baker
b9576754e6 Nomenclature 2016-09-27 14:50:18 +01:00
Richard van der Hoff
ea25e48ccb Merge pull request #499 from matrix-org/dbkr/fix_markdown_links 
Fix markdown link syntax
 2016-09-27 11:57:03 +01:00
Richard van der Hoff
e403bcd770 Merge pull request #500 from matrix-org/dbkr/linkify_fail_fast 
Fail hard & fast if linkifyjs version is wrong
 2016-09-27 11:29:39 +01:00
Richard van der Hoff
30ce35c3b4 Merge pull request #498 from matrix-org/dbkr/fast_lgm 
Bring back the little green men without slowness
 2016-09-27 11:28:48 +01:00
David Baker
0448dca832 Fail hard & fast if linkifyjs version is wrong 
Rather than carrying on an ending up with undefineds deep within the bowels of linkifyjs when we try to linkify a room alias.
 2016-09-27 10:38:01 +01:00
David Baker
2be1cc9f85 Give DMRoomMap an explicit makeShared 
Otherwise it will hang on to the old state client on logout.
 2016-09-27 09:56:31 +01:00
David Baker
9bffd8da75 Fix markdown link syntax 2016-09-26 20:09:36 +01:00
David Baker
690309adfc Bring back the little green men without slowness 
Introduces a singleton DMRoomMap that subscribes to account data to keep itself up to date so we don't have to keep doing the map inversion for each room tile.
 2016-09-26 18:02:14 +01:00
David Baker
2e1644877d Merge pull request #496 from matrix-org/dbkr/directory_search_box 
Directory search join button
 2016-09-26 15:38:45 +01:00
David Baker
ba090a1198 Trailing .+ was redundant 2016-09-26 15:13:57 +01:00
David Baker
9333f91533 Give react callbacks underscores too 2016-09-26 14:29:12 +01:00
David Baker
2dd0165bfc Correct regex for hash at the start 2016-09-26 14:24:35 +01:00
David Baker
bbfc05b0c0 Fix name of text emote sending & fix tests 2016-09-26 10:20:56 +01:00
Matthew Hodgson
40ba1ff5aa disable LGM badges for DMs temporarily - see https://github.com/vector-im/vector-web/issues/2343 2016-09-24 00:43:46 +01:00
David Baker
bf037ed6c7 Add comment 2016-09-23 19:09:32 +01:00
David Baker
db3f0d298a Make RTE mode use the new Markdown wrapper class 
Equivalent of https://github.com/matrix-org/matrix-react-sdk/pull/492 for rich text mode
 2016-09-23 18:50:25 +01:00
David Baker
fa193e775a Implement join button appearing 
Also switch input to controlled so we re-render when it changes so we can show/hide the join button
 2016-09-23 16:34:47 +01:00
David Baker
eb5b175213 Layout to support less hardcoded CSS 2016-09-23 15:58:11 +01:00
David Baker
b1e4c911eb WIP omnipresent join button 2016-09-23 15:25:38 +01:00
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