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

Commit Graph

  • d837d02ac9 Still add highlight.js as an import as we symlink directly to the node_module for github.css :/ - Fixes ENOENT Kegan Dougal 2015-12-02 09:26:12 +00:00
  • cba27a7488 erm, surely we need to actually run reskindex after all that? Matthew Hodgson 2015-12-02 01:37:26 +00:00
  • 349a88d640 stop clobbering our font colours Matthew Hodgson 2015-12-01 18:37:51 +00:00
  • 40e4ae9759 Remove temporary vector stuff as the sister PR makes it obsolete. David Baker 2015-12-01 18:34:01 +00:00
  • 6978436b07 Update component index David Baker 2015-12-01 18:33:46 +00:00
  • 95e71a531e Merge branch 'develop' into kegan/vector-references David Baker 2015-12-01 18:31:13 +00:00
  • 4446f1d781 Merge branch 'develop' into kegan/vector-references David Baker 2015-12-01 18:21:44 +00:00
  • d2c6e2195e Merge pull request #447 from vector-im/skindex-nextgen David Baker 2015-12-01 18:12:47 +00:00
  • 83c3c43c27 Merge pull request #41 from matrix-org/skindex-nextgen David Baker 2015-12-01 18:11:49 +00:00
  • a63bf7cb35 Merge branch 'develop' into skindex-nextgen David Baker 2015-12-01 18:10:57 +00:00
  • d7a00a5a86 Merge branch 'develop' into skindex-nextgen David Baker 2015-12-01 18:10:04 +00:00
  • 7ff5e42f3e Run the CSS through webpack so we can pull in CSS files from modules with require rather than symlinking into the node_module directory which is breaking people on different npm versions. David Baker 2015-12-01 18:05:43 +00:00
  • 2c12b9128b highlight binged rooms more clearly Matthew Hodgson 2015-12-01 16:57:36 +00:00
  • e21d435d84 Remove debug logging Kegan Dougal 2015-12-01 16:57:40 +00:00
  • bb289a4145 Add CustomServerDialog class Kegan Dougal 2015-12-01 16:49:15 +00:00
  • a2b28b826c Add CustomServerDialog for vector Kegan Dougal 2015-12-01 16:48:51 +00:00
  • 673b01267a Use LoginHeader everywhere Kegan Dougal 2015-12-01 16:29:58 +00:00
  • 05a6121934 Add default LoginHeader Kegan Dougal 2015-12-01 16:27:48 +00:00
  • 8d31f72f83 Add VectorLoginHeader Kegan Dougal 2015-12-01 16:27:23 +00:00
  • e304a1925d Add VectorLoginFooter with vector references Kegan Dougal 2015-12-01 16:12:38 +00:00
  • 52f3d7f18b Add generic LoginFooter. Remove vector reference Kegan Dougal 2015-12-01 16:12:13 +00:00
  • 8b103da3d3 Merge pull request #43 from matrix-org/kegan/vector-components Kegsay 2015-12-01 15:59:01 +00:00
  • 819b80d30f Merge pull request #450 from vector-im/kegan/vector-components Kegsay 2015-12-01 15:58:55 +00:00
  • c281fe785a Merge branch 'develop' into skindex-nextgen David Baker 2015-12-01 15:53:11 +00:00
  • 77b99de46b Update component index David Baker 2015-12-01 15:52:32 +00:00
  • 5e2a4fa537 Merge branch 'develop' into skindex-nextgen David Baker 2015-12-01 15:48:05 +00:00
  • 8083e7f118 Move vector-only components to src/components. Kegan Dougal 2015-12-01 15:45:38 +00:00
  • 636be0c003 Update getComponent paths Kegan Dougal 2015-12-01 15:45:11 +00:00
  • 5098c7d16f Merge branch 'develop' into skindex-nextgen David Baker 2015-12-01 15:44:45 +00:00
  • 726c893663 Merge branch 'develop' into kegan/vector-components Kegan Dougal 2015-12-01 15:39:15 +00:00
  • e07c03a7bb Merge branch 'develop' into kegan/vector-components Kegan Dougal 2015-12-01 15:39:02 +00:00
  • d5819d54db Fix typos Kegan Dougal 2015-12-01 15:36:40 +00:00
  • e7f6e09def Merge pull request #448 from vector-im/kegan/controller-merging4 Kegsay 2015-12-01 15:34:25 +00:00
  • 4fe2cc54d6 Merge pull request #42 from matrix-org/kegan/controller-merging4 Matthew Hodgson 2015-12-01 15:15:39 +00:00
  • fe16b221f8 s/vector.im/matrix.org/ Kegan Dougal 2015-12-01 13:48:53 +00:00
  • 075d2b508d fix highlights on markdown Matthew Hodgson 2015-12-01 13:13:51 +00:00
  • e55e2bdd0d Remove unused class Kegan Dougal 2015-12-01 11:22:19 +00:00
  • 2a025201b1 Move remaining vector molecules to be components in vector (for now) Kegan Dougal 2015-12-01 11:19:54 +00:00
  • 784c1b63dc Move remaining vector molecules to components Kegan Dougal 2015-12-01 11:19:25 +00:00
  • f89dcacf07 fix bottomleftmenu layout a bit Matthew Hodgson 2015-12-01 11:11:32 +00:00
  • 99f47b8601 match design spacing correctly Matthew Hodgson 2015-12-01 11:07:12 +00:00
  • 1896ab67d1 fix room avatar offset Matthew Hodgson 2015-12-01 11:05:11 +00:00
  • 2bc3b665d2 Merge pull request #445 from vector-im/matthew/new-font Matthew Hodgson 2015-12-01 10:59:05 +00:00
  • 7f27ffd7bd Fix typos & variable shadowing from PR comments David Baker 2015-12-01 10:26:08 +00:00
  • 1de5d68e95 Un-commit accidentally committed file upload stuff David Baker 2015-12-01 10:25:35 +00:00
  • 1df03aa82a Remove unintentional logging David Baker 2015-12-01 10:20:21 +00:00
  • 1e694da460 Move MatrixChat and login components to react SDK. Kegan Dougal 2015-11-30 18:11:04 +00:00
  • 8f5f71ec80 Move MatrixChat to react-sdk. Move all login stuff to react SDK. Kegan Dougal 2015-11-30 18:10:09 +00:00
  • 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