David Baker
ea38968be9
Merge pull request #2379 from vector-im/dbkr/join_3p_location
...
Add native joining of 3p networks to room dir
2016-10-05 14:00:21 +01:00
David Baker
562b047362
Typo
2016-10-05 13:49:30 +01:00
David Baker
381c9009fb
Doc roomDirectory config section
2016-10-04 16:21:39 +01:00
David Baker
c0a4574069
For single instance, allow domain present & match
2016-10-04 15:30:46 +01:00
David Baker
de9bf4bb47
Actually use variable
2016-10-04 15:18:07 +01:00
Richard van der Hoff
c57bfccb9e
Merge pull request #2406 from vector-im/dbkr/linkify_213
...
Update to linkify 2.1.3
2016-10-04 11:59:07 +01:00
David Baker
52cae92dd7
Update to linkify 2.1.3
...
To pull in https://github.com/SoapBox/linkifyjs/pull/166
2016-10-04 11:28:28 +01:00
David Baker
b80b08f04f
Specify width on icons & comment
2016-10-04 11:14:36 +01:00
David Baker
304e5b997a
PR Freedback
2016-10-04 11:04:01 +01:00
David Baker
6b4dbfbd62
Change default brand to Riot
...
& update sample config
2016-10-04 10:23:38 +01:00
David Baker
000ca35727
Don't pop up errors when this API fails for guests
2016-10-03 16:30:57 +01:00
David Baker
776fe2ad70
Different way of getting fields for 3p location
...
Try to match protocol insance from 'domain' field and use its
fields for all but the last field. Assume the last takes the user
input.
2016-10-03 13:42:55 +01:00
Aviral Dasgupta
9174b32ef1
Upgrade to babel6 and enable some presets.
2016-10-02 17:28:24 +05:30
Richard van der Hoff
602727b7ad
Merge pull request #2383 from vector-im/dbkr/sign_in_not_log_in
...
Use 'Sign In' / 'Sign Out' universally
2016-09-30 11:31:15 +01:00
Richard van der Hoff
56deea9f10
Merge pull request #2382 from vector-im/dbkr/networkdropdown_size_jump
...
Prevent network dropdown resizing slightly
2016-09-30 10:59:15 +01:00
Richard van der Hoff
8e0be29c13
Merge pull request #2380 from vector-im/dbkr/roomdir_no_results
...
Room directory: indicate when there are no results
2016-09-30 10:23:23 +01:00
David Baker
b71b1b5535
Use more variables
2016-09-30 09:39:30 +01:00
Matthew Hodgson
5b3524f174
better wordwrap on RightPanels
2016-09-29 17:41:34 +01:00
David Baker
f9a70a8b04
Use 'Sign In' / 'Sign Out' universally
...
Rather than a mix of 'sign in/out' and 'log in/out'
2016-09-29 17:40:19 +01:00
David Baker
b652ea5024
Prevent network dropdown resizing slightly
...
Dropdown resized by 2px when opened
2016-09-29 16:49:44 +01:00
David Baker
2a37a0cb19
Room directory: indicate when there are no results
...
Fixes https://github.com/vector-im/vector-web/issues/2250
2016-09-29 15:45:45 +01:00
David Baker
761600f325
Add native joining of 3p networks to room dir
...
Use the 3rd party location lookup API to accept third-party locations
in their native form and look up the corresponding portal room for
that location.
Also give the network dropdown some placeholder text.
Fixes https://github.com/vector-im/vector-web/issues/2374
2016-09-29 15:30:54 +01:00
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
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
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
Matthew Hodgson
7b258bc229
it's called Riot
2016-09-27 12:27:12 +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
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
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
bf58c340bc
Oops, missed the ref
2016-09-26 15:30:42 +01:00
David Baker
dc0b15bdfa
Remove unused variable / function
2016-09-26 14:17:36 +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
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
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
a070bccffb
Hacky hardcoded css for join button
2016-09-23 15:26:08 +01:00
David Baker
8e1105b12a
Oops, wrong function
2016-09-23 15:25:13 +01:00
David Baker
93e4a04118
Chrome manifest branding
2016-09-23 14:26:09 +01:00
David Baker
6e3313b461
More missed rebranding
2016-09-23 14:24:47 +01:00
