PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3
1511 commits 1 branch 0 tags 338 MiB
Commit graph

1511 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff
967528608f Merge pull request #265 from matrix-org/rav/limit_pagination 
Stop trying to paginate after we get a failure
 2016-04-08 16:00:51 +01:00
Richard van der Hoff
5f96e9980b Merge pull request #264 from matrix-org/rav/react_testing_tweaks 
Improvements to the react-sdk test framework
 2016-04-08 15:55:59 +01:00
Richard van der Hoff
15d0df5d3b Stop trying to paginate after we get a failure 
Once TimelineWindow.paginate fails to return any results, set
can*Paginate=false, and use it as a flag to stop us trying to paginate any
further.
 2016-04-08 15:05:15 +01:00
Richard van der Hoff
7e6ea192fd Build our own stub MatrixClient for the tests 
It turns out that a bunch of things rely on MatrixClient methods to return
promises rather than undefined. Rather than having to undo half the work done
by sinon.createStubInstance, just build our own object with as many methods as
we need stubbed out.
 2016-04-08 14:50:04 +01:00
Richard van der Hoff
7a821ce9d1 Make it possible to only run one test file each time 2016-04-07 17:49:39 +01:00
Richard van der Hoff
a2168efcda Correctly restore MatrixClientPeg after each test case 2016-04-07 16:47:17 +01:00
David Baker
f3aa7c8a01 Merge pull request #263 from matrix-org/dbkr/fix_forgot_password 
Fix password resetting
 2016-04-07 13:46:45 +01:00
David Baker
a0c41e2d57 Fix password resetting 
Fixes https://github.com/vector-im/vector-web/issues/1349
 2016-04-07 12:59:30 +01:00
Richard van der Hoff
b64604964d Fix exception in key handling 
Fix a typo introduced in PR #262 which caused scroll keys to throw console
errors.
 2016-04-07 12:05:07 +01:00
Richard van der Hoff
b70f518d66 Merge pull request #262 from matrix-org/rav/pageup_down 
Catch pageup/down and ctrl-home/end at the top level
 2016-04-06 12:00:39 +01:00
Richard van der Hoff
8b8ee21765 Catch pageup/down and ctrl-home/end at the top level 
Make the scroll keys work when the focus is outside the message panel.
 2016-04-05 13:40:36 +01:00
Richard van der Hoff
c5c9cad0cb Merge pull request #261 from matrix-org/rav/issue_1151 
Fix an issue where the scroll stopped working.
 2016-04-05 12:55:59 +01:00
Richard van der Hoff
6a82d1a94c Merge pull request #254 from matrix-org/rav/fix_rm_animation 
Fix a bug where we tried to show two ghost read markers at once.
 2016-04-05 12:55:38 +01:00
Richard van der Hoff
ae1220a6a4 Fix test for npm 3 
npm 3 puts files in slightly saner places, so we have to look for the gemini
css in two places
 2016-04-05 11:08:02 +01:00
Richard van der Hoff
0d7adae100 Back out animation timing changes for now 
... since they seem to be a bit contentious
 2016-04-05 10:46:08 +01:00
Richard van der Hoff
51fe77122b Fix an issue where the scroll stopped working. 
Under certain conditions, it was possible to get stuck in a state where any
user-initiated scroll would be met with "Working around
vector-im/vector-web#528" and overridden. Fix this by removing the duplication
between _lastSetScroll and recentEventScroll, and using _lastSetScroll which is
more reliable.
 2016-04-05 10:41:32 +01:00
Matthew Hodgson
2d3a237101 Merge pull request #258 from aviraldg/fix-219 
File upload improvements
 2016-04-02 23:07:50 +01:00
Matthew Hodgson
d5ed8f7eb7 Merge pull request #257 from aviraldg/fix-65 
Show full-size avatar on MemberInfo avatar click
 2016-04-02 23:02:46 +01:00
