enki/blap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Commit Graph

  • 8c9352c484 Make MemberAvatar and MemberTile work without RoomMember objects Kegan Dougal 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. manuroe 2016-01-13 17:10:26 +01:00
  • 1d5e661bd0 Split out css for new PresenceLabel Kegan Dougal 2016-01-13 15:56:44 +00:00
  • c0e5d1d13b Factor out presence text. Do prep work for displaying 3pid invites on memberlist. Kegan Dougal 2016-01-13 15:55:28 +00:00
  • ac87830e4e PushRules settings: Applied new wordings: On, Loud, Off manuroe 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 manuroe 2016-01-13 16:36:57 +01:00
  • 7985413893 Created TextInputDialog In css, created a generic mx_Dialog_title class for all dialogs manuroe 2016-01-13 16:32:41 +01:00
  • 11025e2ba9 Make read marker ghost same width as normal one. David Baker 2016-01-13 15:18:21 +00:00
  • c4cb37606b PushRules settings: Added sanity checks on new keywords manuroe 2016-01-13 15:47:00 +01:00
  • 1b7d80a8cd s/getImplicitRoomName/getDefaultRoomName/ # as kegan doesn't like the word 'implicit' Matthew Hodgson 2016-01-13 14:04:00 +00:00
  • 5f763f8ebb merge develop Matthew Hodgson 2016-01-13 14:03:54 +00:00
  • c54004286b Merge pull request #86 from matrix-org/kegan/guest-peek-then-join Kegsay 2016-01-13 13:23:30 +00:00
  • 69cac307d9 Merge branch 'develop' into kegan/guest-peek-then-join Kegan Dougal 2016-01-13 13:22:58 +00:00
  • c9c496f0e5 WIP all new roomsettings Matthew Hodgson 2016-01-13 13:15:13 +00:00
  • 133a240fe9 Merge pull request #83 from matrix-org/matthew/roomsettings Matthew Hodgson 2016-01-13 13:06:37 +00:00
  • f715662d18 merge in develop, fixing conflicts Matthew Hodgson 2016-01-13 13:06:27 +00:00
  • 3934b42ac8 s/m.room.color_scheme/org.matrix.room.color_scheme/g # to make kegan happier Matthew Hodgson 2016-01-13 13:01:00 +00:00
  • 67ff769962 Include invites in the badge count David Baker 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 manuroe 2016-01-13 12:00:04 +01:00
  • 1c03c208e1 PushRules settings: update keywords list hs side manuroe 2016-01-13 11:46:13 +01:00
  • 7232659195 Merge pull request #612 from vector-im/kegan/guest-peek-then-join Kegsay 2016-01-13 10:37:13 +00:00
  • d10c96ede8 Merge pull request #87 from matrix-org/kegan/password-reset Kegsay 2016-01-13 10:35:54 +00:00
  • 10d3076d6b PushRules settings: Display keywords modal dialog manuroe 2016-01-13 09:11:56 +01:00
  • cae3ab410f Merge pull request #603 from vector-im/read_marker_animate David Baker 2016-01-12 17:58:36 +00:00
  • 2eb724f1f0 Merge pull request #85 from matrix-org/read_marker_animate David Baker 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. David Baker 2016-01-12 17:48:34 +00:00
  • ec4e0d7687 Implement password reset Kegan Dougal 2016-01-12 17:20:16 +00:00
  • 4a8b5dfe3a Don't display read markers (or ghosts) above our own messages. David Baker 2016-01-12 17:18:16 +00:00
  • 2bada93fdc CSS for forgot password link Kegan Dougal 2016-01-12 16:39:29 +00:00
  • 8b730c0a5d PR feedback David Baker 2016-01-12 16:38:09 +00:00
  • 9fb8c9f67a PushRules settings: Use a workaround for SYN-590 (Push rule update fails) manuroe 2016-01-12 17:26:41 +01:00
  • b9080c770d PushRules settings: Fixed triage of matrix content rules into the unique Vector rule manuroe 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. David Baker 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) David Baker 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 manuroe 2016-01-12 15:12:58 +01:00
  • eb955eb371 Add a RoomPreviewBar which asks if you'd like to join a peeked room Kegan Dougal 2016-01-12 14:11:15 +00:00
  • f706f75a6e Add css for room preview bar. Kegan Dougal 2016-01-12 14:11:00 +00:00
  • cd52549713 s/function/func/ in PropTypes declarations Richard van der Hoff 2016-01-12 13:11:53 +00:00
  • fc3f356dc0 GA Matthew Hodgson 2016-01-12 01:23:39 +00:00
  • bd226609d0 fix onclick for all of room name Matthew Hodgson 2016-01-11 18:44:36 +00:00
  • 6d510db2db PPushRules settings: Fixed React warnings manuroe 2016-01-11 17:32:37 +01:00
  • ee13dd7b6c PushRules settings: Added a dedicated component to display them manuroe 2016-01-11 17:24:04 +01:00
  • 953e138317 Settings page: Made the push notifications settings a separate component. This component is currently implemented at the app level manuroe 2016-01-11 17:05:27 +01:00
  • 5a0adb9cdc Merge pull request #80 from matrix-org/rav/bad_scroll_on_video_resize Richard van der Hoff 2016-01-11 15:29:03 +00:00
  • 243b2e4587 Make the scrollpanel update itself correctly on video resize. Richard van der Hoff 2016-01-11 15:28:59 +00:00
  • e7740cbc8b Merge pull request #84 from matrix-org/rav/fix_refs_npes Richard van der Hoff 2016-01-11 15:25:17 +00:00
  • f898986c73 Merge pull request #594 from vector-im/kegan/guest-access Kegsay 2016-01-11 15:21:57 +00:00
  • 3cd805e71d Merge pull request #82 from matrix-org/kegan/guest-access Kegsay 2016-01-11 15:19:39 +00:00
  • fcdfce3760 Toggle auto-reg off when successfully registered as a guest. Kegan Dougal 2016-01-11 15:12:55 +00:00
  • ddd8838b24 linkify topics Matthew Hodgson 2016-01-11 12:46:12 +00:00
  • c30aeac315 Set our own booleans instead of using isMounted Richard van der Hoff 2016-01-11 11:38:04 +00:00
  • 6cd0aeb607 Revert 4px offset: it ends up in the middle of the line above David Baker 2016-01-11 10:56:08 +00:00
  • 1e57aa8c78 Make read up to line 2px and position relative so we can shift it up a little David Baker 2016-01-11 10:52:29 +00:00
  • 6351258b0e use room.getImplicitRoomName() from matthew/roomsettings2 branch of matrix-js-sdk for the placeholder roomname Matthew Hodgson 2016-01-10 20:01:30 +00:00
  • 0cb6094992 show implicit names as placeholders if available Matthew Hodgson 2016-01-10 18:46:08 +00:00
  • d39a9a0f18 bring back select-all-on-click Matthew Hodgson 2016-01-10 13:14:12 +00:00
  • 93c4fc8785 switch EditableText to contentEditable; fix auxPanel layout bug in the general case (not just for video) Matthew Hodgson 2016-01-10 13:04:15 +00:00
  • aa80a5d494 fix layout bug for general auxPanel Matthew Hodgson 2016-01-10 13:03:37 +00:00
  • 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 Matthew Hodgson 2016-01-10 12:56:45 +00:00
  • 4f14ead741 idiot - fix bind warnings Matthew Hodgson 2016-01-10 04:22:09 +00:00
  • 2d5cba89e8 tint Dave's read-up-to marker Matthew Hodgson 2016-01-09 01:05:43 +00:00
  • 8a156dcac8 Merge pull request #605 from vector-im/matthew/roomsettings Matthew Hodgson 2016-01-09 21:25:50 +00:00
  • 27d72fb1dc tint Dave's read-up-to marker Matthew Hodgson 2016-01-09 01:05:43 +00:00
  • d49f8721ce fix leave.svg so that it can be tinted Matthew Hodgson 2016-01-09 00:56:10 +00:00
  • c02d9890c5 New CSS for read markers David Baker 2016-01-09 00:09:11 +00:00
  • 1507b39940 Redundant line. David Baker 2016-01-09 00:07:51 +00:00
  • 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. David Baker 2016-01-09 00:06:54 +00:00
  • 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. David Baker 2016-01-08 22:19:51 +00:00
  • 1c4d1d2507 Make scrolling count as user activity. David Baker 2016-01-08 22:19:31 +00:00
  • 7913b0b465 Length of the returned array, not the index of the timeline event. David Baker 2016-01-08 21:51:14 +00:00
  • 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. David Baker 2016-01-08 21:18:47 +00:00
  • b37ea52a1f Some null checks in animation code David Baker 2016-01-08 16:43:25 +00:00
  • 223f6f7914 Fix sorting of search result highlights Richard van der Hoff 2016-01-08 13:25:03 +00:00
  • 62cf34b58c Fix some races due to promises completing after we've switched rooms Richard van der Hoff 2016-01-08 12:03:45 +00:00
  • dfcc923c91 Merge pull request #599 from vector-im/matthew/roomsettings Matthew Hodgson 2016-01-08 11:26:34 +00:00
  • ccd518cc4c CSS and imagery for fixed up RoomSettings Matthew Hodgson 2016-01-08 03:26:07 +00:00
  • ef00a1624d fix up RoomSettings somewhat and implement room colors Matthew Hodgson 2016-01-08 03:22:38 +00:00
  • a3df50f4c3 Implement guest account upgrading Kegan Dougal 2016-01-07 17:23:32 +00:00
  • 458d71a496 Attempt to peek into rooms we don't know about. Kegan Dougal 2016-01-07 16:22:17 +00:00
  • a369c862a0 Hit MatrixClient.peekInRoom on rooms we can only peek into. Kegan Dougal 2016-01-07 14:57:26 +00:00
  • 1a8a4728cd Enable guest access. Show r/w icons on room directory. Kegan Dougal 2016-01-07 14:43:12 +00:00
  • c64f36c81b Merge branch 'develop' into kegan/guest-access Kegan Dougal 2016-01-07 13:21:06 +00:00
  • ba51c68844 Merge remote-tracking branch 'origin/notif_sync' into unread_sync David Baker 2016-01-07 11:44:50 +00:00
  • 8170288acb Merge pull request #77 from matrix-org/matthew/dynamic-svg Matthew Hodgson 2016-01-07 11:42:30 +00:00
  • d2635373f0 Merge pull request #585 from vector-im/matthew/dynamic-svg Matthew Hodgson 2016-01-07 11:41:46 +00:00
  • 5b4457d33c Merge pull request #591 from vector-im/green_line David Baker 2016-01-07 11:40:11 +00:00
  • dc2e395878 Merge pull request #81 from matrix-org/green_line David Baker 2016-01-07 11:40:02 +00:00
  • 36e5ac3d7f Add CSS for the green read-up-to marker. David Baker 2016-01-07 11:22:41 +00:00
  • ef473dec72 Add read-up-to green* line David Baker 2016-01-07 11:18:41 +00:00
  • 99abd58f1a Merge remote-tracking branch 'origin/develop' into notif_sync David Baker 2016-01-07 10:41:16 +00:00
  • 287da54fbc Address PR comments David Baker 2016-01-07 10:38:44 +00:00
  • fd32362aa6 oops, initialise fixups per-object, not per-prototype Matthew Hodgson 2016-01-07 10:18:18 +00:00
  • df111223fc copyrights for 2016 Matthew Hodgson 2016-01-07 04:17:56 +00:00
  • 0772f50fab update copyright for 2016 Matthew Hodgson 2016-01-07 04:06:39 +00:00
  • 296b626ed9 oops, we actually need to cache the fixups in TintableSvg Matthew Hodgson 2016-01-07 03:59:09 +00:00
  • 0f52c0a514 make TintableSvgs responsible for updating their own tints, and stop storing SVG DOM fragments in Tinter to avoid leaking them Matthew Hodgson 2016-01-07 03:39:00 +00:00
  • c0f1ae0133 Use Unread to compute unread status of a room (which uses read receipts). David Baker 2016-01-06 18:29:27 +00:00
  • 76177378f3 Comment & change the default to assuming there are unread messages. David Baker 2016-01-06 18:28:13 +00:00
  • 04c7792b51 Use our read receipt to calculate whether rooms are unread. David Baker 2016-01-06 18:07:24 +00:00
  • 4e4f8fad23 Merge pull request #79 from matrix-org/rav/dispatcher_leak Richard van der Hoff 2016-01-06 17:52:13 +00:00