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

Commit Graph

  • cd92f0ea62 Use new release of js-sdk David Baker 2016-02-24 14:06:03 +00:00
  • 1e095e105a Don't update state when no change to read marker Richard van der Hoff 2016-02-24 12:53:39 +00:00
  • ef00bc6d56 Manually merge relevant remaining parts of https://github.com/vector-im/vector-web/pull/790 that aren't covered by @richvdh's PR. David Baker 2016-02-24 11:59:29 +00:00
  • 8e25a4ca36 Merge pull request #999 from vector-im/dbkr/more_readme_foolproofing David Baker 2016-02-24 11:50:13 +00:00
  • 1ecedd2769 Add back deployment info David Baker 2016-02-24 11:48:51 +00:00
  • 9c9e260410 Make the README more idiot-proof David Baker 2016-02-24 11:36:57 +00:00
  • 3f9f3e9d92 Merge pull request #998 from vector-im/rav/fix_the_sodding_deployment_instructions David Baker 2016-02-24 11:24:48 +00:00
  • ca89c09e73 formatting Richard van der Hoff 2016-02-23 21:00:27 +00:00
  • 10f6277de2 Update the README to make the development instructions clearer Richard van der Hoff 2016-02-23 20:55:37 +00:00
  • 9db58de119 remove some dead code Richard van der Hoff 2016-02-23 19:09:51 +00:00
  • 4f417f7a82 Merge branch 'rav/roomview_works' into rav/read_marker Richard van der Hoff 2016-02-23 18:56:11 +00:00
  • 029f47d91c Merge branch 'rav/roomview_works' into rav/read_marker Richard van der Hoff 2016-02-23 18:30:42 +00:00
  • 68e0192acc reinstate event-continuation logic Richard van der Hoff 2016-02-23 18:43:51 +00:00
  • 3f51cda846 Register a s a guest even if email invite: this is ok now. David Baker 2016-02-23 18:30:35 +00:00
  • e2bafcbf02 Don't redirect to registration on 3pid invite: it's ok to be a guest now. David Baker 2016-02-23 18:26:15 +00:00
  • f1dd3d381a Merge pull request #172 from matrix-org/dbkr/guest_access_by_default David Baker 2016-02-23 18:12:54 +00:00
  • acb443537a Merge pull request #997 from vector-im/dbkr/fix_new_room_crash David Baker 2016-02-23 18:12:42 +00:00
  • b2b7354018 Comment guest access initial state David Baker 2016-02-23 18:10:48 +00:00
  • 55c7c08ac2 Sender can be null, so null check. David Baker 2016-02-23 17:59:13 +00:00
  • 72393bf75f Merge branch 'rav/read_marker' into develop Richard van der Hoff 2016-02-23 17:57:50 +00:00
  • 418bf8e39c Allow guest access by default (by specifying initial state) as rooms are private by default so they'd have to be invited to join. People can't get a 3pid invite & join as guest without this. David Baker 2016-02-23 17:55:45 +00:00
  • b384d8c91a Merge pull request #168 from matrix-org/dbkr/keypair_3pid_invites David Baker 2016-02-23 16:37:55 +00:00
  • 07822e20cb Don't forceUpdate the whole roomview on typing notifs Richard van der Hoff 2016-02-23 16:17:50 +00:00
  • 7a20fda7e7 Factor out a separate auxpanel, and cleanup the maxHeight management Richard van der Hoff 2016-02-23 15:46:27 +00:00
  • d599c8fbd2 Merge remote-tracking branch 'origin/develop' into rav/roomview_works Richard van der Hoff 2016-02-23 13:37:21 +00:00
  • 2c1b353c18 Merge pull request #169 from matrix-org/rav/regemini_on_status_update Richard van der Hoff 2016-02-23 13:36:54 +00:00
  • e656cbe8f3 Merge branch 'develop' into rav/roomview_works Richard van der Hoff 2016-02-23 13:32:32 +00:00
  • ac4b36c0dd Merge commit '99d2392' into rav/roomview_works Richard van der Hoff 2016-02-23 13:32:23 +00:00
  • 862e3c8c43 Merge commit '3f1db5a' into rav/roomview_works Richard van der Hoff 2016-02-23 13:26:11 +00:00
  • 4a22fb9763 Merge commit '26e6632' into rav/roomview_works Richard van der Hoff 2016-02-23 13:25:09 +00:00
  • 21850d7e2f Merge commit 'd7b3a24' into rav/roomview_works Richard van der Hoff 2016-02-23 13:24:58 +00:00
  • 9eff426819 Merge commit '71e2495' into rav/roomview_works Richard van der Hoff 2016-02-23 13:24:38 +00:00
  • 6aaced04fa Merge commit 'd2a731e' into rav/roomview_works Richard van der Hoff 2016-02-23 13:02:26 +00:00
  • 776b6a26c3 Merge commit '9a0ea56' into rav/roomview_works Richard van der Hoff 2016-02-23 13:02:02 +00:00
  • b1093f3f4b Merge commit 'e972686' into rav/roomview_works Richard van der Hoff 2016-02-23 12:57:53 +00:00
  • 4c571cf1bf Merge commit 'eb91faf' into rav/roomview_works Richard van der Hoff 2016-02-23 12:56:54 +00:00
  • 7f4f30d7d5 Merge commit 'e3feae3' into rav/roomview_works Richard van der Hoff 2016-02-23 12:01:53 +00:00
  • 3acfab48fc Merge commit '014acba' into rav/roomview_works Richard van der Hoff 2016-02-23 12:00:54 +00:00
  • 8161a18efd Merge commit 'b1a6575' into rav/roomview_works Richard van der Hoff 2016-02-23 11:56:51 +00:00
  • 497cb8bc9c Merge pull request #993 from vector-im/dbkr/keypair_3pid_invites David Baker 2016-02-23 11:08:28 +00:00
  • d673249681 Wire up StatusBar size changes to a geminipanel update Richard van der Hoff 2016-02-23 11:06:16 +00:00
  • a063efe250 Remove no-longer accurate comment. David Baker 2016-02-23 10:57:50 +00:00
  • 45c8500f28 Pass through params for other URLs (in this case, for keypair invite signing urls) David Baker 2016-02-23 10:22:22 +00:00
  • ac9f0f204d Wire up support for keypair 3pid invites. David Baker 2016-02-23 10:15:07 +00:00
  • bb6a36b911 Merge pull request #167 from matrix-org/rav/fix_image_load Richard van der Hoff 2016-02-22 17:53:36 +00:00
  • 3f1db5ac86 Merge pull request #166 from matrix-org/rav/keys_on_search_highlights Richard van der Hoff 2016-02-22 17:51:47 +00:00
  • 4158a007db Give <a> elements in search results a key Richard van der Hoff 2016-02-22 17:44:34 +00:00
  • 99d2392b6f Update the scroll offset when images load Richard van der Hoff 2016-02-22 17:19:04 +00:00
  • b04ce6a376 Fix default hs url after it was broken in 77b45e72 Richard van der Hoff 2016-02-22 17:07:26 +00:00
  • 26e66326a2 Link search results to the right room Richard van der Hoff 2016-02-22 12:54:22 +00:00
  • f2fc4a88ae gemini up roomdirectory Matthew Hodgson 2016-02-22 09:35:11 +00:00
  • 77b45e7231 oooooooops - remember opensans v13 Matthew Hodgson 2016-02-22 09:18:56 +00:00
  • 484736bf57 oops, add sanitize-html Matthew Hodgson 2016-02-21 00:05:17 +00:00
  • e91a108738 Merge pull request #972 from vector-im/matthew/room-directory Matthew Hodgson 2016-02-20 23:59:02 +00:00
  • 2ca5529faa support hyperlinked topics Matthew Hodgson 2016-02-20 23:54:47 +00:00
  • a35ab6bcef tart up room directory Matthew Hodgson 2016-02-20 13:36:48 +00:00
  • e33e9b5d4a upgrade OpenSans and add semibold Matthew Hodgson 2016-02-20 13:36:33 +00:00
  • d7b3a24c18 Merge pull request #165 from matrix-org/dbkr/read_receipt_send_ignore_implicit David Baker 2016-02-19 16:20:12 +00:00
  • 71e2495e81 Use new flag in js-sdk to look at the last read receipt the server actually has and ignore implicit ones, otherwise we can end up not sending an RR because we think there's already a more recent one, even though that one is implicit. David Baker 2016-02-19 14:45:02 +00:00
  • b4fe9473d5 improve error messages when failing to talk to a HS Matthew Hodgson 2016-02-19 14:17:35 +00:00
  • c053f90b18 Merge pull request #164 from matrix-org/make_room_links_valid David Baker 2016-02-19 11:40:11 +00:00
  • a44ef5bd48 fix incomingCallBox vertical offset if MatrixToolbar is present Matthew Hodgson 2016-02-19 02:21:17 +00:00
  • 3910877f8f ensure local activity bumps rooms up the roomlist Matthew Hodgson 2016-02-19 02:09:04 +00:00
  • 957ef9cdc8 fix self-highlight Matthew Hodgson 2016-02-19 01:56:03 +00:00
  • d2a731e255 only resize the video element if not fullscreen Matthew Hodgson 2016-02-19 01:18:53 +00:00
  • 7f310ce307 fix nasty overscroll bug on video element caused by inline v. block Matthew Hodgson 2016-02-19 01:18:37 +00:00
  • f538a0d5de scale local video feed to fit on the page properly Matthew Hodgson 2016-02-19 01:16:55 +00:00
  • dc94df4b06 accomodate 800px wide thumbs and support horizontal scaling Matthew Hodgson 2016-02-18 19:09:58 +00:00
  • 4e5b971d3a accomodate 800px wide thumbs Matthew Hodgson 2016-02-18 19:09:32 +00:00
  • ffb1584e10 horizontally scale images properly Matthew Hodgson 2016-02-18 18:59:45 +00:00
  • 12f5407392 remove ... in error view Matthew Hodgson 2016-02-18 18:16:48 +00:00
  • aef04d682b Make the links we emit for room URLs valid rather than relying on the onClick handler (ie. make them work if you c+p them) David Baker 2016-02-18 18:16:39 +00:00
  • dbf3439e35 fix statusbar layout some more Matthew Hodgson 2016-02-18 18:13:23 +00:00
  • 11ac6defed tint searchbar Matthew Hodgson 2016-02-18 17:32:15 +00:00
  • 4d7eb5795c tint border-left Matthew Hodgson 2016-02-18 00:32:46 +00:00
  • 9a0ea56bba don't suppress conf join/parts Matthew Hodgson 2016-02-18 00:07:35 +00:00
  • 4c149480c9 Merge pull request #159 from matrix-org/rav/move_ghostmarker_to_messagepanel Richard van der Hoff 2016-02-17 21:44:24 +00:00
  • e9726865fc Merge pull request #162 from matrix-org/rav/keep_redactions Richard van der Hoff 2016-02-17 21:42:39 +00:00
  • c4176ab706 Merge pull request #163 from matrix-org/rav/fix_search_clickthrough Richard van der Hoff 2016-02-17 21:35:39 +00:00
  • 718c1cbe6f Merge branch 'rav/update_status_bar' into develop Richard van der Hoff 2016-02-17 21:16:22 +00:00
  • e3feae32e1 Fix search clickthrough for HTML events Richard van der Hoff 2016-02-17 19:50:04 +00:00
  • 27222a54c7 somewhat cryptic hack to make empty RoomStatusBars not take up 41px rather than 36px of height Matthew Hodgson 2016-02-17 18:54:46 +00:00
  • b087157855 Merge branch 'develop' into rav/update_status_bar Matthew Hodgson 2016-02-17 18:38:47 +00:00
  • 3263076ea6 Merge branch 'develop' into rav/update_status_bar Matthew Hodgson 2016-02-17 18:37:40 +00:00
  • 3c659dcf57 experimental fix for https://github.com/vector-im/vector-web/issues/947 and https://github.com/vector-im/vector-web/issues/946. may well introduce more problems Matthew Hodgson 2016-02-17 12:43:42 +00:00
  • b393234147 Merge pull request #158 from matrix-org/rav/refactor_eventtile_loop Richard van der Hoff 2016-02-16 22:25:49 +00:00
  • 38a2a61b38 back out hacky previous commit as #946 only happens when gemini is disabled Matthew Hodgson 2016-02-16 19:39:22 +00:00
  • 34d0fc890a disable scroll-to-token entirely temporarily - https://github.com/vector-im/vector-web/issues/946 Matthew Hodgson 2016-02-16 17:39:32 +00:00
  • eb91faf554 Handle redacted events Richard van der Hoff 2016-02-16 16:05:27 +00:00
  • f992caadd7 Position read-marker 1/3 of the way down, not halfway down. Richard van der Hoff 2016-02-15 18:12:38 +00:00
  • 21a7d15e68 MessagePanel: Fix missing import Richard van der Hoff 2016-02-15 18:10:44 +00:00
  • d498c5a81e Implementation of new read-marker semantics Richard van der Hoff 2016-02-10 09:18:52 +00:00
  • db09d3d9e4 Move ghost-read-marker logic to MessagePanel Richard van der Hoff 2016-02-15 09:50:12 +00:00
  • 63511d4e71 Refactor the EventTile loop Richard van der Hoff 2016-02-12 13:39:38 +00:00
  • 06133b0467 Add a null guard for matrix client TimelinePanel.componentWillUnmount Richard van der Hoff 2016-02-15 23:04:21 +00:00
  • 687eae7f43 stop floods of notifs when doing a logout+login Matthew Hodgson 2016-02-15 22:07:08 +00:00
  • 4b8b2ade8b fix login-on-guest-bar-NPE crash https://github.com/vector-im/vector-web/issues/930 Matthew Hodgson 2016-02-15 21:50:39 +00:00
  • ca56b7ec2d match partial names in memberlist Matthew Hodgson 2016-02-15 20:43:43 +00:00
  • 61018f4f38 whitespace Matthew Hodgson 2016-02-15 20:42:44 +00:00
  • ab9690d3b0 Don't re-tint on unmount Richard van der Hoff 2016-02-15 20:40:34 +00:00