nikrozman/element-web
1
0
Fork 0
Code Issues Actions 3 Packages Projects Releases Wiki Activity
64,590 Commits 258 Branches 582 Tags
develop
Commit Graph

64590 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Hodgson
13983900c0 clarify electron instructions 2016-08-27 22:21:52 +01:00
Matthew Hodgson
881739b478 try to unbreak jenkins >:( 2016-08-27 01:54:19 +01:00
Matthew Hodgson
5df98d70f4 add debugging to MemberAvatar to try to kick jenkins... 2016-08-27 01:18:48 +01:00
Matthew Hodgson
e06caa9ca1 mention not just a problem for Vector 2016-08-27 00:13:56 +01:00
Matthew Hodgson
efc5462131 warn people to put their Matrix HS on a separate domain 2016-08-27 00:13:20 +01:00
Matthew Hodgson
2199fe5cbf unbreak changelog 2016-08-27 00:06:00 +01:00
Matthew Hodgson
30f774cf9c add whitespace padding to composer RHS 2016-08-27 00:00:09 +01:00
Matthew Hodgson
be9aa44ca8 fix NPE checking tag order 2016-08-26 23:49:07 +01:00
wmwragg
73dd05b01d Corrected incorrect offset from top of window for the scrollArea 2016-08-26 18:31:02 +01:00
wmwragg
dc4459083f Fixed the LHS panel not collapsing but most of the content doing so 2016-08-26 16:22:59 +01:00
Matthew Hodgson
2f375e4f67 DIE ZALGO 2016-08-26 16:08:56 +01:00
Matthew Hodgson
879c325b83 DIE ZALGO 2016-08-26 16:08:15 +01:00
wmwragg
7ad3f4a577 Better comments 2016-08-26 15:53:31 +01:00
wmwragg
8ccb1d482a Better comments, and adjusted the top sticky logic, so that the very top header isn't allways stuck 2016-08-26 15:52:57 +01:00
wmwragg
5f9c794f0c Tweaking autoscroll to only adjust if header stuck at top and not at bottom 2016-08-26 15:36:16 +01:00
wmwragg
b9e95865af Click on stuck header scrolls to that header, collapses expands for none stuck header 2016-08-26 15:09:13 +01:00
wmwragg
5b9d3b119f Click on stuck header scrolls to that header, collapses expands for none stuck header 2016-08-26 15:08:47 +01:00
wmwragg
71e829fd32 Getting click to not collapse expand when header is stuck 2016-08-26 14:36:39 +01:00
wmwragg
5467fd89d8 Getting click to not collapse expand when header stuck 2016-08-26 14:35:40 +01:00
wmwragg
d2937c2aed Setting correct heights and widths for label and container 2016-08-26 11:02:12 +01:00
wmwragg
774e24a3b4 Added some logic to turn off sticky headers when the scroll area isn't large enough to support them 2016-08-26 11:01:04 +01:00
wmwragg
a0236a9b76 Code tidy-up and better name for label container class 2016-08-26 09:57:02 +01:00
wmwragg
c8c2f733e2 Re-calculate sticky header positions when sublist header is clicked 2016-08-26 09:56:07 +01:00
Matthew Hodgson
c6d4eb7fd3 try to make the changelog commit links suck less 2016-08-26 00:40:21 +01:00
wmwragg
4cb1f8a226 Initial pass at sticky headers for the LHS panel section labels 2016-08-25 19:46:15 +01:00
wmwragg
7fcdd0f77a Initial pass at sticky headers for the LHS panel section labels 2016-08-25 19:46:01 +01:00
Richard van der Hoff
c8b2d5106f Merge pull request #430 from matrix-org/rav/fix_search_regression 
Fix NPE when we don't know the sender of an event
 2016-08-25 19:31:16 +01:00
Matthew Hodgson
6786539550 pin linkifyjs to precisely 2.0.0-beta4, as 2.0.0-beta9 breaks links as per https://github.com/vector-im/vector-web/issues/2010 2016-08-25 18:30:48 +01:00
Matthew Hodgson
abca5faf78 pin linkifyjs to precisely 2.0.0-beta4, as 2.0.0-beta9 breaks links as per https://github.com/vector-im/vector-web/issues/2010 2016-08-25 18:30:35 +01:00
Richard van der Hoff
21ffe22375 Turn react consistency checks back on in develop builds 
The react checks are useful on /develop, to catch programming errors earlier,
and the original reason for turning them off (so that we could meaningfully
compare performance between /develop and /beta) is no longer so
relevant.

This reverts commit b5f029d10e.
 2016-08-25 17:06:12 +01:00
Richard van der Hoff
96567dad0d Fix NPE when we don't know the sender of an event 
Fixes a bug introduced in
https://github.com/matrix-org/matrix-react-sdk/pull/426.

Particularly when we are showing search results, we may not recognise the
sender of an event; attempting to create a MemberAvatar for it will lead to
null-reference errors.

Also a bit of untangling of the logic of needsSenderProfile. Since
https://github.com/matrix-org/matrix-react-sdk/pull/422,
EventTileType.needsSenderProfile was only being called on MessageEvents, and
therefore only returned true. It's a shame to see all this logic going into
EventTile rather than the individual EventTileTypes, but since it's there,
let's not leave the unused logic lying around in the EventTileType
implementations.
 2016-08-25 16:55:09 +01:00
Matthew Hodgson
36d8fa9786 fix avatar clicking in memberinfo 2016-08-25 16:20:38 +01:00
Richard van der Hoff
c1db6fb42d Merge pull request #429 from matrix-org/rav/timelinepanel_test 
Update annoying TimelinePanel test
 2016-08-25 15:40:03 +01:00
Richard van der Hoff
dd77cd74d1 Add text prefix to test event content 2016-08-25 15:13:28 +01:00
Richard van der Hoff
64bbebb135 Merge pull request #2007 from vector-im/rav/travis 
Add .travis.yml
 2016-08-25 14:33:32 +01:00
Richard van der Hoff
ebad3da6dd Use node v6 for travis 2016-08-25 14:26:56 +01:00
Richard van der Hoff
4633d16a6b Merge branch 'develop' into rav/travis 2016-08-25 14:26:20 +01:00
Richard van der Hoff
df026aede2 Switch to node 6 
... because 4 is ooold, and I'd like to use the same version on travis.
 2016-08-25 14:25:05 +01:00
Richard van der Hoff
d495a5b747 Merge branch 'rav/fix_build' into develop 2016-08-25 12:23:48 +01:00
Richard van der Hoff
042a6b58c4 Remove redundant whatwg import 
This has been rewritten to use browser-request rather than whatwg, so remove
the import, which was causing the build to fail on npm 2. (It worked, for the
wrong reasons, on npm 3.)
 2016-08-25 12:14:49 +01:00
Richard van der Hoff
d87cf6c02b Transpile the react-sdk before running travis tests 2016-08-25 12:12:20 +01:00
Richard van der Hoff
0c99c5563f Add .travis.yml 2016-08-25 11:56:49 +01:00
Matthew Hodgson
3934e37f77 Merge pull request #1972 from aviraldg/feature-changelog 
add fancy changelog dialog
 2016-08-24 18:02:00 +01:00
Matthew Hodgson
ae910d82a8 Merge pull request #416 from aviraldg/feature-changelog 
add fancy changelog dialog
 2016-08-24 18:01:39 +01:00
Richard van der Hoff
6bcf9cc9db TimelinePanel-test: Hackery to make it pass 2016-08-24 17:30:53 +01:00
Richard van der Hoff
cdd2902b01 Update annoying TimelinePanel test 
* Actually test what we were supposed to be testing (viz, that we can paginate
  back down after we hit the top of the room)

* Make the cap on the number of events we show in the timeline a configurable
  property, so that we can set it in the test

* Use a smaller cap in the test, so that we have to do less paginating to hit
  the cap, to make the test run quicker.

* add some more logging so that we can see how far it's got if it gets stuck.
 2016-08-24 16:28:00 +01:00
Kegsay
97fc4249d4 Merge pull request #428 from matrix-org/kegan/state-key-with-underscores 
Send bot options with leading underscore on the state key
 2016-08-24 15:09:44 +01:00
Kegan Dougal
c292312115 Send bot options with leading underscore on the state key 
This is in order to get around the synapse rule which states that if the
state key is a user ID, then only that user can send the event. We want to
set the event for another user (the bot), hence we can't send just the plain
user ID.
 2016-08-24 14:54:44 +01:00
Matthew Hodgson
2ee4fa484e Merge pull request #1978 from aviraldg/feature-autocomplete-improvements 
Update autocomplete design
 2016-08-24 14:48:06 +01:00
Matthew Hodgson
2f0599aae1 Merge pull request #419 from aviraldg/feature-autocomplete-improvements 
Update autocomplete design and scroll it correctly
 2016-08-24 14:47:22 +01:00