Commit Graph

1654 Commits

Author SHA1 Message Date
Aviral Dasgupta
96526c22c5 Merge branch 'develop' into feature-rte 2016-05-29 20:50:33 +05:30
Aviral Dasgupta
fe76eb9f73 minor improvements
- use <p> for unstyled blocks
- fix return key bug
- editor placeholder
2016-05-28 12:02:35 +05:30
David Baker
a145ab7e28 Merge pull request #293 from matrix-org/dbkr/fallback_hs_login
Add a fallback home server to log into
2016-05-27 15:48:30 +01:00
David Baker
118eec8cc0 Add a fallback home server to log into
If login fail with a credential error on the default HS, try
logging in on the fallback one.
2016-05-27 14:57:43 +01:00
Matthew Hodgson
d5e6e961fd fix url previews firing incorrectly on Matrix.org 2016-05-27 10:09:17 +01:00
Aviral Dasgupta
001011df27 Initial version of rich text editor 2016-05-27 10:15:55 +05:30
David Baker
0a2d0141b3 Merge pull request #291 from matrix-org/dbkr/velocity_memory_leak
Hopefully fix memory leak with velocity
2016-05-26 16:34:54 +01:00
David Baker
1664f46180 Add comment 2016-05-26 16:30:04 +01:00
David Baker
3a5e37aa84 This actually shouldn't be necessary. 2016-05-26 16:22:40 +01:00
David Baker
ed835752bc Hopefully fix memory leak with velocity 2016-05-26 13:51:51 +01:00
Matthew Hodgson
07cc9bf77d how ironic 2016-05-24 11:44:30 +01:00
Matthew Hodgson
817a3debec debug HS & IS 2016-05-18 11:42:51 +01:00
Matthew Hodgson
1459478ee0 use right check for end of timeline
and avoid bad interactions with forward pagination. thanks @richvdh
2016-05-17 21:32:20 +01:00
Matthew Hodgson
24adf2847e better comment 2016-05-17 20:32:38 +01:00
Matthew Hodgson
7879be1704 implement basic local echo for resetting unread message count when opening a room without a scroll offset. hopefully largely fixes https://github.com/vector-im/vector-web/issues/967 2016-05-17 20:28:11 +01:00
Matthew Hodgson
fd09d5c570 switch badge count to per-conversation, and add per-room badges 2016-05-17 11:14:12 +01:00
Matthew Hodgson
5bde32f7fe handle slashcommands with no args 2016-05-13 17:07:50 +01:00
Matthew Hodgson
62a1100fca Merge pull request #289 from matrix-org/dbkr/email_notifs
Support for enabling email notifications
2016-05-10 16:39:37 +02:00
Matthew Hodgson
b86af8939a fix usersettings cancel fail on new accounts 2016-05-05 15:30:56 +01:00
David Baker
6dd530e2a4 Comment getEmailPusher 2016-05-04 09:41:36 +01:00
David Baker
6a596f034f Clarify comment 2016-05-03 11:21:05 +01:00
David Baker
fab7111fd7 Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs 2016-04-29 11:09:02 +01:00
Matthew Hodgson
3cf12f8626 fix typo 2016-04-28 15:43:42 +01:00
Matthew Hodgson
728a3b8b72 Merge pull request #286 from rubo77/readme
Correct Readme instructions how to customize the UI
2016-04-28 15:41:28 +01:00
Ruben Barkow
bccee9b8a0 Correct Readme instructions how to customize the UI
As at the moment the Readme does not explain the structure of the code any more, the Readme has to be actualized.

