Dima/element-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Commit Graph

  • 178e99385a Merge remote-tracking branch 'origin/develop' into rav/keep_scrolling Richard van der Hoff 2016-02-09 14:52:38 +00:00
  • 30b4b91cf3 Show jump-to-bottom icon even when there is other stuff in the status bar Richard van der Hoff 2016-02-09 14:42:32 +00:00
  • bab9de1899 CSS fixes to match matrix-org/matrix-react-sdk#30b4b91. Richard van der Hoff 2016-02-09 14:44:59 +00:00
  • 7fd56351a9 Fix 'unread messages' in status Richard van der Hoff 2016-02-09 12:40:11 +00:00
  • 194110dd71 Merge pull request #147 from matrix-org/rav/factor_out_statusbar Richard van der Hoff 2016-02-09 11:38:40 +00:00
  • 81e95ca8c1 Wire up jump-to-bottom knob Richard van der Hoff 2016-02-09 11:36:57 +00:00
  • 8641dab756 Don't stop scrolling at the read-up-to mark. Richard van der Hoff 2016-02-09 11:08:26 +00:00
  • da81d240e2 Merge pull request #146 from matrix-org/kegan/warning-bars-dom Kegsay 2016-02-09 11:03:31 +00:00
  • 1d9c88698f Factor the statusbar implementation out of RoomView Richard van der Hoff 2016-02-08 18:04:54 +00:00
  • 4996164b46 Merge pull request #145 from matrix-org/rav/outdent_roomview_render Richard van der Hoff 2016-02-08 18:07:12 +00:00
  • ecaa2c1e11 Fix the mess of warning bars so it doesn't trigger remounts of alllll the components Kegan Dougal 2016-02-08 17:20:52 +00:00
  • 3ca2bbe31e Drop a redundant 'else' from RoomView.render, and outdent a load of code Richard van der Hoff 2016-02-08 16:43:08 +00:00
  • a2e50eb496 Merge pull request #143 from matrix-org/dbkr/fix_display_name_prompt_when_peeking David Baker 2016-02-08 16:03:37 +00:00
  • 9bf8f37e5f explicitly check join status as it's clearer David Baker 2016-02-08 16:03:04 +00:00
  • fba497d367 Merge pull request #144 from matrix-org/kegan/invite-autocompleting-race Kegsay 2016-02-08 15:54:45 +00:00
  • 2027ed9f49 Fix bug where clicking on the email tile didn't work Kegan Dougal 2016-02-08 15:21:23 +00:00
  • 70ed0be389 Merge branch 'develop' into kegan/invite-autocompleting-race Kegan Dougal 2016-02-08 15:06:13 +00:00
  • 3fa23798ea Split out invite memberlist logic into its own component Kegan Dougal 2016-02-08 15:05:35 +00:00
  • baba500150 Filter rooms by ones we're in: getRooms() is not the set of rooms we are joined. David Baker 2016-02-08 14:33:10 +00:00
  • 05f1e1e205 Merge pull request #140 from matrix-org/dbkr/fix_tab_complete David Baker 2016-02-08 14:19:06 +00:00
  • 7ccce1dc91 Reset truncation when the text box is cleared Kegan Dougal 2016-02-05 16:58:37 +00:00
  • 5dafe1f4a6 Fix canonical alias bug showing the first alias if one was not set. Kegan Dougal 2016-02-05 16:22:24 +00:00
  • ac67cd556a Merge pull request #142 from matrix-org/kegan/truncate-invite-search-list Kegsay 2016-02-05 15:56:23 +00:00
  • 27791c06ee Cache-bust on /version request Kegan Dougal 2016-02-05 15:53:33 +00:00
  • 4ce41f7f6c Merge pull request #141 from matrix-org/kegan/room-settings-refactor Kegsay 2016-02-05 15:50:39 +00:00
  • b99c6b9a97 camelCasePlease Kegan Dougal 2016-02-05 15:48:04 +00:00
  • a0c5b30fd6 Fix vector-im/vector-web#851 by truncating the search results Kegan Dougal 2016-02-05 15:24:51 +00:00
  • 03f19eba55 Implement radio boxes ( vector-im/vector-web#731 ) for history visibility. Hook up remaining bits. Kegan Dougal 2016-02-05 14:38:28 +00:00
  • 500c12b1f2 Fix tab complete David Baker 2016-02-05 14:32:30 +00:00
  • ef9b4ab1e6 Log when sessions are saved/restored/not found Kegan Dougal 2016-02-05 13:32:01 +00:00
  • 0cbf9dba87 Glue more things back together Kegan Dougal 2016-02-05 11:59:19 +00:00
  • 78354d0bc7 Yank out color settings from RoomSettings to ColorSettings Kegan Dougal 2016-02-05 11:27:11 +00:00
  • 01bfb67b5b Merge branch 'dbkr/rate_limit_funcs' into develop David Baker 2016-02-05 10:58:18 +00:00
  • 485343864c semicolon David Baker 2016-02-05 10:57:49 +00:00
  • 9525808cd0 Merge pull request #137 from matrix-org/dbkr/roomlist_unregister_event_handlers David Baker 2016-02-05 10:48:22 +00:00
  • 842584177f Merge pull request #864 from vector-im/dbkr/rate_limit_funcs David Baker 2016-02-05 10:16:03 +00:00
  • 0ae548cf5d Merge pull request #139 from matrix-org/dbkr/rate_limit_funcs David Baker 2016-02-05 10:15:55 +00:00
  • 239abf4eca Style things from PR comments David Baker 2016-02-05 09:51:09 +00:00
  • ab9dfd185c Add note to not use npm start in production David Baker 2016-02-04 18:43:23 +00:00
  • f035b8c50e Rate limit UI updates to avoid browser death David Baker 2016-02-04 18:09:24 +00:00
  • 63776509a6 Make the function call-rate limiting a generic thing and use it in more places. David Baker 2016-02-04 18:06:24 +00:00
  • 5ae532dae2 Merge pull request #138 from matrix-org/rav/update_rr_semantics Richard van der Hoff 2016-02-04 17:42:15 +01:00
  • d14c1a82b2 Tweaks to the semantics for sending RRs and handling room switches Richard van der Hoff 2016-02-04 16:17:03 +00:00
  • 74e16ac83e Merge branch 'develop' into kegan/room-settings-refactor Kegan Dougal 2016-02-04 16:20:24 +00:00
  • 73df5a2828 Modify how checked state is passed around Kegan Dougal 2016-02-04 16:18:59 +00:00
  • c0d93a78bc Unregister some event handlers we'd registered but never unregister. David Baker 2016-02-04 15:55:24 +00:00
  • 75ff4f0f95 Merge pull request #135 from matrix-org/kegan/sync-limit Kegsay 2016-02-04 15:47:31 +00:00
  • d1467d2319 Merge pull request #136 from matrix-org/dbkr/prompt_display_name_on_join David Baker 2016-02-04 15:32:52 +00:00
  • 4013dae770 Start refactoring RoomSettings Kegan Dougal 2016-02-04 15:26:12 +00:00
  • 15fec7f27c Merge pull request #862 from vector-im/dbkr/style_dialog_submit_button David Baker 2016-02-04 15:07:44 +00:00
  • 167da10b8b address PR comments David Baker 2016-02-04 15:07:30 +00:00
  • 6e424780f1 typo David Baker 2016-02-04 14:38:05 +00:00
  • d0c8dadaf6 Merge pull request #134 from matrix-org/dbkr/fix_preview_bar David Baker 2016-02-04 14:10:18 +00:00
  • 309f1e2c8f Merge pull request #131 from matrix-org/rav/search_clickthrough Richard van der Hoff 2016-02-04 15:06:39 +01:00
  • 63b50ed230 Merge pull request #132 from matrix-org/rav/fix_404_on_echo Richard van der Hoff 2016-02-04 15:05:35 +01:00
  • 8f5c739886 Clean up scrollToken assignment Richard van der Hoff 2016-02-04 14:05:16 +00:00
  • f3fa5d6a2a Set the sync limit back to sane levels Kegan Dougal 2016-02-04 13:30:25 +00:00
  • b0da54533d Don't do this check - it's not valid since we set the room in onRoomName David Baker 2016-02-04 13:25:45 +00:00
  • 891f4761a0 Add comments and only set a room / init the timeline if we don't already have a room David Baker 2016-02-04 13:21:42 +00:00
  • 6c9d48bd3a Merge pull request #128 from matrix-org/kegan/alias-settings Kegsay 2016-02-04 13:14:19 +00:00
  • 574560cc05 remove listener on unmount David Baker 2016-02-04 13:06:59 +00:00
  • c0c7ae1596 Style submit input controls in dialogs the way we style buttons. David Baker 2016-02-04 11:50:29 +00:00
  • 47fef0896f Prompt for display name before joining your first room (if you haven't set one). David Baker 2016-02-04 11:49:10 +00:00
  • 3c2c2b051b Listen for Room and use this to init the timeline, not Room.name David Baker 2016-02-04 11:29:00 +00:00
  • c9a3ad31ab Comment error handling David Baker 2016-02-04 11:17:39 +00:00
  • 5c430395ea init timeline when we get the room, as otherwise we never load it after joining David Baker 2016-02-04 10:50:21 +00:00
  • 3c2e0c1928 Merge pull request #133 from matrix-org/kegan/version-stamp Kegsay 2016-02-03 17:09:28 +00:00
  • 6c5a00162c Merge pull request #856 from vector-im/kegan/version-stamp Kegsay 2016-02-03 17:09:24 +00:00
  • 164c9b9031 Check error to see if it's actually a failure to peek David Baker 2016-02-03 16:53:48 +00:00
  • 8b96af4ccb Display the version in UserSettings. Change MatrixChat.onNewVersion to onVersion Kegan Dougal 2016-02-03 16:51:53 +00:00
  • b307a6d64e Invoke onVersion when we know the current version even if there is no new version (for settings) Kegan Dougal 2016-02-03 16:50:05 +00:00
  • cebc2f5306 Put the room preview bar back for rooms that aren't peekable (since we always tried to peek, it would fail which would reject the promise and cause loadingTimeline to stay true forever). David Baker 2016-02-03 16:23:57 +00:00
  • 4628cf82a7 Split out response text to its own var to prevent trim() messing up comparisons Kegan Dougal 2016-02-03 16:23:17 +00:00
  • 7bdd9f57a5 Add MatrixChat.onNewVersion to trigger the new version bar Kegan Dougal 2016-02-03 16:16:52 +00:00
  • 5eed734325 Add a version update checker and NewVersionBar to show on the UI. Kegan Dougal 2016-02-03 16:16:14 +00:00
  • f0a1f6d926 Merge pull request #846 from vector-im/dbkr/no_auto_join David Baker 2016-02-03 15:52:05 +00:00
  • d7576d223d Don't try to use local echoes as scroll tokens Richard van der Hoff 2016-02-03 15:34:20 +00:00
  • 9468ff63ff Merge pull request #129 from matrix-org/dbkr/no_auto_join David Baker 2016-02-03 15:18:38 +00:00
  • 11df2fc285 Merge remote-tracking branch 'origin/develop' into dbkr/no_auto_join David Baker 2016-02-03 15:18:18 +00:00
  • e747beac58 Enable clicking on search results to switch to the result in context. Richard van der Hoff 2016-01-29 11:19:27 +00:00
  • 223675bafb Merge PR #126 from matrix-org/rav/link_to_event Richard van der Hoff 2016-02-03 14:54:27 +00:00
  • 8f703f4a2e Merge PR #122 from matrix-org/rav/timeline_window Richard van der Hoff 2016-02-03 14:54:04 +00:00
  • e01d61dfeb Merge branch 'rav/timeline_window' into rav/link_to_event Richard van der Hoff 2016-02-03 14:12:28 +00:00
  • 2479c81cf6 Merge remote-tracking branch 'origin/develop' into rav/timeline_window Richard van der Hoff 2016-02-03 14:09:50 +00:00
  • deb1aa468f Listen on 0.0.0.0 and not localhost Kegan Dougal 2016-02-03 13:20:07 +00:00
  • c76b1e7479 Actually listen on the right port Kegan Dougal 2016-02-03 13:11:51 +00:00
  • 4129c9bc24 Allow --symlink Kegan Dougal 2016-02-03 12:00:17 +00:00
  • e22d36fc08 Add deploy directory with redeploy script Kegan Dougal 2016-02-03 11:26:24 +00:00
  • c82b364ca8 Address review comments Richard van der Hoff 2016-02-03 08:03:10 +00:00
  • 101f0219c4 Merge pull request #130 from matrix-org/rav/fix_rr_react_warning Richard van der Hoff 2016-02-02 19:07:57 +01:00
  • 3b1ed3a014 Fix react warnings when a RR animation is happening during room switch Richard van der Hoff 2016-02-02 17:59:11 +00:00
  • 043f6991a4 Dump vector/react/jssdk SHAs in filename Kegan Dougal 2016-02-02 17:03:48 +00:00
  • b0f0d5f6d0 Null check room because those events will be emitted before the room is stored. David Baker 2016-02-02 16:34:41 +00:00
  • 2b0f4d5db1 Be more specific about the git dir Kegan Dougal 2016-02-02 16:29:25 +00:00
  • 1c267c69ac Include react SDK SHA in filename Kegan Dougal 2016-02-02 16:20:02 +00:00
  • 2a7b24e969 Update jenkins.sh to include the git commit Kegan Dougal 2016-02-02 16:09:33 +00:00
  • 20f77d1224 Merge pull request #125 from matrix-org/kegan/trailing-slash Kegsay 2016-02-02 16:04:19 +00:00
  • d132c75263 Remove the autoPeek stuff and always either peek or show the join prompt bar David Baker 2016-02-02 15:51:23 +00:00
  • 1cabe2ec37 Don't auto join rooms: always 'autoPeek' (ie. see if we can peek, otherwise offer to join) David Baker 2016-02-02 15:50:15 +00:00
  • b363eafbc8 Make jenkins.sh executable Kegan Dougal 2016-02-02 15:45:30 +00:00