imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
62578 commits 222 branches 563 tags 470 MiB
Commit graph

62578 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard van der Hoff
e01d61dfeb Merge branch 'rav/timeline_window' into rav/link_to_event 
Conflicts:
	src/components/structures/MatrixChat.js
	src/components/structures/ScrollPanel.js
 2016-02-03 14:12:28 +00:00
Richard van der Hoff
2479c81cf6 Merge remote-tracking branch 'origin/develop' into rav/timeline_window 2016-02-03 14:09:50 +00:00
Kegan Dougal
deb1aa468f Listen on 0.0.0.0 and not localhost 2016-02-03 13:20:07 +00:00
Kegan Dougal
c76b1e7479 Actually listen on the right port 2016-02-03 13:11:51 +00:00
Kegan Dougal
4129c9bc24 Allow --symlink 2016-02-03 12:00:17 +00:00
Kegan Dougal
e22d36fc08 Add deploy directory with redeploy script 2016-02-03 11:26:24 +00:00
Richard van der Hoff
c82b364ca8 Address review comments 
Mostly renaming things and adding comments.
 2016-02-03 08:03:10 +00:00
Richard van der Hoff
101f0219c4 Merge pull request #130 from matrix-org/rav/fix_rr_react_warning 
Fix react warnings when a RR animation is happening during room switch
 2016-02-02 19:07:57 +01:00
Richard van der Hoff
3b1ed3a014 Fix react warnings when a RR animation is happening during room switch 
If the animation of an RR removal is active when we change room, we end up
getting a callback after the RoomView has been unmounted. Guard against this to
avoid getting React warnings.
 2016-02-02 17:59:11 +00:00
Kegan Dougal
043f6991a4 Dump vector/react/jssdk SHAs in filename 2016-02-02 17:03:48 +00:00
David Baker
b0f0d5f6d0 Null check room because those events will be emitted before the room is stored. 2016-02-02 16:34:41 +00:00
Kegan Dougal
2b0f4d5db1 Be more specific about the git dir 2016-02-02 16:29:25 +00:00
Kegan Dougal
1c267c69ac Include react SDK SHA in filename 2016-02-02 16:20:02 +00:00
Kegan Dougal
2a7b24e969 Update jenkins.sh to include the git commit 2016-02-02 16:09:33 +00:00
Kegsay
20f77d1224 Merge pull request #125 from matrix-org/kegan/trailing-slash 
Strip trailing slashes on HS/IS URLs on register/login
 2016-02-02 16:04:19 +00:00
David Baker
d132c75263 Remove the autoPeek stuff and always either peek or show the join prompt bar 2016-02-02 15:51:23 +00:00
David Baker
1cabe2ec37 Don't auto join rooms: always 'autoPeek' (ie. see if we can peek, otherwise offer to join) 2016-02-02 15:50:15 +00:00
Kegan Dougal
b363eafbc8 Make jenkins.sh executable 2016-02-02 15:45:30 +00:00
Kegan Dougal
2986b241c4 Add jenkins.sh for builds 2016-02-02 15:44:41 +00:00
David Baker
4e4e5be9a1 Disable upgrade registration temporarily. Fixes https://github.com/vector-im/vector-web/issues/818. 2016-02-02 14:14:18 +00:00
Kegan Dougal
ce789ba962 Split out alias settings into its own component: AliasSettings 2016-02-02 12:46:14 +00:00
David Baker
d1dc082489 Remove empty if block 2016-02-01 18:02:52 +00:00
David Baker
34ba00d0ae Merge pull request #127 from matrix-org/dbkr/fix_upgrade_with_email 
Don't assert that we're not logged in before starting registration
 2016-02-01 17:07:10 +00:00
David Baker
c187eda832 Don't assert that we're not logged in before starting registration because uprading is now a thing. 2016-02-01 16:53:39 +00:00
Richard van der Hoff
d9e13780b8 Implement direct-to-event linking. 
This adds support for links to particular event ids: add /<eventId> to the URL
for a room.

This commit also ensures that we scroll to the 'read marker' when switching to
a room which has no previous scroll state, as well as preventing that marker
from going past the middle of the screen.

This also reinstates the preservation of scroll state when switching rooms,
which was disabled previously.
 2016-02-01 16:31:12 +00:00
