nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
64,590 Commits 258 Branches 582 Tags
develop
Commit Graph

64590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baker
65f14c7d21 Stop random rooms appearing when switching network 
in the public room directory
 2016-09-28 14:18:40 +01:00
David Baker
864ba52bc5 Relative img paths please 2016-09-28 12:03:35 +01:00
David Baker
fdb5020c0c Oops, fix undefined variable 2016-09-28 11:56:07 +01:00
Richard van der Hoff
62344b5194 Merge pull request #2362 from vector-im/dbkr/roomdir_filter_3pnetworks 
Room dir: New filtering & 3rd party networks
 2016-09-28 11:38:03 +01:00
David Baker
0db12fcd22 Move method & don't wastefullt create elements 
Put did update with the other react interface methods & don't
bother creating the 'current_value' if we throw it away later.
 2016-09-28 11:05:14 +01:00
David Baker
455ee4f91b Argh, tabs 2016-09-28 11:04:54 +01:00
David Baker
5ca391f914 Replace double truth test with something sane 
Also typo
 2016-09-28 11:04:13 +01:00
David Baker
a32abae5a3 Don't use _matrix as default if there isn't one 2016-09-28 10:58:01 +01:00
David Baker
b2dd3ecf3a Add the _matrix network to the sample config 2016-09-28 10:44:29 +01:00
David Baker
cc7017b62d Emptry commit to force re-test 2016-09-28 10:22:29 +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
David Baker
f852e8a01d Update sample config 2016-09-28 10:13:35 +01:00
David Baker
6ff1c30a4b Fix spurious fill requests when switching networks 
Ignore responses for old servers too, don't trigger a backfill request
when we re-render before refresh. Also a few more comments.
 2016-09-28 10:08:03 +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
85ea45a64a Room dir: New filtering & 3rd party networks 
Changes filtering on 3rd party networks to divide into portal / non portal rooms and not show portal rooms by default. Adds a special '_matrix' network for all rooms that aren't portal rooms.

Also adds ability to query 3rd party directory servers.
 2016-09-27 19:39:20 +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
Matthew Hodgson
7b258bc229 it's called Riot 2016-09-27 12:27:12 +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
5ba3499f56 Merge pull request #2359 from vector-im/dbkr/linkify_version 
Update linkify version
 2016-09-27 11:30:16 +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
f4a6a3c4b2 Update linkify version 
Fixes https://github.com/vector-im/vector-web/issues/2357
In addition, https://github.com/matrix-org/matrix-react-sdk/pull/500 will make sure failures like this are obvious.
 2016-09-27 10:40:02 +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
5967dc4983 Merge pull request #2339 from vector-im/dbkr/directory_search_box 
Directory search join button
 2016-09-26 15:43:39 +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
bf58c340bc Oops, missed the ref 2016-09-26 15:30:42 +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
dc0b15bdfa Remove unused variable / function 2016-09-26 14:17:36 +01:00
David Baker
bbfc05b0c0 Fix name of text emote sending & fix tests 2016-09-26 10:20:56 +01:00
Matthew Hodgson
be6fbc2432 let's stick with the vector-web GA target for riot-web 2016-09-25 13:24:07 +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
51a5542446 Make tests pass 2016-09-23 18:20:31 +01:00
David Baker
3938abc5dd add webkit vendor prefixed properties 
for mavericks safari
 2016-09-23 17:18:52 +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
4961a97ed4 More css: 
* Make join button more buttony
 * Fix size of dropdown, allow search box to expand
 * Use flexbox within search box to input can fill the rest of the space
 2016-09-23 16:33:28 +01:00
David Baker
fb477fad1e Less hardcoded CSS 2016-09-23 15:58:28 +01:00
David Baker
eb5b175213 Layout to support less hardcoded CSS 2016-09-23 15:58:11 +01:00
David Baker
a070bccffb Hacky hardcoded css for join button 2016-09-23 15:26:08 +01:00
David Baker
b1e4c911eb WIP omnipresent join button 2016-09-23 15:25:38 +01:00
David Baker
8e1105b12a Oops, wrong function 2016-09-23 15:25:13 +01:00
David Baker
6281d76ade Merge remote-tracking branch 'origin/develop' into dbkr/directory_search_box 2016-09-23 14:43:13 +01:00