(This is just a draft, to keep track of this Issue)
2016-04-23 11:00:48 +02:00
Richard van der Hoff
cdd08bbb6f Merge pull request #285 from matrix-org/rav/no_rerender_in_umount
Avoid rerendering during Room unmount
2016-04-22 17:29:51 +01:00
Richard van der Hoff
ca0c697b6e Avoid rerendering during Room unmount
might speed up room changing by a few milliseconds
2016-04-22 17:06:53 +01:00
Richard van der Hoff
0fd0b0c5f3 Whitespace fixes
Fix some trailing whitespace
2016-04-22 17:05:48 +01:00
David Baker
c3365f993b Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs 2016-04-22 16:25:09 +01:00
Richard van der Hoff
412512570b 0.5.2 2016-04-22 11:21:32 +01:00
Richard van der Hoff
330ab98f64 Prepare changelog for v0.5.2 2016-04-22 11:21:31 +01:00
Richard van der Hoff
afb301ffb7 Reduce timeline limit to 250 events
... maybe this will help improve responsiveness in firefox.
2016-04-22 11:08:39 +01:00
Matthew Hodgson
d72d9260d4 Merge pull request #284 from matrix-org/matthew/hide_preview_heuristics
add heuristics to hide URL previews...
2016-04-21 18:54:34 +01:00
Matthew Hodgson
4d399a3640 Refactor out isLinkPreviewable 2016-04-21 18:00:39 +01:00
Matthew Hodgson
ee11838537 fix comment paren 2016-04-21 17:19:24 +01:00
Matthew Hodgson
c5a76dec1c add heuristics to hide URL previews other than for URLs where the user has explicitly identified the target as a link: i.e. by including a URI scheme prefix, or by including URI path components, or by doing an explicit markdown hyperlink. ignore previews of URLs within pre or code blocks 2016-04-21 17:14:27 +01:00
Richard van der Hoff
30f273c611 Merge pull request #283 from matrix-org/rav/issue_1427
Fix bug which stopped us scrolling down after we scrolled up
2016-04-21 14:26:42 +01:00
Richard van der Hoff
298e2a5c0a Merge pull request #282 from matrix-org/rav/read_receipt_fixes
Rewrite Read-receipt animation
2016-04-21 14:25:27 +01:00
Richard van der Hoff
380b991d16 Merge pull request #281 from matrix-org/rav/velociraptor_fixes
Various fixes to the velociraptor
2016-04-21 14:25:07 +01:00
Richard van der Hoff
f551317b5d Unmount TimelinePanel when test completes
... mostly because it seems like a nice idea.
2016-04-21 14:23:41 +01:00
Richard van der Hoff
9fcf8d00b4 Silence some 404s from the tests
Add an edit.png so we don't get a 404 every time we load some event tiles
2016-04-21 14:23:33 +01:00
Richard van der Hoff
2f435f4836 Fix bug which stopped us scrolling down after we scrolled up
Make sure that, if we scroll up enough to move the timelinewindow away from the
end of the timeline, we reset the canForwardPaginate flag.
2016-04-21 14:20:12 +01:00
Richard van der Hoff
f09861794d Avoid having react interface methods call each other
Factor out the common bits of componentWillMount and componentWillReceiveProps
to a common function.
2016-04-21 14:14:08 +01:00
David Baker
3381e2b057 Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs 2016-04-21 10:12:27 +01:00
Richard van der Hoff
66966eecf8 Make sure we only have one React in tests
Otherwise if we symlink in react-gemini-scrollbar, React gets very confused
2016-04-21 08:10:58 +01:00
Richard van der Hoff
e5e9a3819e Load babel-polyfill in tests
Object.values() isn't available natively, so use polyfill for it.
2016-04-21 08:10:46 +01:00
Richard van der Hoff
fa34dee091 Rewrite Read-receipt animation
... hopefully fixing https://github.com/vector-im/vector-web/issues/1437 in the
process.

The idea here is that, when we remove a read-receipt from the DOM, we stash its
position in a map. Then, when the read-receipt appears again attached to
another event, we know where to start the transition.
2016-04-20 23:06:53 +01:00
Richard van der Hoff
04ef0262af Various fixes to the velociraptor
* handle having a single child, rather than an array of children

* Correctly animate children which are added at the same time as the
  Velociraptor, rather than added afterwards

* Set the child to hidden at the end of the initial animation, if that is
  required by the style property.
2016-04-20 22:21:07 +01:00
Richard van der Hoff
267bf10e69 Sort the files in component-index
Fixes https://github.com/vector-im/vector-web/issues/1352
2016-04-20 17:59:11 +01:00
Richard van der Hoff
37365728cb Bump react-gemini-scrollbar
(to pick up a non-broken version)
2016-04-20 13:46:21 +01:00