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

Commit Graph

  • 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
  • 2986b241c4 Add jenkins.sh for builds Kegan Dougal 2016-02-02 15:44:41 +00:00
  • 4e4e5be9a1 Disable upgrade registration temporarily. Fixes https://github.com/vector-im/vector-web/issues/818. David Baker 2016-02-02 14:14:18 +00:00
  • ce789ba962 Split out alias settings into its own component: AliasSettings Kegan Dougal 2016-02-02 12:46:14 +00:00
  • d1dc082489 Remove empty if block David Baker 2016-02-01 18:02:23 +00:00
  • 34ba00d0ae Merge pull request #127 from matrix-org/dbkr/fix_upgrade_with_email David Baker 2016-02-01 17:07:10 +00:00
  • c187eda832 Don't assert that we're not logged in before starting registration because uprading is now a thing. David Baker 2016-02-01 16:53:39 +00:00
  • d9e13780b8 Implement direct-to-event linking. Richard van der Hoff 2016-02-01 16:31:12 +00:00
  • e6c93530e2 Strip trailing slashes on HS/IS URLs on register/login Kegan Dougal 2016-02-01 14:19:20 +00:00
  • f0cf5c0aff Update onRoomTimeline comment Richard van der Hoff 2016-02-01 12:35:41 +00:00
  • 2c04b9cb5b Merge pull request #124 from ajohnson23/messages_scrolldown_fix Richard van der Hoff 2016-02-01 11:38:14 +01:00
  • fe9d7d10b9 Fix improper scrolldown button display issue. Andrew Johnson 2016-01-29 21:48:32 -05:00
  • f94272c539 Add some crude CSS for highlighting the selected event Richard van der Hoff 2016-01-30 00:43:47 +00:00
  • 3b18b9b54b Fix connection lost bar CSS David Baker 2016-01-29 10:07:22 +00:00
  • 7301f53807 Merge pull request #121 from matrix-org/dbkr/fix_registration_guest_access David Baker 2016-01-28 16:21:16 +00:00
  • 6bb69ef2d1 Merge pull request #120 from matrix-org/kegan/bulk-email-invite Kegsay 2016-01-28 16:21:05 +00:00
  • 401d18bcc6 Fix registration: don't auto-log in as a guest if we have a URL from sydent. David Baker 2016-01-28 15:42:14 +00:00
  • 3585437af9 Merge pull request #800 from vector-im/dbkr/guest_warning_bar David Baker 2016-01-28 13:44:09 +00:00
  • 640e87e7c5 Merge pull request #117 from matrix-org/dbkr/guest_warning_bar David Baker 2016-01-28 13:44:06 +00:00
  • 6a36b022e4 New style guest warning bar David Baker 2016-01-28 13:00:44 +00:00
  • 83119d21d6 New style guest warning bar David Baker 2016-01-28 12:59:51 +00:00
  • 37ab225894 Merge pull request #119 from matrix-org/dbkr/own_messages_not_unread David Baker 2016-01-28 12:42:21 +00:00
  • 12463aec4d Merge pull request #115 from matrix-org/kegan/fix-3pid-signup Kegsay 2016-01-28 12:00:06 +00:00
  • bdc1028a7e Support bulk invitations via text separators Kegan Dougal 2016-01-28 11:56:20 +00:00
  • 796a2e5e3a Revert e5f4fa8c46 as it's no longer what's desired. David Baker 2016-01-28 11:15:43 +00:00
  • 7d621d88d8 Your own messages should not count as unread David Baker 2016-01-28 11:12:56 +00:00
  • a4f4bb9e72 Convert RoomView to using a TimelineWindow Richard van der Hoff 2016-01-27 07:54:15 +00:00
  • 81cc30bab2 Null guard because this may not exist in the DOM. Kegan Dougal 2016-01-28 10:52:08 +00:00
  • e017559765 New line Kegan Dougal 2016-01-28 09:58:51 +00:00
  • 58f9210b5a Merge pull request #118 from matrix-org/dbkr/fix_custom_tags_exception David Baker 2016-01-28 09:51:51 +00:00
  • f745e941ec Fix exception thrown if any custom tags are set David Baker 2016-01-28 09:41:46 +00:00
  • 35600f11ad CSS that changes the connection lost bar into a more general 'warning bar' so we can use it for a guest access warning David Baker 2016-01-28 09:19:28 +00:00
  • 7ea45f9888 Move message count to suffix in title, as requested by @ara4n David Baker 2016-01-27 18:02:15 +00:00
  • 74bd28025e Merge pull request #116 from matrix-org/dbkr/no_reg_spinner David Baker 2016-01-27 17:59:03 +00:00
  • e5f4fa8c46 Add warning bar for guest users. Fixes https://github.com/vector-im/vector-web/issues/770 David Baker 2016-01-27 17:58:47 +00:00
  • 4661bb0942 Don't show a spinner while we're waiting for the user to do something David Baker 2016-01-27 15:44:12 +00:00
  • 8360c112fb Put the favicon badge call in a try block, as per comment David Baker 2016-01-27 15:19:25 +00:00