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
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
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
Matthew Hodgson
4a2c2d9656
fix broken merge and revert some of 243b2e45 and document evil magic numbers
2016-01-15 14:22:17 +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
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
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
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
Kegsay
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
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
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
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
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
