Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • 2899082cba deselect editabletext when tabbing away Matthew Hodgson 2016-01-14 17:24:52 +00:00
  • d767e72469 hide hoverover for 3pids Matthew Hodgson 2016-01-14 17:02:56 +00:00
  • 06ecf78e5f Merge branch 'develop' into matthew/roomsettings2 Matthew Hodgson 2016-01-14 16:50:12 +00:00
  • f2fa9fe398 Merge branch 'develop' into matthew/roomsettings2 Matthew Hodgson 2016-01-14 16:49:48 +00:00
  • a65a15e9bb Shift read marker down by 5px David Baker 2016-01-14 16:45:13 +00:00
  • d33d606912 Only show uploads that are going to the current room David Baker 2016-01-14 16:31:42 +00:00
  • 4430e16707 apply CSS to slashcommand autocompletes Matthew Hodgson 2016-01-14 16:29:41 +00:00
  • 42dc1be341 fix descriptions a bit and sort the slash commands when tab-completing Matthew Hodgson 2016-01-14 16:29:30 +00:00
  • 9ada5f7ddd CSS for tab complete slashcommands Matthew Hodgson 2016-01-14 16:29:03 +00:00
  • 84a7fc1640 Tweak how command aliases are set Kegan Dougal 2016-01-14 16:29:01 +00:00
  • 81329a42fd Merge pull request #90 from matrix-org/user_activity_end David Baker 2016-01-14 16:27:54 +00:00
  • 740c22238e Better date syntax David Baker 2016-01-14 16:15:07 +00:00
  • 4f21e2beb3 Suffix with units David Baker 2016-01-14 16:13:50 +00:00
  • ffaea371ac Merge branch 'kegan/slash-command-tab-complete' into matthew/roomsettings2 Matthew Hodgson 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. David Baker 2016-01-14 16:01:31 +00:00
  • b67131f0c8 Add a Command class; add Entry.getFillText() Kegan Dougal 2016-01-14 14:39:58 +00:00
  • 17e540d372 fix line wrapping of code blocks in multiline msgs Matthew Hodgson 2016-01-14 11:57:07 +00:00
  • 864d10f412 Make individual Entrys responsible for determining suffixes Kegan Dougal 2016-01-14 11:39:24 +00:00
  • f4be4880b8 Merge branch 'develop' into kegan/slash-command-tab-complete Kegan Dougal 2016-01-14 11:12:06 +00:00
  • db2d7fdbff Merge pull request #622 from vector-im/kegan/3pid-invite-memberlist Kegsay 2016-01-14 10:45:50 +00:00
  • 927ac5fe64 2016 only Kegan Dougal 2016-01-14 10:45:38 +00:00
  • 1e4739e2ff Merge pull request #88 from matrix-org/kegan/3pid-invite-memberlist Kegsay 2016-01-14 10:44:23 +00:00
  • 378f4bb85c PushRules settings: Display keywords in alphabetical order manuroe 2016-01-14 11:15:59 +01:00
  • 0577edb055 PushRules settings: Added master push rule manuroe 2016-01-14 11:03:51 +01:00
  • 123b134d87 use getDomain() Matthew Hodgson 2016-01-13 18:15:59 +00:00
  • dc62f639f2 Merge branch 'kegan/slash-command-tab-complete' into matthew/roomsettings2 Matthew Hodgson 2016-01-13 18:11:11 +00:00
  • 7a1e6bbe7e fix merge conflicts Matthew Hodgson 2016-01-13 18:00:04 +00:00
  • 513c7e3b73 Uncommit unintentional config change David Baker 2016-01-13 17:59:13 +00:00
  • 05c7891874 fix NPE Matthew Hodgson 2016-01-13 17:54:33 +00:00
  • 53f31e49da Implement tab-complete for slash commands Kegan Dougal 2016-01-13 17:46:36 +00:00
  • 56718650b9 fix comedy double-margin caused by killing off MessageTiles Matthew Hodgson 2016-01-13 17:39:49 +00:00
  • e3eef45684 fix comedy double-margin caused by killing off MessageTiles Matthew Hodgson 2016-01-13 17:39:49 +00:00
  • 68f846e129 Merge branch 'develop' into matthew/roomsettings2 Matthew Hodgson 2016-01-13 17:33:32 +00:00
  • ad434cb82e GA bugfix Matthew Hodgson 2016-01-13 17:33:06 +00:00
  • f2171c11f0 uncommitted WIP roomsetting CSS Matthew Hodgson 2016-01-13 17:33:03 +00:00
  • 629883731e PushRules settings: BF when adding a new keyword with the keywords rule in Off manuroe 2016-01-13 17:56:59 +01:00
  • 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