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

Commit Graph

  • 9fb5702c2f make MatrixClientPeg an actual global too otherwise things go very wierd David Baker 2015-09-28 17:46:49 +01:00
  • 7d540572fd Update for new default avatar API. David Baker 2015-09-28 17:06:39 +01:00
  • 8af6c2275b Make it easier to override default avatar urls David Baker 2015-09-28 17:06:13 +01:00
  • 3792d5494a Dispatcher should be a global too David Baker 2015-09-28 14:48:50 +01:00
  • c3f32b74e4 Some missed '/' / '.' replacemement David Baker 2015-09-28 14:48:07 +01:00
  • 588dbf5693 reskindex David Baker 2015-09-28 11:34:11 +01:00
  • 91c0df4450 Merge branch 'master' into reactsdk-unfork David Baker 2015-09-28 11:32:40 +01:00
  • 3be50e327d Manually merge memberlist fix from vector master David Baker 2015-09-28 11:32:00 +01:00
  • 4472f63b5f We need js sdk 0.2.1 for getRoomIdForAlias David Baker 2015-09-25 17:49:35 +01:00
  • 3ecf19df49 Disable caching on the local http server as commented David Baker 2015-09-25 17:38:51 +01:00
  • 6348c2cf99 Change how viewing a room alias works to make way for jumping into a room once you've logged in. David Baker 2015-09-25 17:22:42 +01:00
  • bc2eca16f9 Unused guff David Baker 2015-09-25 16:25:20 +01:00
  • f778f6adf9 Remove unused stuff David Baker 2015-09-25 15:33:38 +01:00
  • fe369858b7 Unused variables & redundant stuff David Baker 2015-09-25 15:17:46 +01:00
  • 56530d80d7 Add link to guthub issue about webpack's loader path silliness David Baker 2015-09-25 13:53:58 +01:00
  • d172aaf41f Add -loader packages as deps David Baker 2015-09-25 13:39:21 +01:00
  • 796f424a3f Didn't need these in the end David Baker 2015-09-25 11:51:35 +01:00
  • 409697b35b Oops, these were just at the wrong scope David Baker 2015-09-25 11:46:06 +01:00
  • f020f4397c Switch to webpack David Baker 2015-09-25 11:43:28 +01:00
  • 5fe41e28d7 make presence work better on the memberlist. kludges around lack of syjs-28. is about as good as angular was now. Matthew Hodgson 2015-09-24 01:58:21 +02:00
  • a5a6a35122 don't blindly and inconsistently kill scrollbars Matthew Hodgson 2015-09-24 00:19:40 +02:00
  • bfa4cda2c6 build is no longer used David Baker 2015-09-23 10:14:38 +01:00
  • c21dd853f9 Update package.json for renamed skin David Baker 2015-09-23 09:48:18 +01:00
  • 5af43dc6a9 Remove unused action dispatch David Baker 2015-09-23 09:39:49 +01:00
  • 1901fdf889 oops, bogus commit Matthew Hodgson 2015-09-22 22:57:27 +02:00
  • b11abae8e8 More fixing up of paths, requires etc David Baker 2015-09-22 19:09:23 +01:00
  • 7e72ee891a More fixing up of vector skin David Baker 2015-09-22 18:49:04 +01:00
  • 40594fc5fa Fix up controller requires David Baker 2015-09-22 18:17:19 +01:00
  • dd4cfb25f8 Replace symlinks David Baker 2015-09-22 18:06:43 +01:00
  • 148dbc23ed Rename base skin to vector David Baker 2015-09-22 18:05:55 +01:00
  • 682392d02a Move skins dir to src David Baker 2015-09-22 18:05:31 +01:00
  • 09b81f46b0 Remove controllers that all come from react-sdk David Baker 2015-09-22 17:20:22 +01:00
  • 96627d4477 Port membertile fix David Baker 2015-09-22 16:51:16 +01:00
  • 3838569625 Port memberlist branch fixes David Baker 2015-09-22 16:37:39 +01:00
  • 2f0df6d37e Merge branch 'master' into reactsdk-unfork David Baker 2015-09-22 15:28:50 +01:00
  • 616b4fe0f1 Merge pull request #175 from vector-im/matthew/userlist David Baker 2015-09-22 15:27:21 +01:00
  • b32658cfd0 Load fewer events when switching to a room: they take surprisingly long to render. David Baker 2015-09-22 15:18:16 +01:00
  • ef3603cd1a oops, rogue debugging stmt Matthew Hodgson 2015-09-22 01:25:58 +02:00
  • 61c94d63e7 make the new userlist UI actually work Matthew Hodgson 2015-09-22 01:16:45 +02:00
  • 260e22186b WIP at turning MemberInfo into a ContextualMenu Matthew Hodgson 2015-09-21 19:23:04 +02:00
  • 048260bb1b WIP at turning MemberInfo into a ContextualMenu Matthew Hodgson 2015-09-21 19:22:29 +02:00
  • a545007a19 Merge branch 'master' into reactsdk-unfork David Baker 2015-09-21 18:08:58 +01:00
  • 980ce7fdae Remainder of the controllers from vector David Baker 2015-09-21 17:23:51 +01:00
  • 49c5f7cb95 Use same protocol as client was loaded over for recaptcha to prevent JS origin errors. David Baker 2015-09-21 16:53:50 +01:00
  • 1b82d92fa1 Port registration fixes David Baker 2015-09-21 16:38:12 +01:00
  • 65498600de port login fixes David Baker 2015-09-21 16:36:17 +01:00
  • 28c4a648be Port roomlist fixes David Baker 2015-09-21 16:31:31 +01:00
  • e2c9afb278 port create room David Baker 2015-09-21 16:28:39 +01:00
  • 29d2ed7191 Merge userselector changes David Baker 2015-09-21 16:17:29 +01:00
  • 82aa603596 Merge in resend support David Baker 2015-09-21 16:14:19 +01:00
  • 56c5f6f46e clarify deployment Matthew Hodgson 2015-09-19 20:17:45 +01:00
  • a8eb93bd6f Member list David Baker 2015-09-18 18:39:16 +01:00
  • 31ee667102 Room header David Baker 2015-09-18 14:34:36 +01:00
  • b9538a077c Missed files from last commit David Baker 2015-09-18 13:54:20 +01:00
  • 343de6245f Port ServerConfig changes David Baker 2015-09-18 13:33:51 +01:00
  • 08b5888d03 More porting: make sending messages work again! David Baker 2015-09-18 10:44:57 +01:00
  • 81db1b2360 Merge pull request #160 from vector-im/conferencing David Baker 2015-09-18 10:03:02 +01:00
  • abeed92501 Partial porting over of vector controller logic to react sdk. David Baker 2015-09-17 18:23:38 +01:00
  • 6eb18f0268 Fix reskindex David Baker 2015-09-17 18:21:35 +01:00
  • d938ba70d3 Port over room leaving David Baker 2015-09-17 12:10:01 +01:00
  • 240d5502fe Add a FIXME explaining the situation around alternative FS ASes Kegan Dougal 2015-09-17 11:47:42 +01:00
  • 7a50166dc6 Move the 'thumbnail' video to the top-left of the screen Kegan Dougal 2015-09-17 11:37:56 +01:00
  • 9c8b540d14 Actually add the doc Kegan Dougal 2015-09-17 11:06:50 +01:00
  • e991beb900 Add conferencing doc Kegan Dougal 2015-09-17 11:06:08 +01:00
  • 88aaf82c88 Backport: linkify emotes David Baker 2015-09-16 16:23:35 +01:00
  • f3b30477ce Backport: add other presets into room presets David Baker 2015-09-16 16:10:39 +01:00
  • a4cbbf0d92 Backport Notifier improvements from Vector, including TextForEvent David Baker 2015-09-16 14:48:49 +01:00
  • 25ab56106a Backport labels & placeholders for Editable text from Vector David Baker 2015-09-16 14:18:25 +01:00
  • f1120562f3 Random console log David Baker 2015-09-16 14:14:21 +01:00
  • 901574b56e Update package.json David Baker 2015-09-16 14:13:16 +01:00
  • 6cca5f4c05 backport fixes from vector David Baker 2015-09-16 13:48:24 +01:00
  • fe586f6a36 Merge branch 'master' into reactsdk-unfork David Baker 2015-09-16 10:49:04 +01:00
  • 01d3f2f119 implement /part, /j, and error rather than pass-through unrecognised commands Matthew Hodgson 2015-09-16 01:09:32 +01:00
  • 0aec086ebb actually link to blog etc from the login page Matthew Hodgson 2015-09-15 17:05:49 +01:00
  • f89fbffe89 Auto-place a video call if the conf notification is clicked Kegan Dougal 2015-09-15 15:55:02 +01:00
  • 2b65b4c2dc Hide the local video when in a conf call Kegan Dougal 2015-09-15 15:49:33 +01:00
  • ce2632bbe6 thinko Matthew Hodgson 2015-09-15 15:18:39 +01:00
  • 370310bf82 Use better variable names Kegan Dougal 2015-09-15 15:02:02 +01:00
  • aba4c1e9af We don't use catw here anymore David Baker 2015-09-15 14:46:41 +01:00
  • f384aa7d9e Add notification to group chat rooms with ongoing conf calls Kegan Dougal 2015-09-15 14:18:17 +01:00
  • 2d0c8ac9ff Working skin stuff, minus css David Baker 2015-09-15 13:34:36 +01:00
  • 353269370f Wire up the "room" CallView for conferencing Kegan Dougal 2015-09-15 13:19:07 +01:00
  • 7866979c79 Show/hide the Hangup button depending on the state of the conf call. Kegan Dougal 2015-09-15 13:04:09 +01:00
  • 5e3698de64 Actually enforce 1 call semantics. Kegan Dougal 2015-09-15 11:43:51 +01:00
  • 59986d8b72 Pass the call around different CallViews to keep media flowing Kegan Dougal 2015-09-15 11:05:53 +01:00
  • fc892b3580 Hide 1:1 conference rooms Kegan Dougal 2015-09-11 16:55:48 +01:00
  • e3b02a295c Check conf user/rooms a bit more efficiently Kegan Dougal 2015-09-11 16:14:30 +01:00
  • 77401e215e First working outbound conference calling Kegan Dougal 2015-09-11 15:49:47 +01:00
  • f3b9f8c799 WIP reworking of skinning and app integration process David Baker 2015-09-11 15:42:11 +01:00
  • 9b73d6ed6d react-tools is dead. Long live Babel. David Baker 2015-09-10 15:28:30 +01:00
  • a06e1f23ea Spurious react-loader require David Baker 2015-09-10 15:08:26 +01:00
  • 635041470f There is no MatrixChat in the sdk anymore (well, only a controller). Advertise the Component Broker instead. David Baker 2015-09-10 15:07:34 +01:00
  • a124e53a9a Component broker loading files never really worked very well anyway, and now it can't work because they're all defined elsewhere. David Baker 2015-09-10 15:06:42 +01:00
  • 6cc88e4ef3 Remove stuff that's going into the base skin David Baker 2015-09-09 16:57:55 +01:00
  • e1a6ede17b Ignore all module caches and make the built js the default include root David Baker 2015-09-08 18:45:00 +01:00
  • ce9fcdbbb5 Old, useless README from the trivial react-sdk example David Baker 2015-09-08 17:06:19 +01:00
  • 980c71076e Start moving back to basing off react sdk: move vector out of examples dir David Baker 2015-09-08 17:02:24 +01:00
  • 8fbce5fce8 de-tab David Baker 2015-09-08 16:17:06 +01:00
  • ee4da24b84 Merge pull request #148 from vector-im/matthew/login David Baker 2015-09-07 10:47:25 +01:00
  • 737fc74756 Merge branch 'matthew/login' into matthew/userlist Matthew Hodgson 2015-09-01 02:13:52 +03:00