Matthew Hodgson
14c2d945d6
oops, use right class
2016-01-20 15:58:17 +00:00
Matthew Hodgson
dbcbd2aad8
fix badge layout
2016-01-20 15:52:34 +00:00
Matthew Hodgson
4d2608017b
fix CSS for ChangeAvatar placeholder
2016-01-20 15:39:56 +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
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
3e4c5d7fa3
Merge branch 'kegan/invite-search' into matthew/roompreview
2016-01-19 16:08:14 +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
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
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
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
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
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
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
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
02e41450b4
Do (more) client side validation of registration parameters.
2016-01-15 13:31:41 +00:00
Matthew Hodgson
f2dc1e835b
placeholder for displayname
2016-01-15 13:11:37 +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
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
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
4430e16707
apply CSS to slashcommand autocompletes
2016-01-14 16:29:49 +00:00
Matthew Hodgson
ffaea371ac
Merge branch 'kegan/slash-command-tab-complete' into matthew/roomsettings2
2016-01-14 16:02:29 +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
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
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
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
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
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
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
Matthew Hodgson
ddd8838b24
linkify topics
2016-01-11 12:46:12 +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
