Matthew Hodgson
4d2608017b
fix CSS for ChangeAvatar placeholder
2016-01-20 15:39:56 +00:00
Kegan Dougal
b296d05b35
Fix finally NPE
2016-01-20 15:38:34 +00:00
Kegan Dougal
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
Kegan Dougal
edb67b778d
Merge branch 'develop' into matthew/roompreview
2016-01-20 14:42:04 +00:00
Kegan Dougal
fee7ee5dcc
Load the user list eventually if we have no Room object
2016-01-20 14:41:48 +00:00
Kegan Dougal
a0aaae49dd
Merge branch 'develop' into matthew/roompreview
2016-01-20 14:27:25 +00:00
Kegsay
c3c7c90de0
Merge pull request #103 from matrix-org/kegan/invite-search
...
Add global search with ability to invite from said list
2016-01-20 14:26:17 +00:00
Matthew Hodgson
60a084bdbd
Merge branch 'develop' into matthew/roompreview
2016-01-20 14:22:09 +00:00
Kegan Dougal
391c653d24
Lazy-load the user list to improve perf
...
Still slow when typing due to adding 1000 tiles to the DOM, but it is at least
a lot better than before (which would stutter on ANY change to the member list)
2016-01-20 14:14:04 +00:00
Kegan Dougal
91c224aaf4
Review comments: Remove stuff which shouldn't have been there
2016-01-20 13:41:03 +00:00
David Baker
6d19ce09ab
Merge pull request #105 from matrix-org/dbkr/add_email_address
...
Implement adding email addresses to your profile.
2016-01-19 17:20:35 +00:00
David Baker
c4d4e9c46e
Terminate promise chain
2016-01-19 17:20:23 +00:00
Kegan Dougal
bdfd09d893
Merge branch 'kegan/invite-search' into matthew/roompreview
2016-01-19 17:10:54 +00:00
Kegan Dougal
e4e3393232
Temporarily comment out address book until perf can be looked at given other PRs now depend on this PR
2016-01-19 17:09:36 +00:00
David Baker
4ed130ceac
Implement adding email addresses to your profile.
2016-01-19 16:36:54 +00:00
Kegan Dougal
84608ba156
Fix syntax error
2016-01-19 16:18:08 +00:00
Kegan Dougal
3e4c5d7fa3
Merge branch 'kegan/invite-search' into matthew/roompreview
2016-01-19 16:08:14 +00:00
Matthew Hodgson
db7d863ce4
set autoPeekDone on finally
2016-01-19 15:18:16 +00:00
Kegsay
33bd6e2028
Merge pull request #104 from matrix-org/dbkr/dedup_client_secret
...
Remove generateClientSecret and use the one the js sdk gives us.
2016-01-19 14:57:29 +00:00
Kegan Dougal
d2708cf4d4
Filter the membership list in addition to the search area for the input text
2016-01-19 14:51:26 +00:00
Matthew Hodgson
2274cb3f7f
fix invite prompt
2016-01-18 20:18:46 +00:00
Matthew Hodgson
c29ec28dfd
fix layout for blunt join msgs
2016-01-18 20:15:12 +00:00
Matthew Hodgson
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
Matthew Hodgson
eb7144ef85
improve layout
2016-01-18 19:56:56 +00:00
Matthew Hodgson
0a79b0f9e2
fix NPE from kegan's memberlist branch
2016-01-18 19:56:47 +00:00
Matthew Hodgson
7b91d3c5f8
wording changes from Amandine to settings
2016-01-18 19:56:38 +00:00
Matthew Hodgson
765174a600
merge conflict
2016-01-18 19:56:35 +00:00
David Baker
e68972fb1a
Remove generateClientSecret and use the one the js sdk gives us.
2016-01-18 17:50:27 +00:00
Matthew Hodgson
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
Kegan Dougal
a8643ff039
Move power level stuff to EntityTile for now
2016-01-18 17:37:17 +00:00
Kegan Dougal
0465323ca6
Merge branch 'develop' into kegan/invite-search
2016-01-18 17:31:26 +00:00
Kegan Dougal
f1042bd1c4
UI tweaks
2016-01-18 17:21:28 +00:00
Kegan Dougal
36616a97a1
Add ability to click-to-invite
2016-01-18 17:12:35 +00:00
manuroe
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
Kegan Dougal
165adde0c8
Use EntityTile for 3PID entities rather than munging MemberTile
2016-01-18 16:55:51 +00:00
Kegan Dougal
c758c0f84f
Add invite button JSX
2016-01-18 16:47:31 +00:00
Kegan Dougal
71009d81b6
Factor out common code between MemberTile and UserTile into EntityTile. Use EntityTile.
2016-01-18 15:19:49 +00:00
David Baker
cc3d27bd4b
Merge pull request #98 from matrix-org/message_composer_arrows_keys
...
Fix history scrolling with multiline input
2016-01-18 14:25:57 +00:00
David Baker
880ae0f3fa
Fix typo
2016-01-18 14:25:23 +00:00
David Baker
0ac997491e
Clarify comment
2016-01-18 14:23:31 +00:00
Matthew Hodgson
51648b9bf0
merge develop
2016-01-18 14:02:19 +00:00
Matthew Hodgson
17fdfa0c8f
incorporate kegan PR feedback
2016-01-18 14:00:47 +00:00
Matthew Hodgson
aa412bed0f
reindent promises as per dave's PR feedback
2016-01-18 13:38:40 +00:00
Matthew Hodgson
d0eedb4faa
merge develop
2016-01-18 13:34:09 +00:00
Kegan Dougal
fd99b260f4
Merge branch 'develop' into kegan/invite-search
2016-01-18 12:07:36 +00:00
Kegan Dougal
2a64d0feb3
Merge branch 'develop' into matthew/roomsettings2
2016-01-18 10:49:45 +00:00
Kegsay
6e42d00727
Merge pull request #95 from matrix-org/kegan/base-avatar
...
Factor out common Avatar code
2016-01-18 10:18:04 +00:00
Matthew Hodgson
8f83621c4c
hide Mod button for muted users
2016-01-18 01:40:19 +00:00
Matthew Hodgson
6e3245a3b0
make linkify userid jump to memberinfo
2016-01-18 01:26:15 +00:00
Matthew Hodgson
8e1ab8e6b4
vaguely skin MemberInfo correctly
2016-01-18 01:18:02 +00:00
Matthew Hodgson
430c90f4a4
oops ,forgot PowerSelector
2016-01-18 00:42:20 +00:00
Matthew Hodgson
a768b7fe4b
bring back power badges
2016-01-18 00:16:31 +00:00
Matthew Hodgson
0553551d92
oops ,forgot PowerSelector
2016-01-17 23:58:38 +00:00
Matthew Hodgson
f3aeda7af9
merge develop
2016-01-17 23:31:21 +00:00
Matthew Hodgson
1467aacfa4
support saving tag changes (untested)
2016-01-17 12:27:21 +00:00
Matthew Hodgson
06e1674f23
UI for tag management
2016-01-17 05:13:16 +00:00
Matthew Hodgson
5b5bd9aef1
remove create_room for now. lots of stupid bugfixes across the board.
2016-01-17 03:59:31 +00:00
Matthew Hodgson
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
David Baker
7045906d5d
Show user settings screen on registration instead of the PostRegister stuff.
2016-01-15 18:58:18 +00:00
David Baker
a90f63f72c
null check
2016-01-15 18:49:12 +00:00
David Baker
52de322789
Change history scolling so it doesn't interfere with moving between lines, even when those lines are wrapped rather than hard line breaks.
2016-01-15 18:31:07 +00:00
Kegan Dougal
d6c7631dcc
Show User avatar URLs
2016-01-15 17:31:32 +00:00
Kegan Dougal
4d47d9875b
Merge branch 'kegan/base-avatar' into kegan/invite-search
2016-01-15 17:19:34 +00:00
Kegan Dougal
855bef17fa
Fold BaseAvatar state mainly into state.urls to avoid too many code paths.
2016-01-15 17:05:05 +00:00
David Baker
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
Matthew Hodgson
90184235bb
improve RoomSettings layout
2016-01-15 16:33:50 +00:00
Matthew Hodgson
f476150591
fix changeavatar to avoid duplicate click on label
2016-01-15 16:33:34 +00:00
David Baker
ecfdd3593c
Validate everything on form submit. Don't use pwd1 where we didn't define it & fix some error codes.
2016-01-15 16:17:27 +00:00
Kegan Dougal
d8d79722ac
Make RoomAvatar use BaseAvatar
2016-01-15 16:13:25 +00:00
David Baker
6bd09512de
Merge pull request #94 from matrix-org/share_history_invite_warning
...
Add warning on inviting a user if sharing history with new users.
2016-01-15 15:57:42 +00:00
Matthew Hodgson
293f5c7120
shrink auxpanel a bit for roomsettings
2016-01-15 15:53:53 +00:00
Matthew Hodgson
0caf5e0cdc
manage permissions on whether people can actually edit name, topic, avatar etc or not
2016-01-15 15:51:40 +00:00
Matthew Hodgson
57e62bf0ba
remove change avatar from here as it's now in the header
2016-01-15 15:50:38 +00:00
Matthew Hodgson
aefecfc645
tweak roomheader layout when editing
2016-01-15 15:23:41 +00:00
Matthew Hodgson
b8afccd445
fix droptarget behaviour
2016-01-15 15:23:02 +00:00
David Baker
2638ee974e
Add warning on inviting a user if sharing history with new users.
...
Fixes https://github.com/vector-im/vector-web/issues/60
2016-01-15 15:18:55 +00:00
David Baker
80c2361805
Merge pull request #92 from matrix-org/invalid_user_name
...
Catch new invalid user name error
2016-01-15 14:33:45 +00:00
Matthew Hodgson
4a2c2d9656
fix broken merge and revert some of 243b2e45 and document evil magic numbers
2016-01-15 14:22:17 +00:00
David Baker
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
David Baker
02e41450b4
Do (more) client side validation of registration parameters.
2016-01-15 13:31:41 +00:00
Matthew Hodgson
7cc5925ec4
increase initialSyncLimit enormously to avoid slow gappy /syncs for now
2016-01-15 13:28:41 +00:00
Matthew Hodgson
f2dc1e835b
placeholder for displayname
2016-01-15 13:11:37 +00:00
Matthew Hodgson
e1e46be220
apply gemini scrollbar
2016-01-15 13:11:14 +00:00
Matthew Hodgson
828b1f4837
fix up look and feel of UserSettings a bit more
2016-01-15 12:35:30 +00:00
Matthew Hodgson
84b46dae4e
make ChangeAvatar customisable size...
2016-01-15 12:35:18 +00:00
Matthew Hodgson
8e9e33fa2a
fix NPE and make enter work again
2016-01-15 12:34:53 +00:00
Kegan Dougal
cfb81a4aec
Factor out avatar stuff to BaseAvatar. Make MemberAvatar use it instead.
2016-01-15 12:02:28 +00:00
Kegan Dougal
aea833ec87
Display User objects in search results
2016-01-15 10:31:31 +00:00
David Baker
51ce76aeab
M_INVALID_USERNAME to be consistent with param name
2016-01-15 10:08:16 +00:00
Kegan Dougal
266aee2c6b
Factor out data model -> Entity logic to Entities.js
2016-01-15 09:58:48 +00:00
manuroe
f868f7813b
Room settings: Added notifications mute checkbox
2016-01-14 19:06:48 +01:00
Kegan Dougal
83a458938e
Unbreak things
2016-01-14 17:41:04 +00:00
Kegan Dougal
69d8e50eeb
Merge branch 'develop' into kegan/invite-search
2016-01-14 17:34:52 +00:00
Kegsay
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
Kegan Dougal
66bc30c0bc
Add /me to the list
2016-01-14 17:33:52 +00:00
David Baker
dcfcc51f4c
Catch new invalid user name error added in https://github.com/matrix-org/synapse/pull/499 and https://github.com/matrix-org/matrix-doc/pull/263
2016-01-14 17:28:53 +00:00
Kegan Dougal
d5deb283bf
Add a SearchableEntityList and use it for invite box
...
It all even works, though only for RoomMembers currently.
2016-01-14 17:27:06 +00:00
Matthew Hodgson
e4671205d8
right imagery
2016-01-14 17:24:57 +00:00
Matthew Hodgson
2899082cba
deselect editabletext when tabbing away
2016-01-14 17:24:52 +00:00
Matthew Hodgson
d767e72469
hide hoverover for 3pids
2016-01-14 17:02:56 +00:00
Matthew Hodgson
06ecf78e5f
Merge branch 'develop' into matthew/roomsettings2
2016-01-14 16:50:12 +00:00
David Baker
d33d606912
Only show uploads that are going to the current room
...
Fixes #506
2016-01-14 16:31:42 +00:00
Matthew Hodgson
4430e16707
apply CSS to slashcommand autocompletes
2016-01-14 16:29:49 +00:00
Matthew Hodgson
42dc1be341
fix descriptions a bit and sort the slash commands when tab-completing
2016-01-14 16:29:49 +00:00
Kegan Dougal
84a7fc1640
Tweak how command aliases are set
...
This prevents multiple commands of the same name being returned in getCommandList()
2016-01-14 16:29:01 +00:00
David Baker
81329a42fd
Merge pull request #90 from matrix-org/user_activity_end
...
Send an event at the end of user activity too and use this to send RRs.
2016-01-14 16:27:54 +00:00
David Baker
740c22238e
Better date syntax
2016-01-14 16:15:07 +00:00
David Baker
4f21e2beb3
Suffix with units
2016-01-14 16:13:50 +00:00
Matthew Hodgson
ffaea371ac
Merge branch 'kegan/slash-command-tab-complete' into matthew/roomsettings2
2016-01-14 16:02:29 +00:00
David Baker
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
Kegan Dougal
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
Kegan Dougal
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
Kegan Dougal
f4be4880b8
Merge branch 'develop' into kegan/slash-command-tab-complete
2016-01-14 11:12:06 +00:00
Kegsay
1e4739e2ff
Merge pull request #88 from matrix-org/kegan/3pid-invite-memberlist
...
Show 3PID invites in the invite part of the membership list
2016-01-14 10:44:23 +00:00
Matthew Hodgson
123b134d87
use getDomain()
2016-01-13 18:15:59 +00:00
Matthew Hodgson
dc62f639f2
Merge branch 'kegan/slash-command-tab-complete' into matthew/roomsettings2
2016-01-13 18:11:11 +00:00
Matthew Hodgson
7a1e6bbe7e
fix merge conflicts
2016-01-13 18:00:04 +00:00
Matthew Hodgson
05c7891874
fix NPE
2016-01-13 17:54:33 +00:00
Kegan Dougal
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
Kegan Dougal
8c9352c484
Make MemberAvatar and MemberTile work without RoomMember objects
2016-01-13 16:55:28 +00:00
Kegan Dougal
c0e5d1d13b
Factor out presence text. Do prep work for displaying 3pid invites on memberlist.
...
Factored out presence to PresenceLabel.
2016-01-13 15:55:28 +00:00
manuroe
7985413893
Created TextInputDialog
...
In css, created a generic mx_Dialog_title class for all dialogs
2016-01-13 16:32:41 +01:00
David Baker
11025e2ba9
Make read marker ghost same width as normal one.
2016-01-13 15:18:21 +00:00
Matthew Hodgson
1b7d80a8cd
s/getImplicitRoomName/getDefaultRoomName/ # as kegan doesn't like the word 'implicit'
2016-01-13 14:04:00 +00:00
Matthew Hodgson
5f763f8ebb
merge develop
2016-01-13 14:03:54 +00:00
Kegan Dougal
69cac307d9
Merge branch 'develop' into kegan/guest-peek-then-join
2016-01-13 13:22:58 +00:00
Matthew Hodgson
c9c496f0e5
WIP all new roomsettings
2016-01-13 13:15:13 +00:00
Matthew Hodgson
f715662d18
merge in develop, fixing conflicts
2016-01-13 13:06:27 +00:00
Matthew Hodgson
3934b42ac8
s/m.room.color_scheme/org.matrix.room.color_scheme/g # to make kegan happier
2016-01-13 13:01:00 +00:00
David Baker
67ff769962
Include invites in the badge count
2016-01-13 13:00:03 +00:00
Kegsay
d10c96ede8
Merge pull request #87 from matrix-org/kegan/password-reset
...
Implement password reset
2016-01-13 10:35:54 +00:00
David Baker
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
David Baker
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
Kegan Dougal
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
David Baker
4a8b5dfe3a
Don't display read markers (or ghosts) above our own messages.
2016-01-12 17:18:16 +00:00
David Baker
8b730c0a5d
PR feedback
2016-01-12 16:38:09 +00:00
David Baker
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
Kegan Dougal
eb955eb371
Add a RoomPreviewBar which asks if you'd like to join a peeked room
2016-01-12 14:11:15 +00:00
Richard van der Hoff
cd52549713
s/function/func/ in PropTypes declarations
2016-01-12 13:11:53 +00:00
Matthew Hodgson
bd226609d0
fix onclick for all of room name
2016-01-11 18:44:36 +00:00
manuroe
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
Richard van der Hoff
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
Richard van der Hoff
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
Kegsay
3cd805e71d
Merge pull request #82 from matrix-org/kegan/guest-access
...
Implement guest access and upgrading
2016-01-11 15:19:39 +00:00
Kegan Dougal
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
Matthew Hodgson
ddd8838b24
linkify topics
2016-01-11 12:46:12 +00:00
Richard van der Hoff
c30aeac315
Set our own booleans instead of using isMounted
2016-01-11 11:38:04 +00:00
Matthew Hodgson
6351258b0e
use room.getImplicitRoomName() from matthew/roomsettings2 branch of matrix-js-sdk for the placeholder roomname
2016-01-10 20:01:30 +00:00
Matthew Hodgson
0cb6094992
show implicit names as placeholders if available
2016-01-10 18:46:08 +00:00
Matthew Hodgson
d39a9a0f18
bring back select-all-on-click
2016-01-10 13:14:12 +00:00
Matthew Hodgson
aa80a5d494
fix layout bug for general auxPanel
2016-01-10 13:03:37 +00:00
Matthew Hodgson
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
Matthew Hodgson
4f14ead741
idiot - fix bind warnings
2016-01-10 04:22:09 +00:00
Matthew Hodgson
2d5cba89e8
tint Dave's read-up-to marker
2016-01-09 21:27:00 +00:00
Matthew Hodgson
27d72fb1dc
tint Dave's read-up-to marker
2016-01-09 01:05:43 +00:00
David Baker
1507b39940
Redundant line.
2016-01-09 00:07:51 +00:00
David Baker
581111e1a7
Use wheel, not scroll as we get scroll events from auto scroll down. Also only do the cursor move check for mouse move events.
2016-01-09 00:06:54 +00:00
David Baker
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
David Baker
1c4d1d2507
Make scrolling count as user activity.
2016-01-08 22:19:31 +00:00
David Baker
7913b0b465
Length of the returned array, not the index of the timeline event.
2016-01-08 21:51:14 +00:00
David Baker
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
David Baker
b37ea52a1f
Some null checks in animation code
2016-01-08 16:47:13 +00:00
Richard van der Hoff
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
Richard van der Hoff
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
Matthew Hodgson
ef00a1624d
fix up RoomSettings somewhat and implement room colors
2016-01-08 03:22:38 +00:00
Kegan Dougal
a3df50f4c3
Implement guest account upgrading
2016-01-07 17:23:32 +00:00
Kegan Dougal
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
Kegan Dougal
c64f36c81b
Merge branch 'develop' into kegan/guest-access
2016-01-07 13:21:06 +00:00
David Baker
ba51c68844
Merge remote-tracking branch 'origin/notif_sync' into unread_sync
2016-01-07 11:44:50 +00:00
Matthew Hodgson
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
David Baker
ef473dec72
Add read-up-to green* line
...
* not actually green without CSS in vector-web
2016-01-07 11:18:41 +00:00
David Baker
99abd58f1a
Merge remote-tracking branch 'origin/develop' into notif_sync
2016-01-07 10:41:16 +00:00
David Baker
287da54fbc
Address PR comments
2016-01-07 10:38:44 +00:00
Matthew Hodgson
fd32362aa6
oops, initialise fixups per-object, not per-prototype
2016-01-07 10:18:18 +00:00
Matthew Hodgson
0772f50fab
update copyright for 2016
2016-01-07 04:06:52 +00:00
Matthew Hodgson
296b626ed9
oops, we actually need to cache the fixups in TintableSvg
2016-01-07 03:59:09 +00:00
Matthew Hodgson
0f52c0a514
make TintableSvgs responsible for updating their own tints, and stop storing SVG DOM fragments in Tinter to avoid leaking them
2016-01-07 03:39:00 +00:00
David Baker
76177378f3
Comment & change the default to assuming there are unread messages.
2016-01-06 18:28:13 +00:00
David Baker
04c7792b51
Use our read receipt to calculate whether rooms are unread.
2016-01-06 18:07:24 +00:00
Richard van der Hoff
4e4f8fad23
Merge pull request #79 from matrix-org/rav/dispatcher_leak
...
VideoView: Fix a dispatcher leak
2016-01-06 17:52:13 +00:00
Kegan Dougal
29587ec347
No longer persist guest room IDs. Replace with transient peeked room ID.
2016-01-06 17:33:00 +00:00
Richard van der Hoff
4624e7a485
Address review comments
...
s/onClick/onSelect/
2016-01-06 16:46:29 +00:00
Richard van der Hoff
0d0a379cd8
VideoView: Fix a dispatcher leak
...
Make sure we unregister from the dispatcher when the videoview goes
away.
2016-01-06 15:17:58 +00:00
Kegan Dougal
afbb451d4a
Merge branch 'develop' into kegan/guest-access
2016-01-06 13:59:33 +00:00
Matthew Hodgson
8c1bb90347
add fixme
2016-01-06 02:41:10 +00:00
Matthew Hodgson
f499c60b12
sundry PR feedback
2016-01-06 02:29:08 +00:00
Matthew Hodgson
44a0fa19ae
comment /tint
2016-01-06 02:12:53 +00:00
Matthew Hodgson
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
Matthew Hodgson
9e8daba8d7
Merge branch 'develop' into matthew/dynamic-svg
2016-01-06 01:11:34 +00:00
Richard van der Hoff
75302b1f97
Factor out a separate SearchResultTile
2016-01-05 17:56:59 +00:00
Kegan Dougal
d729dee31d
Make the settings page load for guests. Add checkboxes for guest r/w
2016-01-05 17:34:25 +00:00
Richard van der Hoff
a2b7c9ba96
RoomHeader: Make 'undefined' check more explicit
2016-01-05 15:57:58 +00:00
Richard van der Hoff
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
Richard van der Hoff
583d35e39f
Merge branch 'develop' into rav/new_search_api
...
Conflicts:
src/components/structures/RoomView.js
2016-01-05 15:38:30 +00:00
Richard van der Hoff
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
Matthew Hodgson
a9f7bf63ff
spell out we're doing 3PID invites
2016-01-05 14:24:36 +00:00
Richard van der Hoff
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
Kegan Dougal
8bd4fdbd5a
Don't set presence
2016-01-05 13:24:05 +00:00
Kegan Dougal
ae7b2d54bb
Merge branch 'develop' into kegan/guest-access
2016-01-05 11:39:36 +00:00
Kegsay
a6e735dbde
Merge pull request #76 from matrix-org/kegan/bugfix-read-receipt
...
Null guard getMember
Fixes https://github.com/vector-im/vector-web/issues/566
2016-01-05 11:26:04 +00:00
