7a1e6bbe7e
fix merge conflicts
2016-01-13 18:00:04 +00:00
513c7e3b73
Uncommit unintentional config change
2016-01-13 17:59:13 +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
56718650b9
fix comedy double-margin caused by killing off MessageTiles
2016-01-13 17:39:57 +00:00
e3eef45684
fix comedy double-margin caused by killing off MessageTiles
2016-01-13 17:39:49 +00:00
68f846e129
Merge branch 'develop' into matthew/roomsettings2
2016-01-13 17:33:32 +00:00
ad434cb82e
GA bugfix
2016-01-13 17:33:06 +00:00
f2171c11f0
uncommitted WIP roomsetting CSS
2016-01-13 17:33:03 +00:00
629883731e
PushRules settings: BF when adding a new keyword with the keywords rule in Off
2016-01-13 17:56:59 +01:00
8c9352c484
Make MemberAvatar and MemberTile work without RoomMember objects
2016-01-13 16:55:28 +00:00
0475bcd9de
PushRules settings: BF when changing state of the keywords rule with such a sequence: on -> off -> loud.
2016-01-13 17:10:26 +01:00
1d5e661bd0
Split out css for new PresenceLabel
2016-01-13 15:56:44 +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
ac87830e4e
PushRules settings: Applied new wordings: On, Loud, Off
2016-01-13 16:48:22 +01:00
7fc5ab3c6e
PushRules settings: Use the new TextInputDialog to display keywords list. We earn the focus at the end of the keywords list and the management of enter and esc keys
2016-01-13 16:36:57 +01: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
c4cb37606b
PushRules settings: Added sanity checks on new keywords
2016-01-13 15:47:00 +01: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
67ff769962
Include invites in the badge count
2016-01-13 13:00:03 +00:00
e5b7a47fee
PushRules settings: if a newly typed keyword was part of a push rule not managed by the Vector UI, delete the rule and create it compliant with Vector parameters
2016-01-13 12:00:04 +01:00
1c03c208e1
PushRules settings: update keywords list hs side
2016-01-13 11:46:13 +01:00
7232659195
Merge pull request #612 from vector-im/kegan/guest-peek-then-join
...
Add css for room preview bar.
2016-01-13 10:37:13 +00:00
d10c96ede8
Merge pull request #87 from matrix-org/kegan/password-reset
...
Implement password reset
2016-01-13 10:35:54 +00:00
10d3076d6b
PushRules settings: Display keywords modal dialog
2016-01-13 09:11:56 +01:00
cae3ab410f
Merge pull request #603 from vector-im/read_marker_animate
...
New CSS for read markers
2016-01-12 17:58:36 +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
2bada93fdc
CSS for forgot password link
2016-01-12 16:39:29 +00:00
8b730c0a5d
PR feedback
2016-01-12 16:38:09 +00:00
9fb8c9f67a
PushRules settings: Use a workaround for SYN-590 (Push rule update fails)
2016-01-12 17:33:57 +01:00
b9080c770d
PushRules settings: Fixed triage of matrix content rules into the unique Vector rule
2016-01-12 16:46:27 +01:00
977b223929
Hopefully working CSS that doesn't cause the messages to jump about when a read marker disappears.
2016-01-12 14:20:05 +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
7f95362dd2
PushRules settings: Translate matrix per-word rules into the global Vector rule for a list of keywords
2016-01-12 15:12:58 +01:00
eb955eb371
Add a RoomPreviewBar which asks if you'd like to join a peeked room
2016-01-12 14:11:15 +00:00
f706f75a6e
Add css for room preview bar.
2016-01-12 14:11:00 +00:00
cd52549713
s/function/func/ in PropTypes declarations
2016-01-12 13:11:53 +00:00
fc3f356dc0
GA
2016-01-12 01:23:39 +00:00
bd226609d0
fix onclick for all of room name
2016-01-11 18:44:36 +00:00
Matthew Hodgson