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
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
b7f1a3db57
gitignore config.json now it isn't versioned
2016-06-09 18:51:25 +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
c4b7571c45
Merge pull request #1612 from vector-im/dbkr/optional_config
...
Make the config optional
2016-06-09 10:40:58 +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
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
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
b3ae9cc9d4
Merge pull request #1609 from vector-im/dbkr/SdkConfig
...
Don't use SdkConfig
2016-06-08 17:34:18 +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
1e40fd750f
Don't use SdkConfig
...
instead take brand from a prop
2016-06-08 14:55:47 +01:00
ed1554f4af
index.js: fix wording in android popup
2016-06-07 22:01:56 +01:00
c6cf5febd5
Merge pull request #1516 from vith/static-config-json
...
serve config.json statically instead of bundling it
2016-06-06 19:15:35 +01:00
f9aaf7d903
Use the SdkConfig interface
...
rather than pulling in config.json directly.
json-loader appears to still be necessary due to some horrendous json dependency in the depths of sanitize-html.
2016-06-06 19:13:30 +01:00
a2e73cceee
Merge branch 'develop' into matthew/scalar
2016-06-06 10:24:39 +01:00
c672919d1e
0.7.3
2016-06-03 12:20:05 +01:00
7ab2449ac1
Prepare changelog for v0.7.3
2016-06-03 12:20:04 +01:00
e68a2b5e1d
pin to react sdk 0.6.3 for release
2016-06-03 12:19:04 +01:00
ddc4ac187c
dep on react-sdk develop
2016-06-02 23:32:47 +01:00
ded66bbdfc
0.7.2
2016-06-02 19:05:50 +01:00
1a11c402fa
Prepare changelog for v0.7.2
2016-06-02 19:05:50 +01:00
4ec77eeca7
correctly bump dep on js-sdk and react-sdk
2016-06-02 19:04:22 +01:00
635fd927cd
0.7.1
2016-06-02 18:41:20 +01:00
481a7b160d
Prepare changelog for v0.7.1
2016-06-02 18:41:20 +01:00
cadedd2919
Revert presumably accidentally comitted config.json
2016-06-02 14:24:36 +01:00
e0bf23fa7c
0.7.0
2016-06-02 13:42:25 +01:00
a53acb3b58
Prepare changelog for v0.7.0
2016-06-02 13:42:24 +01:00
f6ec858ac9
Bump js-sdk and react-sdk for new releases
...
js-sdk 0.5.3
react-sdk 0.6.0
2016-06-02 13:40:15 +01:00
d976046e6a
set email branding whenever emails are added from vector
2016-06-02 13:15:13 +01:00
1902b631c7
add default branding parameter for email notifs
2016-06-02 11:45:23 +01:00
dda2129354
Merge pull request #1557 from aviraldg/feature-style-selection
...
Style selection color.
2016-05-28 16:30:53 +01:00
12157edd62
Style selection color
2016-05-28 12:20:21 +05:30
7e563b89c7
initial version of rich text editor
2016-05-27 10:17:01 +05:30
6a6118e136
serve config.json statically instead of bundling it
...
issue #1344
2016-05-24 19:08:09 -05:00
bede9a814b
remove spurious top border; fix #1472
2016-05-24 00:30:36 +01:00
d70842c3c7
fix padding of badges
2016-05-24 00:29:48 +01:00
a288c5b85d
fix padding of badges
2016-05-20 12:21:45 +01:00
c4d408d095
CSS for IntegrationsManager
2016-05-18 17:02:39 +01:00
ac24d6707f
Add integs mgt
2016-05-18 15:02:03 +01:00
e5835d2731
typo
2016-05-18 15:01:36 +01:00
Richard van der Hoff