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

Commit Graph

  • d4549e60cc Merge pull request #30 from matrix-org/kegan/3pid-invites Kegsay 2015-11-10 10:57:17 +00:00
  • ef7a38e558 gemini scrollbar on the memberlist too Matthew Hodgson 2015-11-10 02:26:46 +00:00
  • 2ca64d9c15 add gemini-scrollbar to the main roomview Matthew Hodgson 2015-11-10 02:04:21 +00:00
  • cb887c699e use gemini-scrollbar to provide fake scrollbars for the room list Matthew Hodgson 2015-11-10 01:40:08 +00:00
  • b5402d0fa0 port to react 0.14, removing getDOMNode()s for DOM components and turning them into ReactDOM.findDOMNode()s for React components Matthew Hodgson 2015-11-09 23:59:28 +00:00
  • 2ccd881665 port to react 0.14, removing getDOMNode()s for DOM components and turning them into ReactDOM.findDOMNode()s for React components Matthew Hodgson 2015-11-09 23:54:10 +00:00
  • 87bb7c9b7b upgrade to react 0.14 Matthew Hodgson 2015-11-09 23:13:46 +00:00
  • efd88b9a83 upgrade to react 0.14 Matthew Hodgson 2015-11-09 23:13:43 +00:00
  • 143483ec12 Support inviting by email address and hit the right API. Kegan Dougal 2015-11-09 17:36:14 +00:00
  • 6d9817e5e7 Merge pull request #342 from vector-im/matthew/orderable-roomlist Matthew Hodgson 2015-11-09 16:05:00 +00:00
  • 23c93de82e Merge branch 'develop' into matthew/orderable-roomlist Matthew Hodgson 2015-11-09 16:04:20 +00:00
  • bea64082a9 put the DragDropContext on LeftPanel rather than MatrixChat to allow index.js to continue to abuse MatrixChat by directly invoking the showScreen method on it Matthew Hodgson 2015-11-09 15:44:08 +00:00
  • c3385d597a Merge pull request #332 from vector-im/kegan/syncing Kegsay 2015-11-09 15:35:38 +00:00
  • 752f8bdbb8 remove random bold initials Matthew Hodgson 2015-11-09 14:04:43 +00:00
  • 1f69760173 fix comedy scrolling parallax avatar initial bug Matthew Hodgson 2015-11-09 12:41:23 +00:00
  • 66add5673b de-hash rooms Matthew Hodgson 2015-11-09 11:53:50 +00:00
  • a3082753ef shove initials onto default room & member avatars as per the design Matthew Hodgson 2015-11-09 02:12:26 +00:00
  • eaa2f94327 warning png Matthew Hodgson 2015-11-09 00:13:40 +00:00
  • 615879ffdd skin to match CSS (spacing will need to be fixed once matthew/ordered-roomlist lands) Matthew Hodgson 2015-11-09 00:13:25 +00:00
  • 05d921256f re-skin the notification bar Matthew Hodgson 2015-11-08 23:37:14 +00:00
  • 9526deb024 add error dialogs and order search results by recents Matthew Hodgson 2015-11-08 16:19:53 +00:00
  • 567176ea6c put a load of margin on the bottommost sublist to increase its hit target size and avoid problems when toggling its hiddenness Matthew Hodgson 2015-11-08 14:08:17 +00:00
  • 5494a4ea6c s/deprioritize/demote/ Matthew Hodgson 2015-11-08 13:50:36 +00:00
  • 827c0da33c commented out debug Matthew Hodgson 2015-11-08 13:42:45 +00:00
  • f0dbb422f6 update the actual target list, which may not be the same as the one we dropped on Matthew Hodgson 2015-11-08 13:13:01 +00:00
  • 5c406856ed adjust column widths to match design Matthew Hodgson 2015-11-08 12:59:19 +00:00
  • b15def84bc fix spacing of the layout to match latest designs Matthew Hodgson 2015-11-08 12:48:23 +00:00
  • bbbe074d92 hide all the debugging behind if (debug) Matthew Hodgson 2015-11-08 12:24:32 +00:00
  • 36da1accca click on CallView preview to jump to call Matthew Hodgson 2015-11-08 12:14:10 +00:00
  • e289235e17 fix tooltip positioning when collapsed Matthew Hodgson 2015-11-08 12:02:26 +00:00
  • c60e8736c1 handle collapsed drop-targets better Matthew Hodgson 2015-11-08 11:50:15 +00:00
  • 69899e3718 position sublist chevron better when collapsed Matthew Hodgson 2015-11-08 11:44:13 +00:00
  • ed4c5b9f73 switch initial spinner to mx_Spinner Matthew Hodgson 2015-11-07 20:16:44 +00:00
  • 4e170a2831 fix onRoomTags signature Matthew Hodgson 2015-11-07 20:16:05 +00:00
  • 07200d7953 Merge branch 'develop' into matthew/orderable-roomlist Matthew Hodgson 2015-11-07 17:29:18 +00:00
  • 4a195dd3f0 sacrifice a small mountainside of goats to make placeholder-based work correctly Matthew Hodgson 2015-11-07 02:57:56 +00:00
  • fe442f5c24 fix various edge cases when dragging stuff back to the conversations list Matthew Hodgson 2015-11-06 23:30:57 +01:00
  • 89327bd38f precedence fail :( Matthew Hodgson 2015-11-06 21:33:28 +01:00
  • f102e3b3b7 collapsible sublist graphics Matthew Hodgson 2015-11-06 21:25:35 +01:00
  • 1150e22190 collapsible sublists Matthew Hodgson 2015-11-06 21:25:20 +01:00
  • 886ffbf158 switch to m.* prefixes for tags before it's too late Matthew Hodgson 2015-11-06 21:00:34 +01:00
  • c884c5fc33 actually manage manual ordering; support arbitrary tags; bug fixes Matthew Hodgson 2015-11-06 20:54:07 +01:00
  • d462e0b21b Merge pull request #335 from stevenhammerton/sh-cas-token-login David Baker 2015-11-06 15:41:15 +00:00
  • b556eff492 Merge pull request #28 from stevenhammerton/sh-cas-token-login David Baker 2015-11-06 15:40:56 +00:00
  • fec362c4df JS SDK no longer does redirect for us, get the URL and update browser window location Steven Hammerton 2015-11-06 12:12:51 +00:00
  • a7c53e99d9 Clear query params from url with a nasty location update Steven Hammerton 2015-11-06 11:42:13 +00:00
  • fdf79d709e Replace CAS login with token login Steven Hammerton 2015-11-06 11:22:59 +00:00
  • de165ea6ad Update CAS login to allow HS to do interaction with CAS and client receives and redeems login token Steven Hammerton 2015-11-06 11:21:13 +00:00
  • b0e71c9872 Fix bugs from typos from hackathon Kegan Dougal 2015-11-06 09:57:22 +00:00
  • e20388388e null check David Baker 2015-11-05 17:40:37 +00:00
  • 3a8c263e8e Add resending bar (and resend all option) Kegan Dougal 2015-11-05 15:59:03 +00:00
  • 7882780357 Merge remote-tracking branch 'origin/develop' into read_receipts David Baker 2015-11-05 15:33:50 +00:00
  • f5116fe026 Merge pull request #27 from matrix-org/kegan/syncing Kegsay 2015-11-05 15:20:42 +00:00
  • f4e65f8e17 Remove name event listener David Baker 2015-11-05 15:07:46 +00:00
  • 3114422cb7 Merge remote-tracking branch 'origin/develop' into read_receipts David Baker 2015-11-05 15:05:29 +00:00
  • 804af341ac Add a 'connection lost' bar. Kegan Dougal 2015-11-05 14:52:44 +00:00
  • d8edbd2e3c Requires js-sdk develop David Baker 2015-11-05 14:45:48 +00:00
  • 0aa90d918c bump js-sdk dep to develop David Baker 2015-11-05 14:45:16 +00:00
  • a7c6a923f0 Unbreak everything (JS SDK had breaking API change) Kegan Dougal 2015-11-05 14:37:05 +00:00
  • 4bf6992398 Don't send read receipts for our own events and null check in a few places. David Baker 2015-11-05 14:16:15 +00:00
  • f9385b455a Don't try to send read receipts if the room is null David Baker 2015-11-05 13:27:03 +00:00
  • 8842147ec3 skin RoomDropTarget correctly Matthew Hodgson 2015-11-05 11:21:45 +00:00
  • 942659df0d Work around the bug where some channels have no name from the js sdk which was causing vector to exception and never load. David Baker 2015-11-04 14:15:57 +00:00
  • 61e55b3ca3 implement most of drag & drop. Matthew Hodgson 2015-11-04 02:25:08 +00:00
  • 7fe7af6026 refactor out the sections of the RoomList into RoomSubLists. Start wiring up tags Matthew Hodgson 2015-11-04 00:19:37 +00:00
  • 7dc5f91fad Remove unused code Erik Johnston 2015-11-03 18:59:45 +00:00
  • 5b773b99c0 Add basic m.video view support Erik Johnston 2015-11-03 18:56:55 +00:00
  • 3fec3a7326 Better error message if there is no accessSync (which there isn't on old node) David Baker 2015-11-03 18:29:49 +00:00
  • 8b9b268ec0 make our state explicit Matthew Hodgson 2015-11-03 14:35:55 +00:00
  • 27cf9cf561 put invites above recents Matthew Hodgson 2015-11-03 14:35:48 +00:00
  • b1b2704bed avoid racey NPE on first login Matthew Hodgson 2015-11-03 14:35:39 +00:00
  • 86ef0e762e Merge code to send read receipts into react-sdk RoomView controller David Baker 2015-11-03 14:08:51 +00:00
  • 2a4a02f36e More on read receipts: listen for events, add keys & class / very minimal css. David Baker 2015-11-03 13:44:40 +00:00
  • 5a72f199e1 listen for read receipts David Baker 2015-11-03 11:41:18 +00:00
  • 7c9b773bf8 unintentionally comitted logging David Baker 2015-11-03 11:22:18 +00:00
  • ff35e02b4d Merge pull request #317 from vector-im/erikj/icons Matthew Hodgson 2015-11-02 23:53:27 +00:00
  • 4dac9bc1b8 Use relative rather than absolute paths for icons Erik Johnston 2015-11-02 23:47:04 +00:00
  • 11c38014e5 Sort of display read avatars but without live updating David Baker 2015-11-02 18:55:28 +00:00
  • 842d6b6c2c Merge pull request #314 from vector-im/kegan/graceful-no-voip Kegsay 2015-11-02 18:18:46 +00:00
  • 6e63153d83 Add unsupported suffix on Ongoing conf notification if conf calls are unsupported in the browser Kegan Dougal 2015-11-02 18:01:20 +00:00
  • e5e4e901d8 Merge pull request #26 from matrix-org/kegan/graceful-no-voip Kegsay 2015-11-02 17:57:26 +00:00
  • 3485a74036 Gracefully handle browsers which don't do VoIP Kegan Dougal 2015-11-02 17:39:00 +00:00
  • 159f0c9594 Merge remote-tracking branch 'origin/develop' into read_receipts David Baker 2015-11-02 14:29:20 +00:00
  • e869814f2d Don't display anything if TextForEvent doesn't give us any text. Fixes #253 (catapillar of doom). David Baker 2015-11-02 14:14:47 +00:00
  • 3b82884947 Merge pull request #298 from vector-im/kegan/reject-invites Kegsay 2015-11-02 09:50:17 +00:00
  • 38780ad492 Merge branch 'develop' into kegan/reject-invites Kegan Dougal 2015-11-02 09:47:51 +00:00
  • e792201cd6 back out ctrl-alt-number room switching as nobody used it and it broke Tor's keyboard Matthew Hodgson 2015-10-31 14:00:23 +00:00
  • e25d31a9fe Merge pull request #296 from vector-im/matthew/redesign Matthew Hodgson 2015-10-30 18:30:13 +00:00
  • 56d00c2ec7 make onFinished required prop for modal contents Matthew Hodgson 2015-10-30 18:26:22 +00:00
  • 79af89fd1b fix missing decl Matthew Hodgson 2015-10-30 18:26:05 +00:00
  • 11e176df66 comment for the hidden collapse button Matthew Hodgson 2015-10-30 18:23:08 +00:00
  • 75bc878657 comment what a CR is Matthew Hodgson 2015-10-30 18:22:21 +00:00
  • ddbc8dffb3 switch from enums to string literals for SearchBar.Scope Matthew Hodgson 2015-10-30 18:21:54 +00:00
  • 6aad99a505 comment \u200b Matthew Hodgson 2015-10-30 18:20:29 +00:00
  • 35cebc56d3 rewrite the HTML message stuff to fix XSS and improve clarity Matthew Hodgson 2015-10-30 18:19:20 +00:00
  • 668234be4c Add reject button and impl Kegan Dougal 2015-10-30 17:18:25 +00:00
  • 626e8bab1a Merge pull request #283 from vector-im/kegan/blocking Kegsay 2015-10-30 14:59:06 +00:00
  • 633bbd8f29 Review comments: add chrome blurb. Kegan Dougal 2015-10-30 14:58:47 +00:00
  • ffb9ce89c7 Merge branch 'develop' into matthew/redesign David Baker 2015-10-30 11:50:34 +00:00
  • ce9a91e155 bundle.css shouldn't be necessary apart from the vector/bundle.* above David Baker 2015-10-30 11:33:33 +00:00