19dbd85d44
Merge pull request #1766 from vector-im/rav/use_right_olm
...
webpack: always use the olm from vector-web
2016-07-13 09:48:08 +01:00
ef4b604caf
webpack: always use the olm from vector-web
...
Fixes an error when matrix-js-sdk is symlinked into node_modules, which meant
that we would (try to) use the version of olm from js-sdk instead of
vector-web (https://github.com/vector-im/vector-web/issues/1765 ).
2016-07-12 23:10:53 +01:00
74f459f8a4
feat: bump emoji-body font-size down to 48px
2016-07-12 20:37:51 +05:30
fef81748bb
major update to dev guidelines
2016-07-11 18:25:58 +01:00
3e53879adc
Bump to olm 1.0.0
...
Fixes https://github.com/vector-im/vector-web/issues/1719
2016-07-11 14:53:51 +01:00
145e61b00f
Merge pull request #1718 from aviraldg/feature-emojione
...
feat: large emoji support
2016-07-05 10:08:15 +01:00
49dd93ffab
feat: large emoji support
2016-07-05 04:04:34 +05:30
7174879ac9
Merge pull request #1717 from aviraldg/feature-autocomplete
...
Autocomplete
2016-07-04 18:16:22 +01:00
486adb717b
Merge pull request #1670 from Half-Shot/patch-1
...
#1664 Set a maximum height for codeblocks
2016-06-24 19:16:50 +01:00
773f592c3f
Merge pull request #1688 from vector-im/rav/device_blocking
...
CSS for device blocking
2016-06-23 18:24:40 +01:00
2ca9d87b95
CSS for device blocking
...
A bunch of updates to the device info:
* format as a table
* make the buttons green, because the old way was super confusing
* instead make the status indicator red/orange/green.
2016-06-23 17:32:33 +01:00
4bc4292ceb
Rooms may not have aliases
2016-06-23 11:12:25 +01:00
cbb72c2f29
Merge pull request #1685 from vector-im/dbkr/fix_room_directory
...
Fix joining rooms by typing the alias
2016-06-23 10:21:03 +01:00
5f477b313b
Unused variable
2016-06-23 10:20:11 +01:00
d45e44d01c
Fix joining rooms by typing the alias
...
Fixes regression introduced by https://github.com/vector-im/vector-web/pull/1680
2016-06-23 10:11:46 +01:00
c12839dc7b
Merge pull request #1680 from vector-im/dbkr/delete_alias
...
Add ability to delete an alias from room directory
2016-06-22 17:25:27 +01:00
c35c9f7c3a
PR feedback
2016-06-22 16:20:06 +01:00
ff5c7072d7
Mark the room as private (unlisted) too
...
Also clean up RoomDirectory a bit and just pass the room object around rather than the name / alias, so now we don't have to look up the room by ID again.
2016-06-22 14:52:55 +01:00
eca453ee5a
reposition Login spinner
2016-06-21 19:49:55 +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
510bb5785e
Merge branch 'develop' into feature-autocomplete
2016-06-21 04:09:23 +05:30
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
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
David Baker