Commit graph

1684 commits

Author SHA1 Message Date
Richard van der Hoff
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
Richard van der Hoff
181a6a61ff tests: Don't add the div to the DOM 2016-04-13 17:20:06 +01:00
Richard van der Hoff
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
Richard van der Hoff
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 438453e61a, reversing
changes made to 50f94eb040.
2016-04-13 17:17:45 +01:00
Richard van der Hoff
438453e61a Merge branch 'develop' into rav/karma 2016-04-13 16:16:26 +01:00
Matthew Hodgson
50f94eb040 stop guests rom trying to blunder into non-guest rooms 2016-04-13 13:33:23 +01:00
David Baker
5794c30def Devices should be below 'advanced' 2016-04-13 11:35:53 +01:00
Richard van der Hoff
a512e600a7 tests: Don't add the div to the DOM 2016-04-13 11:16:38 +01:00
Richard van der Hoff
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
Matthew Hodgson
b5248c06a7 fix https://github.com/vector-im/vector-web/issues/987 for once and for all 2016-04-13 00:34:32 +01:00
Matthew Hodgson
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
Matthew Hodgson
b18fcf7f9e spinner on saving room settings 2016-04-12 18:02:31 +01:00
Matthew Hodgson
05e963d1e2 make the UI fadable to help with decluttering 2016-04-12 17:17:08 +01:00
David Baker
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
David Baker
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
David Baker
356a4a4392 Typo and use CSS rather than <i> 2016-04-12 14:10:17 +01:00
Matthew Hodgson
34bdd40953 timestamps are permalinks 2016-04-12 13:34:10 +01:00
David Baker
c5524851f3 Comment future possibility for deleting pushers 2016-04-12 13:22:58 +01:00
David Baker
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
Matthew Hodgson
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
Matthew Hodgson
b1ba69fd00 fix lightbox overscroll 2016-04-12 00:35:00 +01:00
Matthew Hodgson
8c619fedeb Merge pull request #1343 from vector-im/matthew/preview_urls
URL previewing support
2016-04-11 23:55:18 +01:00
Matthew Hodgson
efd01d6929 move localstorage crap entirely to TextualBody 2016-04-11 23:54:00 +01:00
Matthew Hodgson
a1b78f93fe Fix wrap on view source 2016-04-10 14:18:57 +01:00
Matthew Hodgson
cdc89c0623 add the concept of eventTileOps for managing widget visibility based on vdh's PR feedback 2016-04-08 21:42:42 +01:00
Matthew Hodgson
d107151f8a rename size prop as fileSize, add comments, and honour explicit properties rather than mxEvent fields 2016-04-07 18:10:15 +01:00
Matthew Hodgson
48abc75665 Merge branch 'develop' into matthew/preview_Urls 2016-04-07 17:25:17 +01:00
Matthew Hodgson
41373f30f7 oops, name LinkPreviewWidget correctly 2016-04-04 00:33:15 +01:00
Matthew Hodgson
ad9d032f82 fix typo introduced in #1340 2016-04-04 00:17:50 +01:00
Matthew Hodgson
d7eb23db53 specify sizes and hyperlinks for non-event images 2016-04-04 00:16:52 +01:00
Matthew Hodgson
333f1e46ca document properties and remove spurious 'view full screen' button 2016-04-03 23:57:44 +01:00
Matthew Hodgson
d414127f80 track whether widget should be hidden on the event, as well as persisting it in localStorage 2016-04-03 23:31:42 +01:00
Matthew Hodgson
ff2885087d support cancelling and uncancelling previews 2016-04-03 02:50:51 +01:00
Matthew Hodgson
a5258978d6 Merge branch 'develop' into matthew/preview_urls 2016-04-03 02:07:03 +01:00
Matthew Hodgson
8c0a23dd8b fix widget layout 2016-04-03 02:06:24 +01:00
Matthew Hodgson
d434ea55a8 Merge pull request #1332 from aviraldg/feature-emoji
😄 Emoji autocomplete and unicode emoji to image conversion using emojione.
2016-04-02 23:21:31 +01:00
Matthew Hodgson
4331fbf422 Merge pull request #1340 from aviraldg/fix-65
Show full-size avatar on MemberInfo avatar click
2016-04-02 23:20:39 +01:00
Aviral Dasgupta
cf17ea6254 Show full-size avatar on MemberInfo avatar click
fixes vector-im/vector-web#65
2016-04-03 00:53:17 +05:30
Matthew Hodgson
8247bb4a76 match style for markdown quotes 2016-04-02 00:36:53 +01:00
Matthew Hodgson
08a41bf093 improve layout for LinkPreviewWidget 2016-04-01 02:16:29 +01:00
Aviral Dasgupta
d7157696f4 styling for emojione emojis 😄 2016-04-01 06:22:13 +05:30
Richard van der Hoff
bf055688b7 Switch js-sdk and react-sdk back to develop 2016-03-31 16:35:38 +01:00
Matthew Hodgson
28b9892486 burndown generator 2016-03-30 21:25:18 +01:00
Matthew Hodgson
512a9125bf fix zalgos in SenderProfile again, whilst maintaining limited-width name via inline-block. and without doubling emote vertical space... 2016-03-30 19:47:06 +01:00
Richard van der Hoff
00a92452e8 0.5.0 2016-03-30 13:31:09 +01:00
Richard van der Hoff
32576e97d5 Prepare changelog for v0.5.0 2016-03-30 13:31:09 +01:00
Richard van der Hoff
20f93e761b Bump to react-sdk 0.4.0 and js-sdk 0.5.1. 2016-03-30 13:27:55 +01:00
Matthew Hodgson
bdf8f655fb tweak animation and comment it out for now as it maxes out a whole core on my top-of-the-line MBP... 2016-03-30 01:36:44 +01:00
Matthew Hodgson
8603dd4bb4 Merge pull request #1292 from aviraldg/feature-pretty-placeholder
Prettier, animated placeholder :D
2016-03-30 01:28:34 +01:00
Matthew Hodgson
212a070a02 add a github issues graphing script 2016-03-30 01:23:44 +01:00