1e945cd13b
Don't show the Notifications widget for guests since they can't use them (and it throws an error if you try to mount it).
2016-02-10 11:48:35 +00:00
0d2b042c0f
Merge pull request #148 from matrix-org/rav/keep_scrolling
...
Don't stop scrolling at the read-up-to mark.
2016-02-10 10:20:03 +00:00
af0597e0c8
Joining a room can take a while. Show a spinner otherwise we'll end up in multiple join city.
2016-02-09 16:55:03 +00:00
f48f28eefe
Kill another scrollToToken
...
Missed a place where we were scrolling the messagepanel manually
2016-02-09 15:50:09 +00:00
576b59be66
Kill off the remains of auto_peek
...
Remove some dead code.
2016-02-09 15:45:41 +00:00
178e99385a
Merge remote-tracking branch 'origin/develop' into rav/keep_scrolling
2016-02-09 14:52:38 +00:00
30b4b91cf3
Show jump-to-bottom icon even when there is other stuff in the status bar
...
Also includes a general simplification of the classes being used in the status
bar.
This should fix vector-im/vector-web#879 . Obviously it needs corresponding
changes in the CSS in vector-web.
2016-02-09 14:45:30 +00:00
7fd56351a9
Fix 'unread messages' in status
...
This got broken in the previous commit
2016-02-09 12:40:11 +00:00
194110dd71
Merge pull request #147 from matrix-org/rav/factor_out_statusbar
...
Factor the statusbar implementation out of RoomView.
2016-02-09 11:38:40 +00:00
81e95ca8c1
Wire up jump-to-bottom knob
...
... which I embarassingly forgot
2016-02-09 11:36:57 +00:00
8641dab756
Don't stop scrolling at the read-up-to mark.
...
We want to keep things scrolling up after the read-up-to mark hits the middle
of the screen. Do this by giving the ScrollPanel a stickyBottom (provided we're
not in old history) instead of updating the scroll position when RRs arrive.
Also, when we switch back to a room, if there was no special scroll state, jump
to the end of the timeline instead of the RR mark.
2016-02-09 11:08:26 +00:00
da81d240e2
Merge pull request #146 from matrix-org/kegan/warning-bars-dom
...
Use constant div nesting when warning bars appear
2016-02-09 11:03:31 +00:00
1d9c88698f
Factor the statusbar implementation out of RoomView
...
... because RoomView must die
2016-02-08 18:08:19 +00:00
ecaa2c1e11
Fix the mess of warning bars so it doesn't trigger remounts of alllll the components
2016-02-08 17:20:52 +00:00
3ca2bbe31e
Drop a redundant 'else' from RoomView.render, and outdent a load of code
...
... in the hope of aiding readability slightly
2016-02-08 16:43:08 +00:00
9bf8f37e5f
explicitly check join status as it's clearer
2016-02-08 16:03:04 +00:00
baba500150
Filter rooms by ones we're in: getRooms() is not the set of rooms we are joined.
...
Fixes https://github.com/vector-im/vector-web/issues/885
2016-02-08 14:33:10 +00:00
05f1e1e205
Merge pull request #140 from matrix-org/dbkr/fix_tab_complete
...
Fix tab complete
2016-02-08 14:19:06 +00:00
4ce41f7f6c
Merge pull request #141 from matrix-org/kegan/room-settings-refactor
...
Refactor room settings
2016-02-05 15:50:39 +00:00
03f19eba55
Implement radio boxes ( vector-im/vector-web#731 ) for history visibility. Hook up remaining bits.
2016-02-05 14:38:28 +00:00
500c12b1f2
Fix tab complete
...
rate limited functions can't have arguments, so don't pass the room into
_updateTabCompleteList as it's always the room in our state.
2016-02-05 14:32:30 +00:00
0cbf9dba87
Glue more things back together
2016-02-05 11:59:19 +00:00
0ae548cf5d
Merge pull request #139 from matrix-org/dbkr/rate_limit_funcs
...
Make the function call-rate limiting a generic thing and use it in more places.
2016-02-05 10:15:55 +00:00
63776509a6
Make the function call-rate limiting a generic thing and use it in more places.
2016-02-04 18:06:24 +00:00
5ae532dae2
Merge pull request #138 from matrix-org/rav/update_rr_semantics
...
Tweaks to the semantics for sending RRs and handling room switches
2016-02-04 17:42:15 +01:00
d14c1a82b2
Tweaks to the semantics for sending RRs and handling room switches
...
* Only send read receipts when we are at the bottom of a room; this is a simple
and effective way of stopping the green bar of doom from jumping down the
room slightly behind the scroll.
* Jump to read-up-to mark when switching back to a room if we were following
the live timeline before.
2016-02-04 16:27:49 +00:00
74e16ac83e
Merge branch 'develop' into kegan/room-settings-refactor
2016-02-04 16:20:24 +00:00
75ff4f0f95
Merge pull request #135 from matrix-org/kegan/sync-limit
...
Set the sync limit back to sane levels
2016-02-04 15:47:31 +00:00
d1467d2319
Merge pull request #136 from matrix-org/dbkr/prompt_display_name_on_join
...
Prompt for display name before joining your first room
2016-02-04 15:32:52 +00:00
4013dae770
Start refactoring RoomSettings
...
- Don't manipulate settings in RoomView. Make it RoomSettings' job.
- Return Promise[] from AliasSettings.save() rather than an allSettled promise
so callers can have more granularity over what to do with it (.all vs .allSettled)
- General refactoring of RoomSettings. Most things are broken now and are not
submitted. Add util methods to grab values out of events.
2016-02-04 15:26:12 +00:00
167da10b8b
address PR comments
2016-02-04 15:07:30 +00:00
6e424780f1
typo
2016-02-04 14:38:05 +00:00
d0c8dadaf6
Merge pull request #134 from matrix-org/dbkr/fix_preview_bar
...
Put the room preview bar back for rooms that aren't peekable
2016-02-04 14:10:18 +00:00
309f1e2c8f
Merge pull request #131 from matrix-org/rav/search_clickthrough
...
Enable clicking on search results to switch to the result in context.
2016-02-04 15:06:39 +01:00
63b50ed230
Merge pull request #132 from matrix-org/rav/fix_404_on_echo
...
Don't try to use local echoes as scroll tokens
2016-02-04 15:05:35 +01:00
8f5c739886
Clean up scrollToken assignment
2016-02-04 14:05:16 +00:00
f3fa5d6a2a
Set the sync limit back to sane levels
2016-02-04 13:30:25 +00:00
b0da54533d
Don't do this check - it's not valid since we set the room in onRoomName
2016-02-04 13:25:45 +00:00
891f4761a0
Add comments and only set a room / init the timeline if we don't already have a room
2016-02-04 13:21:42 +00:00
6c9d48bd3a
Merge pull request #128 from matrix-org/kegan/alias-settings
...
Split out alias settings into its own component: AliasSettings
2016-02-04 13:14:19 +00:00
574560cc05
remove listener on unmount
2016-02-04 13:06:59 +00:00
47fef0896f
Prompt for display name before joining your first room (if you haven't set one).
...
Fixes https://github.com/vector-im/vector-web/issues/758
2016-02-04 11:49:10 +00:00
3c2c2b051b
Listen for Room and use this to init the timeline, not Room.name
2016-02-04 11:29:00 +00:00
c9a3ad31ab
Comment error handling
2016-02-04 11:17:39 +00:00
5c430395ea
init timeline when we get the room, as otherwise we never load it after joining
2016-02-04 10:50:21 +00:00
164c9b9031
Check error to see if it's actually a failure to peek
2016-02-03 16:53:48 +00:00
8b96af4ccb
Display the version in UserSettings. Change MatrixChat.onNewVersion to onVersion
2016-02-03 16:51:53 +00:00
cebc2f5306
Put the room preview bar back for rooms that aren't peekable (since we always tried to peek, it would fail which would reject the promise and cause loadingTimeline to stay true forever).
2016-02-03 16:23:57 +00:00
7bdd9f57a5
Add MatrixChat.onNewVersion to trigger the new version bar
2016-02-03 16:16:52 +00:00
d7576d223d
Don't try to use local echoes as scroll tokens
...
Local echoes don't have a (usable) event id, so don't use them when remembering
the scroll state of a room.
2016-02-03 15:34:20 +00:00
11df2fc285
Merge remote-tracking branch 'origin/develop' into dbkr/no_auto_join
2016-02-03 15:18:18 +00:00
e747beac58
Enable clicking on search results to switch to the result in context.
2016-02-03 15:06:52 +00:00
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
2479c81cf6
Merge remote-tracking branch 'origin/develop' into rav/timeline_window
2016-02-03 14:09:50 +00:00
c82b364ca8
Address review comments
...
Mostly renaming things and adding comments.
2016-02-03 08:03:10 +00:00
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
b0f0d5f6d0
Null check room because those events will be emitted before the room is stored.
2016-02-02 16:34:41 +00:00
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
4e4e5be9a1
Disable upgrade registration temporarily. Fixes https://github.com/vector-im/vector-web/issues/818 .
2016-02-02 14:14:18 +00:00
ce789ba962
Split out alias settings into its own component: AliasSettings
2016-02-02 12:46:14 +00:00
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
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
f0cf5c0aff
Update onRoomTimeline comment
2016-02-01 12:35:41 +00:00
2c04b9cb5b
Merge pull request #124 from ajohnson23/messages_scrolldown_fix
...
Fix improper scrolldown button display issue.
2016-02-01 11:38:14 +01:00
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
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
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
83119d21d6
New style guest warning bar
2016-01-28 12:59:51 +00:00
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
796a2e5e3a
Revert e5f4fa8c46 as it's no longer what's desired.
2016-01-28 11:15:43 +00:00
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
81cc30bab2
Null guard because this may not exist in the DOM.
2016-01-28 10:52:08 +00:00
e017559765
New line
2016-01-28 09:58:51 +00:00
7ea45f9888
Move message count to suffix in title, as requested by @ara4n
2016-01-27 18:03:01 +00:00
e5f4fa8c46
Add warning bar for guest users. Fixes https://github.com/vector-im/vector-web/issues/770
2016-01-27 17:58:47 +00:00
4661bb0942
Don't show a spinner while we're waiting for the user to do something
2016-01-27 15:44:12 +00:00
8360c112fb
Put the favicon badge call in a try block, as per comment
2016-01-27 15:19:25 +00:00
db8fab8019
Redirect to the registration page when landing with ?email=
...
Fixes "Missing access token" error.
2016-01-27 10:47:54 +00:00
c1f28bb6b9
hide 'unknown screen' warning
2016-01-24 19:14:14 +00:00
bc60435750
improve settings layout and fix FF bugs
2016-01-24 18:15:08 +00:00
3da76192a1
title attr
2016-01-24 02:01:45 +00:00
f15564074c
track whether we're scrolled to bottom or not and display UI for warning & jumping there if needed.
2016-01-24 01:51:01 +00:00
24225af416
work around history visibility roomsetting UI some more
2016-01-22 17:01:15 +00:00
0bef94a6ce
fudge around https://github.com/vector-im/vector-web/issues/731
2016-01-22 15:51:27 +00:00
99a491bb0e
Merge pull request #68 from matrix-org/notif_sync
...
Set room highlight from unread_notification_count
2016-01-21 10:31:42 +00:00
acce08194d
Apply patch to the right branch: update for new count format
2016-01-21 10:23:18 +00:00
1c54c64850
Merge pull request #99 from matrix-org/user_settings_on_register
...
Show user settings screen on registration
2016-01-21 10:11:28 +00:00
a0cc3720a9
Merge pull request #106 from matrix-org/dbkr/dont_spam_read_receipts
...
Don't spam the same RR at the server until it acks it.
2016-01-21 10:01:30 +00:00
9bbb9f7b29
pretty invites!
2016-01-21 00:45:22 +00:00
deca90d0a7
fix up Start Chat behaviour as per Amandine's feedback
2016-01-21 00:16:10 +00:00
35c141cda9
reduce size of auxpanel when editing roomsettings
2016-01-20 23:09:36 +00:00
442e090f37
button layout
2016-01-20 17:09:46 +00:00
76b7788ba6
usersettings rhs button
2016-01-20 17:07:00 +00:00
0052fbd6cb
Don't spam the same RR at the server until it acks it.
2016-01-20 16:39:25 +00:00
83634bf930
Update for new unread count format
2016-01-20 15:56:11 +00:00
b296d05b35
Fix finally NPE
2016-01-20 15:38:34 +00:00
8dc21ec837
Fix race condition when joining rooms
...
Problem: Hitting join on a room invite would show spinner, then join room screen
then the messages.
Cause: The UI to show a spinner is set via the "joining" flag. This flag was
only set for the duration of the /join HTTP request. This is insufficient
because it races with actual room info arriving from /sync. If this info does
not arrive before the /join HTTP request returns, "joining" is false but the
current membership state of the user is still invite.
Fix: The "joining" flag is still set when the /join HTTP request is made, but
it is only turned off when the join event arrives from /sync.
Extras: This fix should also work when joining a room not from an invite.
2016-01-20 15:25:40 +00:00
60a084bdbd
Merge branch 'develop' into matthew/roompreview
2016-01-20 14:22:09 +00:00
c4d4e9c46e
Terminate promise chain
2016-01-19 17:20:23 +00:00
4ed130ceac
Implement adding email addresses to your profile.
2016-01-19 16:36:54 +00:00
84608ba156
Fix syntax error
2016-01-19 16:18:08 +00:00
db7d863ce4
set autoPeekDone on finally
2016-01-19 15:18:16 +00:00
c29ec28dfd
fix layout for blunt join msgs
2016-01-18 20:15:12 +00:00
f22519f10c
factor out the peek rule calculation so that we can do it both onNewRoom and if there's a room already. I guess we could do it in react's onStateUpdate too
2016-01-18 20:05:33 +00:00
765174a600
merge conflict
2016-01-18 19:56:35 +00:00
491ba94230
WIP: try to support non-guest room peek. Rename visibility permissions in room settings a bit, and fix how they are persisted.
2016-01-18 17:39:23 +00:00
33edeccb43
Merge branch 'develop' into push-rules-settings
...
# Conflicts:
# src/component-index.js
# src/components/views/rooms/RoomSettings.js
2016-01-18 18:00:41 +01:00
0ac997491e
Clarify comment
2016-01-18 14:23:31 +00:00
51648b9bf0
merge develop
2016-01-18 14:02:19 +00:00
6e3245a3b0
make linkify userid jump to memberinfo
2016-01-18 01:26:15 +00:00
f3aeda7af9
merge develop
2016-01-17 23:31:21 +00:00
1467aacfa4
support saving tag changes (untested)
2016-01-17 12:27:21 +00:00
5b5bd9aef1
remove create_room for now. lots of stupid bugfixes across the board.
2016-01-17 03:59:31 +00:00
82a159d651
make roomsettings actually work, including alias editing. (using staged UX rather than direct manipulation). loads of tweaks and fixes across the board
2016-01-17 02:48:55 +00:00
7045906d5d
Show user settings screen on registration instead of the PostRegister stuff.
2016-01-15 18:58:18 +00:00
a90f63f72c
null check
2016-01-15 18:49:12 +00:00
a849955c51
Merge pull request #93 from matrix-org/registration_field_validate
...
Do (more) client side validation of registration parameters.
2016-01-15 16:38:46 +00:00
f476150591
fix changeavatar to avoid duplicate click on label
2016-01-15 16:33:34 +00:00
293f5c7120
shrink auxpanel a bit for roomsettings
2016-01-15 15:53:53 +00:00
b8afccd445
fix droptarget behaviour
2016-01-15 15:23:02 +00:00
4a2c2d9656
fix broken merge and revert some of 243b2e45 and document evil magic numbers
2016-01-15 14:22:17 +00:00
b60d14a408
Merge pull request #91 from matrix-org/show_upload_in_current_room_only
...
Only show uploads that are going to the current room
2016-01-15 13:45:23 +00:00
02e41450b4
Do (more) client side validation of registration parameters.
2016-01-15 13:31:41 +00:00
7cc5925ec4
increase initialSyncLimit enormously to avoid slow gappy /syncs for now
2016-01-15 13:28:41 +00:00
e1e46be220
apply gemini scrollbar
2016-01-15 13:11:14 +00:00
828b1f4837
fix up look and feel of UserSettings a bit more
2016-01-15 12:35:30 +00:00
f868f7813b
Room settings: Added notifications mute checkbox
2016-01-14 19:06:48 +01:00
b491447702
Merge pull request #89 from matrix-org/kegan/slash-command-tab-complete
...
Implement tab-complete for slash commands
2016-01-14 17:34:20 +00:00
06ecf78e5f
Merge branch 'develop' into matthew/roomsettings2
2016-01-14 16:50:12 +00:00
d33d606912
Only show uploads that are going to the current room
...
Fixes #506
2016-01-14 16:31:42 +00:00
ffaea371ac
Merge branch 'kegan/slash-command-tab-complete' into matthew/roomsettings2
2016-01-14 16:02:29 +00:00
7e5d4b8ce8
Send an event at the end of user activity too and use this to send RRs.
2016-01-14 16:01:31 +00:00
b67131f0c8
Add a Command class; add Entry.getFillText()
...
getFillText() serves to decouple the text displayed in the auto-complete list
via getText() and the text actually filled into the box via getFillText(). This
allows us to display command + args on the list but only fill the command part.
A Command class has been added to provide some structure when extracting the
command name and args. Manually tested and it works.
2016-01-14 14:39:58 +00:00
864d10f412
Make individual Entrys responsible for determining suffixes
...
This makes it cleaner as CommandEntry always wants a space, but MemberEntry
wants a space or ": " depending on if it is the first word or not.
2016-01-14 11:39:24 +00:00
123b134d87
use getDomain()
2016-01-13 18:15:59 +00:00
dc62f639f2
Merge branch 'kegan/slash-command-tab-complete' into matthew/roomsettings2
2016-01-13 18:11:11 +00:00
7a1e6bbe7e
fix merge conflicts
2016-01-13 18:00:04 +00:00
53f31e49da
Implement tab-complete for slash commands
...
This needed a new interface function `getOverrideSuffix()` so we didn't suffix
commands at the start with ": ". All seems to work.
2016-01-13 17:46:36 +00:00
11025e2ba9
Make read marker ghost same width as normal one.
2016-01-13 15:18:21 +00:00
5f763f8ebb
merge develop
2016-01-13 14:03:54 +00:00
69cac307d9
Merge branch 'develop' into kegan/guest-peek-then-join
2016-01-13 13:22:58 +00:00
c9c496f0e5
WIP all new roomsettings
2016-01-13 13:15:13 +00:00
f715662d18
merge in develop, fixing conflicts
2016-01-13 13:06:27 +00:00
3934b42ac8
s/m.room.color_scheme/org.matrix.room.color_scheme/g # to make kegan happier
2016-01-13 13:01:00 +00:00
67ff769962
Include invites in the badge count
2016-01-13 13:00:03 +00:00
d10c96ede8
Merge pull request #87 from matrix-org/kegan/password-reset
...
Implement password reset
2016-01-13 10:35:54 +00:00
2eb724f1f0
Merge pull request #85 from matrix-org/read_marker_animate
...
Improve read markers so they show at appropriate times and animate away.
2016-01-12 17:57:14 +00:00
848cb30ea4
Remove ill-concieved delay before sending read receipts & instead just wait a bit before removing the ghost read marker.
2016-01-12 17:48:34 +00:00
ec4e0d7687
Implement password reset
...
This adds a link to the login screen with "Forgot your password?". Clicking it
takes you to a form with fields for an email address and a new password. This
makes the same API calls as the Angular SDK.
Manually tested resetting + not clicking link + invalid email and it all seems
to work.
2016-01-12 17:20:16 +00:00
4a8b5dfe3a
Don't display read markers (or ghosts) above our own messages.
2016-01-12 17:18:16 +00:00
8b730c0a5d
PR feedback
2016-01-12 16:38:09 +00:00
37f1b4ba8a
Tweaked style means we can have 100% width (well 99% otherwise we gain a horizontal scrollbar)
2016-01-12 14:13:42 +00:00
eb955eb371
Add a RoomPreviewBar which asks if you'd like to join a peeked room
2016-01-12 14:11:15 +00:00
953e138317
Settings page: Made the push notifications settings a separate component. This component is currently implemented at the app level
2016-01-11 17:05:27 +01:00
243b2e4587
Make the scrollpanel update itself correctly on video resize.
...
When we first get video, the video component will resize itself. This will
cause the page to be reflowed, but that doesn't trigger an update on the gemini
scrollbar. We therefore need to force an update on the messagepanel. Implement
this by providing an onResize property on the CallView component.
We need to do the same when we change the maxHeight on the video panel.
The same applies to resizing of the MessageComposer. That was previously
handled with a fugly roomView.forceUpdate() from MessageComposer - make it use
the same mechanism.
Finally: the messageComposer is at least 70 pixels, and up to 100 pixels high -
not 36. Fix the auxPanelMaxHeight calculation - and use a static constant
rather than hardcoding the number to avoid this happening again.
2016-01-11 15:28:59 +00:00
e7740cbc8b
Merge pull request #84 from matrix-org/rav/fix_refs_npes
...
Fix some races due to promises completing after we've switched rooms
2016-01-11 15:25:17 +00:00
3cd805e71d
Merge pull request #82 from matrix-org/kegan/guest-access
...
Implement guest access and upgrading
2016-01-11 15:19:39 +00:00
fcdfce3760
Toggle auto-reg off when successfully registered as a guest.
...
Otherwise if you refresh -> auto-reg -> logout, you will get an infinite
spinner as it will think it is auto-registering again.
2016-01-11 15:12:55 +00:00
c30aeac315
Set our own booleans instead of using isMounted
2016-01-11 11:38:04 +00:00
aa80a5d494
fix layout bug for general auxPanel
2016-01-10 13:03:37 +00:00
684255044a
switch EditableText to be built on contentEditable rather than switching divs and inputs, so that it can be used for managing multiline content like topics and room names, and use it in RoomHeader/RoomSettings
2016-01-10 12:56:45 +00:00
1507b39940
Redundant line.
2016-01-09 00:07:51 +00:00
7b2d56f619
Calculate what event we send a read receipt for after the delay so we send a receipt for the one the user actually settles on.
2016-01-08 22:19:51 +00:00
7913b0b465
Length of the returned array, not the index of the timeline event.
2016-01-08 21:51:14 +00:00
d63f83187f
Only show read marker if it's somewhere other than at the bottom, make it animate away and put a short delay before the read marker advances so quickly changing to a room and then away again doesn't advance your read marker.
2016-01-08 21:18:47 +00:00
223f6f7914
Fix sorting of search result highlights
...
Make sure that we *actually* give preference to longer search result
highlights; it turns out that the code that looked like it was doing so has
never worked.
2016-01-08 13:25:03 +00:00
62cf34b58c
Fix some races due to promises completing after we've switched rooms
...
Add a few isMounted() checks to promise handlers so that we don't end up
throwing NPEs.
2016-01-08 12:03:45 +00:00
ef00a1624d
fix up RoomSettings somewhat and implement room colors
2016-01-08 03:22:38 +00:00
a3df50f4c3
Implement guest account upgrading
2016-01-07 17:23:32 +00:00
458d71a496
Attempt to peek into rooms we don't know about.
...
Also: display an error dialog if we fail to join the room if you click Join Room.
2016-01-07 16:22:17 +00:00
c64f36c81b
Merge branch 'develop' into kegan/guest-access
2016-01-07 13:21:06 +00:00
8170288acb
Merge pull request #77 from matrix-org/matthew/dynamic-svg
...
Make SVGs and CSS dynamically recolourable
2016-01-07 11:42:30 +00:00
ef473dec72
Add read-up-to green* line
...
* not actually green without CSS in vector-web
2016-01-07 11:18:41 +00:00
99abd58f1a
Merge remote-tracking branch 'origin/develop' into notif_sync
2016-01-07 10:41:16 +00:00
287da54fbc
Address PR comments
2016-01-07 10:38:44 +00:00
0772f50fab
update copyright for 2016
2016-01-07 04:06:52 +00:00
4624e7a485
Address review comments
...
s/onClick/onSelect/
2016-01-06 16:46:29 +00:00
afbb451d4a
Merge branch 'develop' into kegan/guest-access
2016-01-06 13:59:33 +00:00
f499c60b12
sundry PR feedback
2016-01-06 02:29:08 +00:00
509ea7c4f3
factor out tintable SVGs into their own component, and use plain DOM onload rather than react synthetic events
2016-01-06 02:11:07 +00:00
9e8daba8d7
Merge branch 'develop' into matthew/dynamic-svg
2016-01-06 01:11:34 +00:00
75302b1f97
Factor out a separate SearchResultTile
2016-01-05 17:56:59 +00:00
d729dee31d
Make the settings page load for guests. Add checkboxes for guest r/w
2016-01-05 17:34:25 +00:00
4730179c26
Fix slight mis-merge
...
We need to return 'true' from our promise of search result pagination.
Also inline _backPaginateSearch which mostly served to confuse, and use
debuglog instead of checking DEBUG_SCROLL
2016-01-05 15:51:16 +00:00
583d35e39f
Merge branch 'develop' into rav/new_search_api
...
Conflicts:
src/components/structures/RoomView.js
2016-01-05 15:38:30 +00:00
6c99fab3dd
Highlight the search term in search results
...
Sometimes we don't get the search term back in the highlights list, so make
sure we add it.
2016-01-05 15:28:32 +00:00
355cabb7ee
Merge pull request #70 from matrix-org/rav/scrollpanel_promises
...
Make ScrollPanel keep track of when fill requests are happening
2016-01-05 13:52:04 +00:00
ae7b2d54bb
Merge branch 'develop' into kegan/guest-access
2016-01-05 11:39:36 +00:00
2b169b06f5
Make ScrollPanel.isAtBottom more reliable
...
Given we want to use isAtBottom to figure out whether to show 'unread messages'
counts, we ought to return the current scroll state, rather than the saved one.
This fixes vector-im/vector-web#576
2016-01-05 11:02:18 +00:00
0e98764d82
oops, no double classNames
2016-01-05 03:51:00 +00:00
001dc8612b
support fixing up dynamically loaded SVGs
2016-01-05 03:34:52 +00:00
555abdae30
wire up Tinter.js
2016-01-05 00:46:52 +00:00
e177263d9f
Address review comments
...
Minor fixes post-review
2016-01-04 16:54:27 +00:00
b5eae891b4
Address review comments
...
Make onFillRequest always return a promise
2016-01-04 16:28:32 +00:00
89fcf019e1
Merge branch 'develop' into rav/scrollpanel_promises
...
Conflicts:
src/components/structures/RoomView.js
2016-01-04 12:56:39 +00:00
3009da0b39
move title attributes to the div
2016-01-03 22:34:56 +00:00
4f915d622e
switch SVGs from imgs to objects
2016-01-03 22:30:52 +00:00
424540e57a
fix NPE if messagePanel isn't yet defined
2015-12-28 02:40:17 +00:00
50ac0ab4cf
wire up RoomAlias's homeserver as intended
2015-12-28 02:36:28 +00:00
93e7f90ae4
ScrollPanel: implement forward-fill
2015-12-24 14:30:49 +00:00
David Baker