f2dc1e835b
placeholder for displayname
2016-01-15 13:11:37 +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
84b46dae4e
make ChangeAvatar customisable size...
2016-01-15 12:35:18 +00:00
8e9e33fa2a
fix NPE and make enter work again
2016-01-15 12:34:53 +00:00
cfb81a4aec
Factor out avatar stuff to BaseAvatar. Make MemberAvatar use it instead.
2016-01-15 12:02:28 +00:00
aea833ec87
Display User objects in search results
2016-01-15 10:31:31 +00:00
51ce76aeab
M_INVALID_USERNAME to be consistent with param name
2016-01-15 10:08:16 +00:00
266aee2c6b
Factor out data model -> Entity logic to Entities.js
2016-01-15 09:58:48 +00:00
f868f7813b
Room settings: Added notifications mute checkbox
2016-01-14 19:06:48 +01:00
83a458938e
Unbreak things
2016-01-14 17:41:04 +00:00
69d8e50eeb
Merge branch 'develop' into kegan/invite-search
2016-01-14 17:34:52 +00: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
66bc30c0bc
Add /me to the list
2016-01-14 17:33:52 +00:00
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
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
e4671205d8
right imagery
2016-01-14 17:24:57 +00:00
2899082cba
deselect editabletext when tabbing away
2016-01-14 17:24:52 +00:00
d767e72469
hide hoverover for 3pids
2016-01-14 17:02:56 +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
4430e16707
apply CSS to slashcommand autocompletes
2016-01-14 16:29:49 +00:00
42dc1be341
fix descriptions a bit and sort the slash commands when tab-completing
2016-01-14 16:29:49 +00:00
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
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
740c22238e
Better date syntax
2016-01-14 16:15:07 +00:00
4f21e2beb3
Suffix with units
2016-01-14 16:13:50 +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
f4be4880b8
Merge branch 'develop' into kegan/slash-command-tab-complete
2016-01-14 11:12:06 +00:00
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
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
05c7891874
fix NPE
2016-01-13 17:54:33 +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
8c9352c484
Make MemberAvatar and MemberTile work without RoomMember objects
2016-01-13 16:55:28 +00:00
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
7985413893
Created TextInputDialog
...
In css, created a generic mx_Dialog_title class for all dialogs
2016-01-13 16:32:41 +01:00
11025e2ba9
Make read marker ghost same width as normal one.
2016-01-13 15:18:21 +00:00
1b7d80a8cd
s/getImplicitRoomName/getDefaultRoomName/ # as kegan doesn't like the word 'implicit'
2016-01-13 14:04:00 +00:00
5f763f8ebb
merge develop
2016-01-13 14:03:54 +00:00
c54004286b
Merge pull request #86 from matrix-org/kegan/guest-peek-then-join
...
Add a RoomPreviewBar which asks if you'd like to join a peeked room
2016-01-13 13:23:30 +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
133a240fe9
Merge pull request #83 from matrix-org/matthew/roomsettings
...
fix up RoomSettings somewhat and implement room colors
2016-01-13 13:06:37 +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
Matthew Hodgson