OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
1,607 Commits
218 Branches
565 Tags
477 MiB
Commit Graph

1607 Commits (9fcf8d00b4b2362bf247dff144d7060b13bcffad)

Author SHA1 Message Date
Richard van der Hoff ec5ca1ca28 s/roomAlias/roomAddress/ to reduce confusion 2016-04-13 12:26:40 +01:00
Matthew Hodgson 6509bc0589 oops, missed another fade 2016-04-13 11:17:09 +01:00
Matthew Hodgson ead5418214 oops, missed a fade 2016-04-13 11:17:09 +01:00
Richard van der Hoff 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
Richard van der Hoff 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
Richard van der Hoff 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
Matthew Hodgson f3793b556e fix super-annoying key warning from react 2016-04-13 02:02:55 +01:00
Matthew Hodgson 92f58b6927 don't try to do preview URLs of matrix IDs (yet :D) 2016-04-13 01:54:06 +01:00
Matthew Hodgson 4b1ff51a42 show a spinner on MemberInfo when updating a member. and label 'disinvite' correctly 2016-04-13 01:46:10 +01:00
Matthew Hodgson bfec6d4ed9 merge aviral's audio player 2016-04-13 00:00:24 +01:00
Richard van der Hoff 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
Matthew Hodgson 6a6739e0f3 fix context menu on tiles without widgets 2016-04-12 18:32:55 +01:00
Matthew Hodgson 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
Matthew Hodgson 3a2d5c4ba5 spinner on saving room settings 2016-04-12 18:01:49 +01:00
Matthew Hodgson 11f3d5f993 make the UI fadable to help with decluttering 2016-04-12 17:18:32 +01:00
Matthew Hodgson 1d5f234f2c add 'mark all read' button 2016-04-12 14:29:36 +01:00
Matthew Hodgson 089963b4c7 timestamps are permalinks 2016-04-12 13:33:59 +01:00
Matthew Hodgson 38d27cdbb0 improve 'no known servers' error 2016-04-12 13:00:52 +01:00
Matthew Hodgson f9785f68af filter out conference bots from membership list 2016-04-12 01:54:51 +01:00
Matthew Hodgson bf1e0da598 fix ability to save room settings if you don't have ops 2016-04-12 01:27:12 +01:00
Matthew Hodgson f9c7ae1ab9 Merge pull request #260 from matrix-org/matthew/preview_urls 
URL previewing support
 2016-04-11 23:55:15 +01:00
Matthew Hodgson 9845e5ef0e move all the localstorage crap to TextualBody 2016-04-11 23:53:36 +01:00
Matthew Hodgson 8e48bed346 apparently we don't need this. i'm lost now 2016-04-11 17:32:10 +01:00
Richard van der Hoff 86130c33c9 Merge pull request #267 from matrix-org/rav/fix_1367 
Remember to load new timeline events
 2016-04-11 14:11:11 +01:00
Richard van der Hoff e051d1528c Remember to load new timeline events 
Fixes a bug where we wouldn't load new timeline events if they arrived when we
were scrolled up (https://github.com/vector-im/vector-web/issues/1367)
 2016-04-11 14:05:04 +01:00
Matthew Hodgson 825e6702ef stop ctrl-tab etc from triggering an autocomplete 2016-04-10 14:27:30 +01:00
Matthew Hodgson 2e772e2f19 fix whitespace on multiupload prompt 2016-04-10 14:02:22 +01:00
Matthew Hodgson 6c372d37f7 add the concept of eventTileOps for managing widget visibility based on vdh's PR feedback 2016-04-08 21:42:29 +01:00
Matthew Hodgson 23d6edbf63 forceupdate the whole scrollPanel rather than the geminiPanel at vdh's PR review request 2016-04-08 20:21:27 +01:00
Matthew Hodgson 4abc5d0d36 add comment 2016-04-08 20:21:12 +01:00
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
Matthew Hodgson 1d8b08040e incorporate PR feedback 2016-04-07 18:58:50 +01:00
Matthew Hodgson 1125c62505 add comments for thumbHeight 2016-04-07 18:10:35 +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
Matthew Hodgson 7884c13d0d Merge branch 'develop' into matthew/preview_urls 2016-04-07 17:25:48 +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 1de4e0d2dd label previews with the target URL if all else fails 2016-04-04 01:06:54 +01:00