Jika/element-web
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Commit Graph

  • 021056cfd1 Move copyright header David Baker 2015-11-30 18:00:54 +00:00
  • 4f8895f160 Copyright header on component index David Baker 2015-11-30 18:00:19 +00:00
  • 6a4038daeb Add 'replaces' tag to mark that the RoomDNDView is a RoomTile David Baker 2015-11-30 17:56:55 +00:00
  • cadfbcbed3 Merge branch 'develop' into skindex-nextgen David Baker 2015-11-30 17:56:40 +00:00
  • ae8c5bdcb0 better comment & regenerated index David Baker 2015-11-30 17:56:01 +00:00
  • ef0cf1f28e Merge branch 'develop' into skindex-nextgen David Baker 2015-11-30 17:34:40 +00:00
  • 730b33535a More WIP component indexing David Baker 2015-11-30 17:33:04 +00:00
  • 6f646260aa WIP of component indexing update David Baker 2015-11-30 17:31:32 +00:00
  • 4a144ac03d WIP of new component indexing David Baker 2015-11-30 17:30:32 +00:00
  • badfdb5e3e actually, seems FF is happy with this again now Matthew Hodgson 2015-11-30 17:24:38 +00:00
  • 2345624d31 switch to Open Sans, juggling font-size appropriately (as Open Sans is physically larger for the same point size as Myriad Pro, irritatingly), and fix some really weird baseline CSS bugs in read receipts that were introduced. Hopefully this doesn't re-introduce the intermittent baseline offset bug for the initials on Chrome & FF Matthew Hodgson 2015-11-30 17:17:09 +00:00
  • ddc4f30bb6 Remove RoomView and port it to react-sdk. Move Resend.js to react-sdk Kegan Dougal 2015-11-30 17:16:31 +00:00
  • 02a71b20a9 Merge and move RoomView to /structures. Add Resend.js from vector. Kegan Dougal 2015-11-30 17:15:57 +00:00
  • c67005c306 switch avatar initial layout to work with Open Sans Matthew Hodgson 2015-11-30 17:15:02 +00:00
  • 4e7aa78ed7 Move RoomList to react-sdk. Inject a ConferenceHandler. Kegan Dougal 2015-11-30 16:56:05 +00:00
  • f9e38e5326 Move and merge RoomList Kegan Dougal 2015-11-30 16:55:00 +00:00
  • e792ebb837 Move and merge UserSettings to react-sdk Kegan Dougal 2015-11-30 15:53:13 +00:00
  • f96e7a0dc8 Add UserSettings structure Kegan Dougal 2015-11-30 15:52:41 +00:00
  • 4409f07c2e oops, don't try to delete nonexistent tags when moving a room from conversations to favs or similar Matthew Hodgson 2015-11-30 15:49:27 +00:00
  • b89bd35cad Merge branch 'develop' into kegan/controller-merging4 Kegan Dougal 2015-11-30 15:42:32 +00:00
  • 03485c2fca Merge branch 'develop' into kegan/controller-merging4 Kegan Dougal 2015-11-30 15:39:14 +00:00
  • 59d9b83099 Merge pull request #40 from matrix-org/matthew/rename-message-components Matthew Hodgson 2015-11-30 15:37:01 +00:00
  • 4614017b8f Merge pull request #443 from vector-im/matthew/rename-message-components Matthew Hodgson 2015-11-30 15:36:50 +00:00
  • 7636645efc rename message components as per RL discussion this morning Matthew Hodgson 2015-11-30 15:25:21 +00:00
  • bd906cbc69 Move and merge LogoutPrompt to react-sdk Kegan Dougal 2015-11-30 15:23:37 +00:00
  • e008b5578d Move and merge LogoutPrompt Kegan Dougal 2015-11-30 15:23:16 +00:00
  • a8fd1b5d7a rename message components as per RL discussion this morning Matthew Hodgson 2015-11-30 15:19:43 +00:00
  • cb30cbb09a Remove MemberList and put it in react-sdk Kegan Dougal 2015-11-30 15:14:04 +00:00
  • 80a235adf9 Move and merge MemberList Kegan Dougal 2015-11-30 15:13:28 +00:00
  • 2b37e5334a Remove Notifier and put it in react-sdk Kegan Dougal 2015-11-30 15:05:00 +00:00
  • 945a65f4b5 Move Notifier to src/ since it isn't a component. Kegan Dougal 2015-11-30 15:04:24 +00:00
  • 960cc2d6b4 simplify avatar logic slightly Matthew Hodgson 2015-11-30 14:39:29 +00:00
  • f947400131 Open Sans Matthew Hodgson 2015-11-30 14:17:33 +00:00
  • 8a98fcd427 Merge branch 'develop' into kegan/controller-merging4 Kegan Dougal 2015-11-30 14:14:41 +00:00
  • 2002af6c7d Assign a default onFinished call to prevent TypeErrors being thrown. Kegan Dougal 2015-11-30 14:14:30 +00:00
  • fd4d7eba12 Remove ErrorDialog and QuestionDialog to react-sdk Kegan Dougal 2015-11-30 14:11:28 +00:00
  • fcb6db684b Move and merge QuestionDialog and ErrorDialog Kegan Dougal 2015-11-30 14:11:04 +00:00
  • 8a00e71139 remove spurious Vector layer Avatar helper class Matthew Hodgson 2015-11-30 13:56:53 +00:00
  • 78cfaeb5c3 Merge branch 'develop' into kegan/controller-merging4 Kegan Dougal 2015-11-30 10:56:39 +00:00
  • 83b3702769 Merge branch 'develop' into kegan/controller-merging4 Kegan Dougal 2015-11-30 10:56:14 +00:00
  • 450b2d4d67 Move CreateRoom to react-sdk Kegan Dougal 2015-11-30 10:55:52 +00:00
  • cf6b5461cc Move and merge CreateRoom Kegan Dougal 2015-11-30 10:55:15 +00:00
  • cd040ae0dd fix zalgo properly! remove ugly regexp hacks for detecting combining diacritics and instead set the right font ordering, as Arial combines nicely with Myriad Pro whilst Helvetica doesn't. (Myriad Pro itself has no combining diacritic characters) Matthew Hodgson 2015-11-30 01:13:59 +00:00
  • 28b85bb226 remove unnecessary zalgo hacks Matthew Hodgson 2015-11-30 01:12:41 +00:00
  • 96aa42471d fix messagecomposer layout when switching between rooms on FF Matthew Hodgson 2015-11-30 01:12:32 +00:00
  • ba090a6ad5 only dispatch user_activity event if the mouse actually moves (rather than the DOM moving under the mouse) Matthew Hodgson 2015-11-29 15:39:10 +00:00
  • 9a64dc27fc improve layout for search results, fix syntax highlighting quirks in sublime, and don't crash on zero results Matthew Hodgson 2015-11-29 13:32:13 +00:00
  • af6bd53d38 revert 23d45d7f33 and apply a better fix which works for both chrome & FF Matthew Hodgson 2015-11-29 13:18:37 +00:00
  • bed7d50ab8 reactor the highlighting code to avoid duplication and make it more coherent Matthew Hodgson 2015-11-29 13:00:58 +00:00
  • ca6cdfafd3 clean up spurious whitespace Matthew Hodgson 2015-11-29 13:00:37 +00:00
  • c96fa7f15d fix autoplay on chrome and remove loop for m.video Matthew Hodgson 2015-11-29 12:34:01 +00:00
  • 01f0e61d6e fix search ordering; add room labels; hide input areas if searching Matthew Hodgson 2015-11-29 04:41:17 +00:00
  • d6b188751a s/autoplay/autoPlay/ Matthew Hodgson 2015-11-29 03:25:55 +00:00
  • 0b483c4707 rename searchTerms to highlights, and support highlighting multiple search terms Matthew Hodgson 2015-11-29 03:22:01 +00:00
  • 3cc1b1ad82 fix unwanted vertical scrollbar issue and typo Matthew Hodgson 2015-11-29 03:21:21 +00:00
  • fc02331cd3 fix CSS for search timestamps Matthew Hodgson 2015-11-29 03:20:19 +00:00
  • e43edee9bb call highlighted search terms highlights, and uphold them if provided by synapse Matthew Hodgson 2015-11-29 03:19:51 +00:00
  • f028b343b0 HTML and Markdown emotes. Matthew Hodgson 2015-11-28 22:34:45 +00:00
  • 52376091cb resize the composer when you change rooms Matthew Hodgson 2015-11-28 22:20:14 +00:00
  • 9befe243b5 combine M{Text,Notice,Emote}Message into a generic TextualMessage component Matthew Hodgson 2015-11-28 21:12:02 +00:00
  • 8de94d45b1 swim like a salmon and manually update skindex for a generic TextualMessage type Matthew Hodgson 2015-11-28 21:11:37 +00:00
  • 832da3aa8e support del tags for markdown Matthew Hodgson 2015-11-28 12:44:10 +00:00
  • 9e97160c85 fix inline <code/> blocks Matthew Hodgson 2015-11-27 16:20:14 +00:00
  • 8a5828620c Merge pull request #425 from vector-im/kegan/controller-merging3 Kegsay 2015-11-27 16:17:39 +00:00
  • 144feb6af9 Merge pull request #39 from matrix-org/kegan/controller-merging3 Kegsay 2015-11-27 16:17:31 +00:00
  • 07001ae35e Remove unused files Kegan Dougal 2015-11-27 16:11:58 +00:00
  • 12f90ba849 Merge branch 'develop' into kegan/controller-merging3 Kegan Dougal 2015-11-27 15:45:10 +00:00
  • cd216e218c Merge branch 'develop' into kegan/controller-merging3 Kegan Dougal 2015-11-27 15:44:52 +00:00
  • 471d016a78 Merge pull request #38 from matrix-org/kegan/controller-merging2 Kegsay 2015-11-27 15:43:58 +00:00
  • 054836cd50 Merge pull request #421 from vector-im/kegan/controller-merging2 Kegsay 2015-11-27 15:43:49 +00:00
  • 0ef7c8d16d Use the right name Kegan Dougal 2015-11-27 15:43:16 +00:00
  • 9950e45b7d Add required imports Kegan Dougal 2015-11-27 15:39:52 +00:00
  • af30ef1f72 Remove unusued imports Kegan Dougal 2015-11-27 15:39:29 +00:00
  • 5ba1ef5203 Move velocity stuff / contextual menu from Vector to React. Kegan Dougal 2015-11-27 15:37:40 +00:00
  • df86e85492 Move ContextualMenu to React SDK Kegan Dougal 2015-11-27 15:37:00 +00:00
  • 05c9b44b81 Move velocity stuff to react sdk Kegan Dougal 2015-11-27 15:34:26 +00:00
  • 73d619b8e8 Merge branch 'develop' into kegan/controller-merging2 Kegan Dougal 2015-11-27 15:02:48 +00:00
  • 1825b0317e Add components which were previously in vector Kegan Dougal 2015-11-27 15:02:32 +00:00
  • 0f3ea9f4ce Merge branch 'develop' into kegan/controller-merging2 Kegan Dougal 2015-11-27 15:01:23 +00:00
  • a5d00c73b2 Move HtmlUtils to react SDK Kegan Dougal 2015-11-27 15:01:06 +00:00
  • 063dbd419a Merge pull request #37 from matrix-org/kegan/controller-merging Kegsay 2015-11-27 14:59:45 +00:00
  • f9a5f4b61e Merge pull request #420 from vector-im/kegan/controller-merging Kegsay 2015-11-27 14:59:38 +00:00
  • 40b974f22d Move all Event/Message Tiles to React SDK. Kegan Dougal 2015-11-27 14:35:16 +00:00
  • f969ccb50c Move and merge RoomTile/MemberTile to react SDK. Keep DND stuff in vector as RoomDNDView. Kegan Dougal 2015-11-27 11:52:29 +00:00
  • 4a2fe426bf Move and merge RoomTile and MemberTile. Extract DND stuff. Kegan Dougal 2015-11-27 11:50:33 +00:00
  • b007edca63 Merge and move RoomHeader/RoomSettings into React SDK Kegan Dougal 2015-11-27 10:42:25 +00:00
  • bf46ce19e0 Merge and move RoomHeader/RoomSettings Kegan Dougal 2015-11-27 10:42:03 +00:00
  • 3ce29622ed Move and merge MemberInfo to React SDK Kegan Dougal 2015-11-26 17:49:55 +00:00
  • 11efb1ede4 Move and merge MemberInfo Kegan Dougal 2015-11-26 17:49:39 +00:00
  • 1a6afc2ef0 Move and merge UserSelector Kegan Dougal 2015-11-26 17:38:01 +00:00
  • 6e9e314f24 Move and merge UserSelector Kegan Dougal 2015-11-26 17:37:40 +00:00
  • 6dea8e7256 Move and merge MessageComposer Kegan Dougal 2015-11-26 17:31:37 +00:00
  • 206c45e703 Move and merge MessageComposer Kegan Dougal 2015-11-26 17:31:10 +00:00
  • 7595071e6a Move and merge ProgressBar Kegan Dougal 2015-11-26 17:21:35 +00:00
  • 75afc3a7de Move and merge ProgressBar Kegan Dougal 2015-11-26 17:21:08 +00:00
  • fdad00790e Move and merge Change* components to React SDK. Update references. Kegan Dougal 2015-11-26 17:11:26 +00:00
  • fc7707971e Move and merge Change Avatar|DisplayName|Password components Kegan Dougal 2015-11-26 17:10:36 +00:00
  • 9ecf5bed64 Nuke old CallView controller Kegan Dougal 2015-11-26 16:48:32 +00:00
  • ff9608c914 Move and merge voip molecules. Inject the ConferenceHandler as a prop Kegan Dougal 2015-11-26 16:39:58 +00:00
  • 6c9f3303c6 Convert voip molecules to components Kegan Dougal 2015-11-26 16:38:56 +00:00