OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
1,552 Commits
217 Branches
561 Tags
468 MiB
Commit Graph

1552 Commits (047524d0930d88b0299b0830c8484c8a45e906b2)

Author SHA1 Message Date
Matthew Hodgson 2d289b321d Merge branch 'develop' into matthew/preview_urls 2016-04-03 01:09:50 +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
Matthew Hodgson bffb482133 add FIXME 2016-04-02 02:46:19 +01:00
Matthew Hodgson a6b6be7f79 add ImageUtils 2016-04-02 00:36:33 +01:00
Matthew Hodgson 4388334e30 fix up scroll behaviour when loading widgets 2016-04-02 00:36:19 +01:00
Matthew Hodgson 62d04c38ef fix typo and add linkify descriptions 2016-04-01 02:23:29 +01:00
Matthew Hodgson 4d959fc33b improve layout and make thumbnails work 2016-04-01 02:16:11 +01:00
Matthew Hodgson e6842eab94 WIP url previewing 2016-03-31 18:38:01 +01:00
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
Richard van der Hoff 31e283729e Need babel-loader for karma tests 2016-03-29 00:12:59 +01:00
Richard van der Hoff 3f442aca87 Run mocha tests on jenkins 2016-03-29 00:12:59 +01:00
Richard van der Hoff 6069812fcf Create Junit reports from karma 2016-03-29 00:12:59 +01:00
Richard van der Hoff 04561ea6e6 Use phantomjs when running a single test 2016-03-29 00:12:59 +01:00
Richard van der Hoff 5f3b82a767 Stub out the matrix client 2016-03-29 00:12:59 +01:00
Richard van der Hoff 7e1e2347b5 Don't need alias for test-component-index 2016-03-29 00:12:59 +01:00
Richard van der Hoff e428f48269 Source map working 2016-03-29 00:12:59 +01:00
Richard van der Hoff c516ecebcc No need for .babelrc 2016-03-29 00:12:59 +01:00
Richard van der Hoff d7801ef3a4 Vaguely working webpack test 2016-03-29 00:12:59 +01:00