624e34c48a
Merge pull request #312 from matrix-org/rav/eventlistnener_warning
...
Fix eventListener warning
2016-06-16 11:15:08 +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
0cc4497ef0
Merge pull request #307 from matrix-org/dbkr/fix_peeking
...
Fix peeking and member list vanishing
2016-06-16 11:13:20 +01:00
3e44d7307f
Fix eventListener warning
...
Bump up maxEventListeners on the MatrixClient to shut up the warning about
leaks.
2016-06-16 11:03:09 +01:00
721ae68aa4
Merge pull request #311 from aviraldg/fix-rte-history
...
Use different keys for new MessageComposerInput
2016-06-16 10:16:41 +01:00
8b1332cd29
Use different keys for new MessageComposerInput
2016-06-16 14:46:09 +05:30
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
6ae3276c46
Merge pull request #310 from aviraldg/fix-rte-escape
...
Fix RTE escaping, HTML output with breaks
2016-06-15 16:06:04 +01:00
56ac1ed0c0
update comment
2016-06-15 20:34:37 +05:30
8b8deb86ed
Fix RTE escaping, HTML output with breaks
2016-06-15 20:24:37 +05:30
a373849b5b
Give better instructions for modifying config.
2016-06-15 11:03:52 +01:00
8fd8847890
Merge pull request #308 from aviraldg/feature-rte-improvements
...
Fix cursor bug, persist editor mode & rte default
2016-06-14 19:49:13 +01:00
3f1b57b35b
Fix cursor bug, persist editor mode & rte default
2016-06-15 00:13:34 +05:30
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
5199cd04a2
Merge pull request #292 from aviraldg/feature-rte
...
Rich Text Editor
2016-06-14 15:27:39 +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
ba69e4365d
more RTE fixes
2016-06-14 19:28:51 +05:30
8cb086ef31
use constants for keycodes in RTE
2016-06-14 19:14:09 +05:30
2606ea9596
fixes and improvements in RichText
2016-06-14 19:10:35 +05:30
40b1b99c38
underscore prefix internal method
2016-06-14 14:40:03 +01:00
a95d8b5ed6
Move init logic into componentWillMount
...
to simplify getInitialState
2016-06-14 14:38:45 +01:00
0ef5cc891e
Add currentRoomId / Alias to getInitialState
...
with docs
2016-06-14 14:10:49 +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
b8eee08d69
Fix member list vanishing
...
Add a callback to RoomView that it can give the room ID to once it's resolved it, since this lookup is now the responsibility of the roomview and only the roomview. The view_room action now has either an alias or an ID, not both. Also fix RoomView to load the room properly and not try to peek when it shouldn't.
2016-06-14 12:56:37 +01:00
094d54b398
Merge pull request #306 from matrix-org/rav/labify_e2e
...
Hide e2e features if not enabled
2016-06-14 12:00:32 +01:00
e973d18085
Hide e2e features if not enabled
...
Don't show the device info in the MemberInfo and UserSettings unless the user
has ticked the 'labs' box.
2016-06-14 11:57:08 +01:00
aaefdf19c5
Fix MatrixChat syntax fail
2016-06-14 11:57:07 +01:00
11a38fce48
Fix peeking
...
Sorts out more of the room joining mess. currentRoom which held the room ID is now more appropriately called currentRoomId. RoomView will now take a roomID or alias as before but will now look up the room ID as required if given the alias. Also, now look up the alias every time you click on it so it's never stale, rather than looking in your current rooms for a room that thinks it has that ID.
2016-06-14 11:37:04 +01:00
34be17cc7e
use rte labs setting
2016-06-14 00:10:43 +05:30
74527a439c
Merge branch 'develop' into feature-rte
2016-06-13 23:57:10 +05:30
3312a4d57e
Merge pull request #305 from aviraldg/feature-labs
...
Add experimental "Labs" section to settings
2016-06-13 19:24:03 +01:00
5831a68e11
Labs improvements
2016-06-13 23:25:31 +05:30
727e6daaae
Fix key attr placement in UserSettings
2016-06-13 22:11:21 +05:30
c3a9658392
Add experimental "Labs" section to settings
2016-06-13 22:04:12 +05:30
4bc8ec3e6d
room, user, ddg autocomplete providers (wip)
2016-06-12 17:02:46 +05:30
0df201c483
Merge branch 'develop' into feature-autocomplete
2016-06-12 14:10:23 +05:30
ab1f37b0bb
Merge pull request #1 from pferreir/pr/1553
...
Basic Markdown highlighting
2016-06-12 04:55:05 +05:30
df69d1de44
Add basic Markdown highlighting
...
Add basic Markdown highlighting
2016-06-12 04:47:05 +05:30
e75a28bb0d
Minimal house cleaning
2016-06-12 01:08:31 +02:00
294a8efdc4
Fix behaviour of modifyText
...
Since it was not correctly extracting the selected part of the text
string
2016-06-12 01:08:31 +02:00
8f45f168d5
Fix highlighting behaviour on switch
...
Hopefully made the code a little bit clearer.
2016-06-12 01:08:31 +02:00
a5a3e4e915
Basic Markdown highlighting
2016-06-12 01:07:16 +02:00
eb37032d8a
Markdown: styles for bold/italics
2016-06-12 01:04:22 +02:00
c0d7629980
get /commands working again
2016-06-12 00:11:27 +05:30
David Baker