cb3ae0e069
Disable autoWatch for npm test
...
... we're only going to run the tests once, so there is no need to tell webpack
to watch the sources. This saves a spurious repack.
2016-04-13 18:13:57 +01:00
bf31d6d5fa
Karma test tweaks
...
* Make sure we only get one js-sdk (and update runtime config to match)
* Don't verifyNoOutstandingRequests (since it is hard to be certain which we
will get, and makes the tests too dependent on implementation-specifics).
* Disable color for npm test, to avoid confusing Jenkins
2016-04-13 17:41:23 +01:00
181a6a61ff
tests: Don't add the div to the DOM
2016-04-13 17:20:06 +01:00
322af6513d
Run some tests under karma
...
Including a regression test for
https://github.com/vector-im/vector-web/issues/1314
2016-04-13 17:20:06 +01:00
69ce3c43cf
Revert "Merge branch 'develop' into rav/karma"
...
The karma tests don't pass yet, and aren't ready to land on develop.
This reverts commit 438453e61a50f94eb040
2016-04-13 17:17:45 +01:00
3fd9b29422
Merge pull request #271 from matrix-org/rav/avoid_codepoint_at
...
Hack around absence of String.codePointAt on PhantomJS
2016-04-13 16:37:00 +01:00
85277a237a
Merge pull request #270 from matrix-org/rav/issue_1314_federated_rooms
...
RoomView: Handle joining federated rooms
2016-04-13 16:36:46 +01:00
438453e61a
Merge branch 'develop' into rav/karma
2016-04-13 16:16:26 +01:00
50f94eb040
stop guests rom trying to blunder into non-guest rooms
2016-04-13 13:33:23 +01:00
1e294cb10c
fix 'mark all read'
2016-04-13 12:46:36 +01:00
ec5ca1ca28
s/roomAlias/roomAddress/ to reduce confusion
2016-04-13 12:26:40 +01:00
5794c30def
Devices should be below 'advanced'
2016-04-13 11:35:53 +01:00
6509bc0589
oops, missed another fade
2016-04-13 11:17:09 +01:00
ead5418214
oops, missed a fade
2016-04-13 11:17:09 +01:00
a512e600a7
tests: Don't add the div to the DOM
2016-04-13 11:16:38 +01:00
047524d093
Merge pull request #269 from matrix-org/rav/stop_client_on_unmount
...
Stop the MatrixClient when the MatrixChat is unmounted
2016-04-13 11:05:02 +01:00
5706a879d0
Hack around absence of String.codePointAt on PhantomJS
...
I've been trying to get some tests working under PhantomJS, which appears not
to support String.codePointAt (which is, to be fair, an ES6 addition). For our
limited usecase, it's easier to implement the functionality from first
principles than to try to polyfill support.
2016-04-13 10:35:07 +01:00
429d110212
Run some tests under karma
...
Including a regression test for
https://github.com/vector-im/vector-web/issues/1314
2016-04-13 10:15:04 +01:00
93a142480c
RoomView: Handle joining federated rooms
...
This hopefully fixes an issue where joining a federated room via the directory
would get stuck at a spinner of doom, due to us not recognising the room in
question when it came down the /sync. We now catch the room id in the response
from the /join, and use it to match up the room in onRoom.
props.roomAlias, props.roomId, and state.room.roomId were somewhat confusing,
so I've tried to rationalise them:
* props.roomAlias (named thus to stop you assuming it's a room id) is the
thing that the parent component uses to identify the room of interest, and
can be either an ID or an alias (ie, it replaces props.roomId and
props.roomAlias)
* Everything that needs a room ID now has to get it from state.room.roomId.
2016-04-13 08:59:28 +01:00
f3793b556e
fix super-annoying key warning from react
2016-04-13 02:02:55 +01:00
92f58b6927
don't try to do preview URLs of matrix IDs (yet :D)
2016-04-13 01:54:06 +01:00
4b1ff51a42
show a spinner on MemberInfo when updating a member. and label 'disinvite' correctly
2016-04-13 01:46:10 +01:00
b5248c06a7
fix https://github.com/vector-im/vector-web/issues/987 for once and for all
2016-04-13 00:34:32 +01:00
bfec6d4ed9
merge aviral's audio player
2016-04-13 00:00:24 +01:00
1361333fdc
Stop the MatrixClient when the MatrixChat is unmounted
...
The MatrixClient never gets unmounted in the real app, but I've been working on
some tests which would rather like to be able to create and destroy MatrixChats
and not have the clients hang around forever.
2016-04-12 18:38:10 +01:00
6a6739e0f3
fix context menu on tiles without widgets
2016-04-12 18:32:55 +01:00
a01e6d46b9
Merge pull request #268 from matrix-org/matthew/fadable
...
make the UI fadable to help with decluttering
2016-04-12 18:05:10 +01:00
18bd1058d3
Merge pull request #1376 from vector-im/matthew/fadable
...
make the UI fadable to help with decluttering
2016-04-12 18:04:47 +01:00
b18fcf7f9e
spinner on saving room settings
2016-04-12 18:02:31 +01:00
3a2d5c4ba5
spinner on saving room settings
2016-04-12 18:01:49 +01:00
11f3d5f993
make the UI fadable to help with decluttering
2016-04-12 17:18:32 +01:00
05e963d1e2
make the UI fadable to help with decluttering
2016-04-12 17:17:08 +01:00
5d9c8f3726
Support config for email notifs
...
Add support to notif settings for adding an email pusher, only for the first email address for now.
2016-04-12 16:19:20 +01:00
fcab259511
Support for email notifs
...
Add utility funcs in UserSettingsStore and pass threepids to Notifications so it can do email notif stuff
2016-04-12 16:17:04 +01:00
be55882f46
Merge pull request #1374 from vector-im/dbkr/get_pushers
...
Get and display a user's pushers in settings
2016-04-12 14:41:45 +01:00
1d5f234f2c
add 'mark all read' button
2016-04-12 14:29:36 +01:00
356a4a4392
Typo and use CSS rather than <i>
2016-04-12 14:10:17 +01:00
34bdd40953
timestamps are permalinks
2016-04-12 13:34:10 +01:00
089963b4c7
timestamps are permalinks
2016-04-12 13:33:59 +01:00
c5524851f3
Comment future possibility for deleting pushers
2016-04-12 13:22:58 +01:00
cff1c3010b
Get & display pushers in settings
...
Really this is so (in a subsequent PR) we can show whether a user has an email pusher, but we can basically display the list of pushers for free, so adding this too.
2016-04-12 13:18:57 +01:00
38d27cdbb0
improve 'no known servers' error
2016-04-12 13:00:52 +01:00
46572ae793
click on group call thumbnail should return you to the group call, not the 1:1
2016-04-12 02:27:35 +01:00
f9785f68af
filter out conference bots from membership list
2016-04-12 01:54:51 +01:00
bf1e0da598
fix ability to save room settings if you don't have ops
2016-04-12 01:27:12 +01:00
b1ba69fd00
fix lightbox overscroll
2016-04-12 00:35:00 +01:00
8c619fedeb
Merge pull request #1343 from vector-im/matthew/preview_urls
...
URL previewing support
2016-04-11 23:55:18 +01:00
f9c7ae1ab9
Merge pull request #260 from matrix-org/matthew/preview_urls
...
URL previewing support
2016-04-11 23:55:15 +01:00
efd01d6929
move localstorage crap entirely to TextualBody
2016-04-11 23:54:00 +01:00
9845e5ef0e
move all the localstorage crap to TextualBody
2016-04-11 23:53:36 +01:00
Richard van der Hoff