b960d220d2
cleanup, better comments, markdown hotkeys
2016-06-11 22:24:09 +05:30
f6ed21559a
RTE mode switch styling & cleanup
2016-06-11 15:54:43 +05:30
e4217c3fb7
rte improvements, markdown mode
2016-06-11 15:52:08 +05:30
469c415557
Merge pull request #304 from matrix-org/dbkr/directory_join_by_alias
...
Make the room directory join rooms by alias
2016-06-10 15:23:12 +01:00
a5986ade51
Merge pull request #1615 from vector-im/dbkr/directory_join_by_alias
...
Fix RoomDirectory to join by alias whenever possible.
2016-06-10 15:23:07 +01:00
d7504aeda5
Switch to new view_room
2016-06-10 15:13:41 +01:00
719928f389
Remove view_room_alias
...
As it was basically the same as view_room. Use view_room instead which will handle whether we pass an ID or an alias into RoomView
2016-06-10 15:12:42 +01:00
bf8e56e04c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-rte
2016-06-10 04:43:44 +05:30
b2459b2dc6
Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte
2016-06-10 04:43:06 +05:30
819e06e2cd
MessageComposer styling for Draft
2016-06-10 04:41:59 +05:30
4e0720db12
Fix MessageComposerInput.setLastTextEntry
2016-06-10 00:03:40 +05:30
29cdd1fc41
user and room decorators, history & typing notifs
2016-06-09 23:53:09 +05:30
b7f1a3db57
gitignore config.json now it isn't versioned
2016-06-09 18:51:25 +01:00
b60ab9d695
Remove XXX now it's fixed (yay!)
2016-06-09 18:50:18 +01:00
72b3ce200d
Make the room directory join rooms by alias
...
Also makes some improvement on the multiple code path mess for joining rooms
2016-06-09 18:49:06 +01:00
a030e46c69
Use join_room_by_alias in RoomDirectory
...
This still doesn't actually cause the room to be joined by alias though, so still need to fix that
2016-06-09 17:13:02 +01:00
f61cfbc542
Fix RoomDirectory to join by alias whenever possible.
2016-06-09 16:41:01 +01:00
049e3a968b
Merge pull request #303 from matrix-org/rav/factor_out_createroom
...
Factor out common parts of room creation
2016-06-09 11:05:22 +01:00
888c0611e8
Merge pull request #302 from matrix-org/rav/guest_device_spinner
...
Fix spinner-of-doom in member info for guests
2016-06-09 11:03:40 +01:00
de36aa63fb
Factor out common parts of room creation
...
Take the duplicated code out of MatrixChat and MemberInfo, and put it in a
separate 'createRoom' module
2016-06-09 10:58:25 +01:00
2352661513
MemberInfo: remove spinner if device query fails
...
If the request to /keys/query fails (for example, because we are a guest), we
need to remove the spinner.
2016-06-09 10:57:19 +01:00
98ef793809
Default IS should be vector.im now
2016-06-09 10:56:14 +01:00
bb405563c8
Fix default servers
2016-06-09 10:54:56 +01:00
ef764c112e
Merge pull request #300 from matrix-org/rav/device_verification
...
Support for marking devices as verified
2016-06-09 10:44:42 +01:00
c4b7571c45
Merge pull request #1612 from vector-im/dbkr/optional_config
...
Make the config optional
2016-06-09 10:40:58 +01:00
7700bb0ed9
Merge pull request #301 from matrix-org/dbkr/optional_config
...
Make the config optional
2016-06-09 10:40:47 +01:00
4dd477e064
index.js: fix comment typo
...
Fix dave's typo for him
2016-06-09 10:38:51 +01:00
f595f6f141
This check shouldn't be here with the ||
2016-06-09 10:25:49 +01:00
24602119c5
This doesn't actually need to be global
...
(because the rendering isn't in a render method here)
2016-06-09 09:59:37 +01:00
3040d0a474
Comment typo
2016-06-09 09:57:44 +01:00
e4ea00ca23
Return here, else we'll call resolve too
2016-06-09 09:56:57 +01:00
4fc311da90
Style fix
2016-06-09 09:56:11 +01:00
05404efa34
Remove if (this.props.config)
...
Since it now defaults to the empty dictionary (and if you pass null in, you deserve everything you get).
2016-06-09 09:53:37 +01:00
7894e52529
Merge pull request #1610 from vector-im/rav/device_verification
...
CSS support for device verification
2016-06-08 21:37:35 +01:00
7999a70cab
Switch to dev versions of react-sdk and js-sdk
2016-06-08 21:36:45 +01:00
1dfb3f71ae
Merge branch 'develop' into rav/device_verification
2016-06-08 21:34:47 +01:00
cab24bb14c
Switch matrix-js-sdk back to develop
2016-06-08 21:34:30 +01:00
85770feb31
device verification: use a js-sdk event
...
We'll probably want to be able to bubble up device verifications from the
js-sdk at some point, so let's use a js-sdk event for this.
2016-06-08 21:25:42 +01:00
f6aa9a7ea4
Make the config optional
...
Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.
2016-06-08 18:46:21 +01:00
c123f02842
Make the config optional
2016-06-08 18:45:46 +01:00
7ce49c752f
Wire up events to update UI on device verification
...
Use the dispatcher to update event tiles and memberdeviceinfo when a device is
marked as verified.
2016-06-08 18:35:43 +01:00
b3ae9cc9d4
Merge pull request #1609 from vector-im/dbkr/SdkConfig
...
Don't use SdkConfig
2016-06-08 17:34:18 +01:00
b5ff247f09
Merge pull request #299 from matrix-org/dbkr/SdkConfig
...
Pass brand parameter down to Notifications
2016-06-08 17:34:10 +01:00
5f29729e82
Make unverified encrypted events red and verified ones green
2016-06-08 17:03:54 +01:00
e24851456a
CSS for the MemberDeviceInfo view
2016-06-08 17:03:28 +01:00
1616431d27
EventTile: add classes to indicate verifiedness
...
Add a couple of CSS classes to event tiles to reflect whether encrypted events
have been verified or not.
2016-06-08 17:02:42 +01:00
f3e66e6fd2
Add device info to member info
...
Requires e81ce23 in matrix-js-sdk
2016-06-08 17:02:42 +01:00
086698cd11
Add device info to user settings
...
Requires e81ce23 from matrix-js-sdk
2016-06-08 17:02:42 +01:00
1e40fd750f
Don't use SdkConfig
...
instead take brand from a prop
2016-06-08 14:55:47 +01:00
7e8c8dd336
Remove SdkConfig
...
just take a config in MatrixChat, pass the individual things down through the chain.
This may become unwieldy: let's see how it goes.
2016-06-08 14:54:34 +01:00
Aviral Dasgupta