Matthew Hodgson
0762fe2841 Merge pull request #256 from aviraldg/fix-1339 
Whitelist <u> tag: (fixes #1339)
 2016-04-02 23:01:46 +01:00
Aviral Dasgupta
0574a28e36 Add confirmation dialog for file upload 
fixes vector-im/vector-web#92
 2016-04-03 02:22:05 +05:30
Aviral Dasgupta
0eeaac88b4 Allow multiple files to be uploaded at once 
fixes vector-im/vector-web#219
 2016-04-03 01:26:50 +05:30
Aviral Dasgupta
31e09ebe63 Show full-size avatar on MemberInfo avatar click 
fixes vector-im/vector-web#65
 2016-04-03 00:54:23 +05:30
Aviral Dasgupta
4ef148eaec whitelist <u> tag (fixes vector-im/vector-web#1339) 2016-04-02 22:15:29 +05:30
Richard van der Hoff
b6e4e9caf3 Fix a bug where we tried to show two ghost read markers at once. 
I think this was responsible for the readmarker just disappearing rather than
animating.

While we're here, decrease the delay on the animation, and instead make it take
slightly longer to disappear.
 2016-03-31 18:27:46 +01:00
Richard van der Hoff
25b35a09b9 Clean up some redundancy in the MessagePanel test 2016-03-31 17:01:11 +01:00
Richard van der Hoff
73f7528d0f Use babel 5 for karma tests 2016-03-31 16:59:38 +01:00
Richard van der Hoff
3129e84b6c Switch js-sdk back to develop 2016-03-31 16:34:38 +01:00
Matthew Hodgson
f6f86958f5 tweak room settings wording 2016-03-31 14:20:50 +01:00
Richard van der Hoff
3ba7f9f23a Fix failing test 
DOM styles are strings, not numbers
 2016-03-31 01:01:49 +01:00
Richard van der Hoff
ec8fecb953 Merge pull request #253 from matrix-org/rav/fix_jump_to_read_marker 
Don't reload the DOM if we can jump straight to the RM
 2016-03-31 00:59:23 +01:00
Richard van der Hoff
631183da29 Don't reload the DOM if we can jump straight to the RM 
Adds a missing 'return' statement which meant that, even if we already had the
relevant event loaded into the DOM, we would rebuild it when the user clicked
on the "(^) Unread messages" bar.
 2016-03-31 00:51:23 +01:00
Richard van der Hoff
dc5c0928b2 Some basic tests for MessagePanel 
Check that it puts the read marker in the right place, and check that the
animation works.

... all of which has been surprisingly painful.
 2016-03-31 00:48:46 +01:00
Richard van der Hoff
d2e69c819f 0.4.0 2016-03-30 13:25:25 +01:00
Richard van der Hoff
0f0e0d4fd6 Prepare changelog for v0.4.0 2016-03-30 13:25:25 +01:00
Richard van der Hoff
c5793b91cd Bump to js-sdk 0.5.1 2016-03-30 13:23:13 +01:00
Matthew Hodgson
4380308393 my node choked on this trailing , 2016-03-30 01:31:29 +01:00
Matthew Hodgson
182fa22eac Merge pull request #251 from aviraldg/feature-pretty-placeholder 
Prettier, animated placeholder :D
 2016-03-30 01:27:36 +01:00
Richard van der Hoff
49e75b7430 Merge pull request #252 from matrix-org/rav/RoomHeader 
Refactor RoomHeader, and fix topic updates
 2016-03-29 23:25:54 +01:00
Richard van der Hoff
1f2ba87ff5 Pass SimpleRoomHeader title in as a named property 
... rather than a child
 2016-03-29 23:21:17 +01:00
Richard van der Hoff
0d261c37c2 Update room header when room state changes 
Force an update so that we see the latest state.

Fixes https://github.com/vector-im/vector-web/issues/1299
 2016-03-29 16:31:13 +01:00
Richard van der Hoff
6422f7ecc8 Factor out separate RoomNameEditor and RoomTopicEditor components 2016-03-29 15:21:16 +01:00
Richard van der Hoff
abedb05268 Merge pull request #250 from matrix-org/rav/disable_composer_if_no_permission 
Disable the message composer if we don't have permission to post
 2016-03-29 15:15:58 +01:00
Richard van der Hoff
70133ae661 Factor out SimpleRoomHeader 
Start cleaning up RoomHeader by factoring out a separate SimpleRoomHeader.
 2016-03-29 12:51:46 +01:00
Richard van der Hoff
a12c1820df Add some comments to Notifier.js 2016-03-29 10:51:13 +01:00
Richard van der Hoff
d7f8017b91 Merge pull request #240 from mebjas/develop-notif 
Save a preference in local settings to record when the user has hidden the notifications warning bar.
 2016-03-29 10:48:12 +01:00
Matthew Hodgson
e068a92cde Merge pull request #248 from matrix-org/matthew/fix-image-load-popping 
Fix scroll offset popping around during image load by putting explicit height back on images
 2016-03-29 00:48:31 +01:00
Matthew Hodgson
0a2678b917 Add warning if fixupHeight fails, and remove overzealous logging 2016-03-29 00:46:51 +01:00
Richard van der Hoff
334a37c095 Merge branch 'rav/karma' into develop 
Implement a very simple Karma test, to demonstrate how it might be done.
 2016-03-29 00:13:29 +01:00
Richard van der Hoff
cbcca0bfa1 Fix undefined error in test 2016-03-29 00:12:59 +01:00
Richard van der Hoff
9ae3a96b6a Add missing devDependencies 2016-03-29 00:12:59 +01:00