5195140ff8
reposition Login spinner
2016-06-21 19:50:03 +01:00
eca453ee5a
reposition Login spinner
2016-06-21 19:49:55 +01:00
2ddfccdab3
Merge pull request #318 from matrix-org/dbkr/fix_default_hs
...
Fix https://github.com/vector-im/vector-web/issues/1679
2016-06-21 17:55:27 +01:00
d3265ab970
Redundant getDeafultHs()
...
This now can never be falsey so no point checking it
2016-06-21 17:46:55 +01:00
801a2c0647
Merge pull request #317 from matrix-org/dbkr/fix_slash_join
...
Fix /join to be consistent with the other code
2016-06-21 17:07:43 +01:00
ad2541299f
Add ability to delete an alias from room directory
...
Hidden behind shift-click for now, but we're going to need to do this a lot to moderate the public room list.
2016-06-21 16:47:40 +01:00
dc840fdf48
updated selection styling
2016-06-21 19:02:18 +05:30
a74db3a815
Get basic keyboard selection working
2016-06-21 18:33:39 +05:30
fb6eec0f7d
Hide/show autocomplete based on selection state
2016-06-21 15:46:20 +05:30
213e284edf
Fix https://github.com/vector-im/vector-web/issues/1679
2016-06-21 11:05:37 +01:00
f6a76edfdf
Fuzzy matching in User and Room providers
2016-06-21 05:05:23 +05:30
510bb5785e
Merge branch 'develop' into feature-autocomplete
2016-06-21 04:09:23 +05:30
442291c0a4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-autocomplete
2016-06-21 04:09:22 +05:30
fc06ebcc63
Fix view_next_room
2016-06-20 18:43:56 +01:00
4c214119b2
Fix PR feedback
2016-06-20 18:05:58 +01:00
4d5fbfc5b1
Remove now unused MatrixTools.GetRoomForAlias
2016-06-20 17:11:46 +01:00
d8dedae084
Fix /join to be consistent with the other code
...
Plus a number of other tidyups:
* Fix /join to dispatch a view_room for the room alias
with the additional auto_join parameter
* Make RoomView automatically join the room if the auto_join
parameter is true and the user isn't already in it
* Tidy up RoomView's peeking code, also fixing
https://github.com/vector-im/vector-web/issues/1220
in react-sdk (although it still requires a synapse change
to actually fix, but react-sdk does 'the right thing').
* Remove duplication of usage text from /join command
* Amalgamate MatrixChat::_viewRoom's many, many parameters
into an object and sort out case consistency a little.
2016-06-20 16:30:51 +01:00
9556795611
Merge pull request #1678 from vector-im/rav/olmify_develop_again
...
package.json: add olm as optionalDependency
2016-06-20 15:28:06 +01:00
4c6fa740f3
package.json: add olm as optionalDependency
...
Add olm as an optionalDependency to vector, so that the webpack config can find
it and include it in the bundle.
2016-06-20 15:10:19 +01:00
f4a3e9a39b
Merge pull request #1675 from vector-im/rav/olmify_develop
...
Another go at enabling olm on vector.im/develop
2016-06-20 14:38:00 +01:00
bb820bebd1
README: fix some lies
...
Take out a few misleading things from the readme.
2016-06-20 14:36:40 +01:00
664f809362
webpack: Use `require` to look for olm
...
Since https://github.com/matrix-org/matrix-js-sdk/pull/141 , the jenkins build
does pull in the olm module, but because it's using npm v2, buries it deep in
node_modules. Rather than using the `fs` module to hunt for it, just try to
`require` it in the webpack config.
2016-06-20 14:35:33 +01:00
034c045b37
Styling for autocomplete
2016-06-20 13:53:18 +05:30
4af983ed90
Style changes and improvements in autocomplete
2016-06-20 13:52:55 +05:30
4dfb0e9a90
Merge branch 'develop' into matthew/scalar
2016-06-19 22:40:58 +01:00
94aec10512
Merge branch 'develop' into dbkr/scalar
2016-06-19 22:40:48 +01:00
654429dbdb
improve wording on 'search room names'
2016-06-18 21:12:32 +01:00
c7d0214aaa
#1664 Set a maximum height for codeblocks
2016-06-18 12:21:34 +01:00
607923b58f
Fix test since we peek by room ID, not alias
2016-06-17 17:49:36 +01:00
8103a795ec
Merge pull request #316 from matrix-org/rav/fix_react_version_number
...
UserSettings: fix the displayed version of the react-sdk
2016-06-17 17:13:35 +01:00
f6835baa9c
UserSettings: fix the displayed version of the react-sdk
2016-06-17 17:09:52 +01:00
1d42443c0c
Merge pull request #314 from matrix-org/dbkr/show_canonical_alias
...
Show canonical alias in URL bar
2016-06-17 17:03:18 +01:00
aa67e33744
Merge pull request #313 from matrix-org/dbkr/roomview_tests
...
Some basic tests for RoomView
2016-06-17 17:02:02 +01:00
895fb63d5d
Merge pull request #1661 from vector-im/rav/unverify_device
...
CSS for unverify button
2016-06-17 17:00:26 +01:00
4f96bd1b01
Merge pull request #315 from matrix-org/rav/unverify_device
...
Support for making devices unverified
2016-06-17 17:00:12 +01:00
b172018d08
Merge pull request #1660 from vector-im/rav/crypto_css_fix
...
CSS fix for rooms with crypto enabled
2016-06-17 16:58:47 +01:00
6adce649eb
Use the first alias is there's no canonical alias
2016-06-17 16:56:34 +01:00
95a0bc92d6
CSS for unverify button
...
(supports change in react-sdk)
2016-06-17 16:25:39 +01:00
ad00abe9c0
Support for making devices unverified
...
Because its useful for testing
Requires support from js-sdk, and (ideally) css from vector-web
2016-06-17 16:24:23 +01:00
a90492e393
fix CSS
2016-06-17 16:14:14 +01:00
53d92df6f8
Set up / teardown container div in before/afterEach
2016-06-17 15:50:13 +01:00
b2f0ed09ab
Sort alphabetically (and name consistently)
2016-06-17 15:46:31 +01:00
3b5378fa53
Show canonical alias in URL bar
...
Use https://github.com/matrix-org/matrix-js-sdk/pull/140 to get the canonical alias, because that's a thing now.
2016-06-17 15:17:45 +01:00
d3a463e9ac
restore the room header too
2016-06-17 12:23:45 +01:00
b0bf24c136
Comment
2016-06-17 12:22:16 +01:00
1fbf027a40
Some basic tests for RoomView
2016-06-17 12:20:26 +01:00
ec7067e7bd
Autocomplete style
2016-06-17 04:58:39 +05:30
b9d7743e5a
Emoji provider, DDG working, style improvements
2016-06-17 04:58:09 +05:30
769b3f0c2a
Merge branch 'develop' into feature-autocomplete
2016-06-17 00:37:39 +05:30
42b7410a5d
Merge pull request #1652 from vector-im/rav/fix_karma_olm_warning
...
Karma: fix warning by ignoring olm
2016-06-16 11:16:00 +01:00
Matthew Hodgson