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
4dfb0e9a90
Merge branch 'develop' into matthew/scalar
2016-06-19 22:40:58 +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
895fb63d5d
Merge pull request #1661 from vector-im/rav/unverify_device
...
CSS for unverify button
2016-06-17 17:00:26 +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
95a0bc92d6
CSS for unverify button
...
(supports change in react-sdk)
2016-06-17 16:25:39 +01:00
a90492e393
fix CSS
2016-06-17 16:14:14 +01:00
ec7067e7bd
Autocomplete style
2016-06-17 04:58: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
4cfcdfa040
Merge pull request #1639 from vector-im/dbkr/fix_peeking
...
Update for react-sdk dbkr/fix_peeking branch
2016-06-16 11:13:29 +01:00
795986f146
Karma: fix warning by ignoring olm
...
If olm is not installed, the webpack build for the karma tests gives an ugly
error. None of the tests currently care if olm is installed or not, so fix this
for now by just ignoring the olm module.
2016-06-16 07:41:34 +01:00
d38c338f89
Merge pull request #1641 from vector-im/dbkr/update_readme
...
Update README.md
2016-06-15 17:10:02 +01:00
a373849b5b
Give better instructions for modifying config.
2016-06-15 11:03:52 +01:00
8cd4637316
Merge pull request #1643 from vector-im/dbkr/fix_karma
...
Fix karma tests
2016-06-14 16:38:14 +01:00
0635a6f562
Fix karma tests
...
As we now use draft-js: https://github.com/facebook/fbjs/issues/133#event-617440260
2016-06-14 16:32:07 +01:00
a8cee87c08
js-sdk doesn't have a build step
2016-06-14 15:53:13 +01:00
a7598ea815
Mention copying sample file here too
2016-06-14 15:52:03 +01:00
22cef7a6a0
Copy config.json first
2016-06-14 15:41:55 +01:00
e507339324
Merge pull request #1553 from aviraldg/feature-rte
...
Rich Text Editor
2016-06-14 15:27:35 +01:00
b643d8ff6a
Update README.md
...
To reflect the fact that you can now sensibly deploy from a package (ie. be able to configure the app). Make the first thing be downloading a prebuilt package so people who only read the first part don't end up running npm start in production and complain about needing npm.
2016-06-14 15:12:35 +01:00
3547bd8d00
Update for react-sdk dbkr/fix_peeking branch
...
With the react-sdk update, this does nothing functionally since the room ID would just
have been ignored, but update this to correctly supply only one of ID/alias.
2016-06-14 13:02:34 +01:00
ab1f37b0bb
Merge pull request #1 from pferreir/pr/1553
...
Basic Markdown highlighting
2016-06-12 04:55:05 +05:30
eb37032d8a
Markdown: styles for bold/italics
2016-06-12 01:04:22 +02:00
f6ed21559a
RTE mode switch styling & cleanup
2016-06-11 15:54:43 +05:30
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
David Baker