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
3756add402
Merge pull request #502 from matrix-org/dbkr/join_3p_location
...
Move 'show join button' functionality out
2016-10-05 14:00:14 +01:00
562b047362
Typo
2016-10-05 13:49:30 +01:00
381c9009fb
Doc roomDirectory config section
2016-10-04 16:21:39 +01:00
c0a4574069
For single instance, allow domain present & match
2016-10-04 15:30:46 +01:00
de9bf4bb47
Actually use variable
2016-10-04 15:18:07 +01:00
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
cf23db709d
Merge pull request #508 from matrix-org/dbkr/linkify_213
...
Update to linkify 2.1.3
2016-10-04 11:59:00 +01:00
7785797be0
Update to linkify 2.1.3
...
To pull in https://github.com/SoapBox/linkifyjs/pull/166
2016-10-04 11:29:13 +01:00
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
b80b08f04f
Specify width on icons & comment
2016-10-04 11:14:36 +01:00
304e5b997a
PR Freedback
2016-10-04 11:04:01 +01:00
6b4dbfbd62
Change default brand to Riot
...
& update sample config
2016-10-04 10:23:38 +01:00
000ca35727
Don't pop up errors when this API fails for guests
2016-10-03 16:30:57 +01:00
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
9d303712f2
more s/Vector/Riot/
2016-10-03 10:18:43 +01:00
9174b32ef1
Upgrade to babel6 and enable some presets.
2016-10-02 17:28:24 +05:30
2d173d83b9
Upgrade to babel6 and enable some presets.
2016-10-02 17:27:45 +05:30
91771ec17d
Ce n'est pas Python
2016-10-01 10:34:21 +01:00
6abf6c9ec0
Merge pull request #505 from matrix-org/dbkr/dont_replacestate
...
Fix version going blank after logging in
2016-09-30 14:32:01 +01:00
be99f17ee0
Oops, right variable
2016-09-30 14:05:01 +01:00
8aeb0cfb68
Dedicated function for resetting screen state
2016-09-30 11:56:32 +01:00
c41a8da4be
Argh, there's more
2016-09-30 11:40:27 +01:00
2f7366cb8a
Comment state fields
2016-09-30 11:37:50 +01:00
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
dca19a4940
Merge pull request #506 from matrix-org/dbkr/sign_in_not_log_in
...
Use 'Sign In' / 'Sign Out' universally
2016-09-30 11:30:00 +01:00
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
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
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
b71b1b5535
Use more variables
2016-09-30 09:39:30 +01:00
ca5204c3f8
fix collapsed tooltip - https://github.com/vector-im/vector-web/issues/2381
2016-09-30 00:17:52 +01:00
5b3524f174
better wordwrap on RightPanels
2016-09-29 17:41:34 +01:00
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
d5af2d2c52
Use 'Sign In' / 'Sign Out' universally
...
Rather than a mix of 'sign in/out' and 'log in/out'
2016-09-29 17:38:52 +01:00
8cbddfcf28
Fix version going blank after logging in
...
Don't use replaceState in MatrixClient: there's lots of stuff in
MatrixClient's state now (including the app version) so replacing
the entire state doesn't really make sense (and also blows away
all of the nice defaults we set in getInitialState). Instead,
setState of the things we actually care about wherever we used
replaceState.
Also add a couple of state variables to getInitialState that were
missing.
Fixes https://github.com/vector-im/vector-web/issues/2322
2016-09-29 17:23:07 +01:00
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
b652ea5024
Prevent network dropdown resizing slightly
...
Dropdown resized by 2px when opened
2016-09-29 16:49:44 +01:00
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
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
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
9a633ee449
Move 'show join button' functionality out
...
And have it as a prop to the directory search box instead, so the
room directory can do more complex logic.
2016-09-29 15:05:15 +01:00
65f14c7d21
Stop random rooms appearing when switching network
...
in the public room directory
2016-09-28 14:18:40 +01:00
864ba52bc5
Relative img paths please
2016-09-28 12:03:35 +01:00
fdb5020c0c
Oops, fix undefined variable
2016-09-28 11:56:07 +01:00
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
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
455ee4f91b
Argh, tabs
2016-09-28 11:04:54 +01:00
5ca391f914
Replace double truth test with something sane
...
Also typo
2016-09-28 11:04:13 +01:00
a32abae5a3
Don't use _matrix as default if there isn't one
2016-09-28 10:58:01 +01:00
b2dd3ecf3a
Add the _matrix network to the sample config
2016-09-28 10:44:29 +01:00
David Baker
David Baker
Richard van der Hoff
Matthew Hodgson
Aviral Dasgupta