Kegan Dougal
e6c93530e2 Strip trailing slashes on HS/IS URLs on register/login 2016-02-01 14:19:20 +00:00
Richard van der Hoff
f0cf5c0aff Update onRoomTimeline comment 2016-02-01 12:35:41 +00:00
Richard van der Hoff
2c04b9cb5b Merge pull request #124 from ajohnson23/messages_scrolldown_fix 
Fix improper scrolldown button display issue.
 2016-02-01 11:38:14 +01:00
Andrew Johnson
fe9d7d10b9 Fix improper scrolldown button display issue. 
This fixes an intermittent issue where the scrolldown button
or "new messages below" button would display even when the messages
panel was scrolled to the very bottom. Furthermore, when new messages
arrived, the messages panel would not automatically scroll down to show
the new messages.

Fixes https://github.com/vector-im/vector-web/issues/805
 2016-01-29 22:32:32 -05:00
Richard van der Hoff
f94272c539 Add some crude CSS for highlighting the selected event 
(To be useful, this needs functionality which hasn't yet landed in react-sdk).
 2016-01-30 00:43:47 +00:00
David Baker
3b18b9b54b Fix connection lost bar CSS 2016-01-29 10:07:22 +00:00
David Baker
7301f53807 Merge pull request #121 from matrix-org/dbkr/fix_registration_guest_access 
Fix registration: don't auto-log in as a guest if we have a URL from …
 2016-01-28 16:21:16 +00:00
Kegsay
6bb69ef2d1 Merge pull request #120 from matrix-org/kegan/bulk-email-invite 
Support bulk invitations via text separators
 2016-01-28 16:21:05 +00:00
David Baker
401d18bcc6 Fix registration: don't auto-log in as a guest if we have a URL from sydent. 2016-01-28 15:42:14 +00:00
David Baker
3585437af9 Merge pull request #800 from vector-im/dbkr/guest_warning_bar 
CSS that changes the connection lost bar into a more general 'warning bar'
 2016-01-28 13:44:09 +00:00
David Baker
640e87e7c5 Merge pull request #117 from matrix-org/dbkr/guest_warning_bar 
Add warning bar for guest users.
 2016-01-28 13:44:06 +00:00
David Baker
6a36b022e4 New style guest warning bar 2016-01-28 13:00:44 +00:00
David Baker
83119d21d6 New style guest warning bar 2016-01-28 12:59:51 +00:00
David Baker
37ab225894 Merge pull request #119 from matrix-org/dbkr/own_messages_not_unread 
Your own messages should not count as unread
 2016-01-28 12:42:21 +00:00
Kegsay
12463aec4d Merge pull request #115 from matrix-org/kegan/fix-3pid-signup 
Redirect to the registration page when landing with ?email=
 2016-01-28 12:00:06 +00:00
Kegan Dougal
bdc1028a7e Support bulk invitations via text separators 
Valid separators are , ; <space>
 2016-01-28 11:56:20 +00:00
David Baker
796a2e5e3a Revert e5f4fa8c46 as it's no longer what's desired. 2016-01-28 11:15:43 +00:00
David Baker
7d621d88d8 Your own messages should not count as unread 2016-01-28 11:12:56 +00:00
Richard van der Hoff
a4f4bb9e72 Convert RoomView to using a TimelineWindow 
Instead of using the Room's active timeline directly, use a
TimelineWindow. This shouldn't (yet) have much effect, beyond maybe making
scrollback after a gappy sync slightly more efficient.

For now, I have disabled the 'restoreScrollState' functionality. This will be
reinstated once I land the link-to-event code.
 2016-01-28 10:53:43 +00:00
Kegan Dougal
81cc30bab2 Null guard because this may not exist in the DOM. 2016-01-28 10:52:08 +00:00
Kegan Dougal
e017559765 New line 2016-01-28 09:58:51 +00:00
David Baker
58f9210b5a Merge pull request #118 from matrix-org/dbkr/fix_custom_tags_exception 
Fix exception thrown if any custom tags are set
 2016-01-28 09:51:51 +00:00
David Baker
f745e941ec Fix exception thrown if any custom tags are set 2016-01-28 09:41:46 +00:00
David Baker
35600f11ad CSS that changes the connection lost bar into a more general 'warning bar' so we can use it for a guest access warning 2016-01-28 09:19:28 +00:00
David Baker
7ea45f9888 Move message count to suffix in title, as requested by @ara4n 2016-01-27 18:03:01 +00:00