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

Commit Graph

  • 5a83adc2b6 Merge pull request #414 from matrix-org/rav/fix_device_display_name David Baker 2016-08-12 11:44:57 +01:00
  • b9870f2c23 defaultDeviceDisplayName should be a prop Richard van der Hoff 2016-08-12 11:41:06 +01:00
  • 33e9abe421 Merge pull request #410 from matrix-org/rav/use_server_device_id David Baker 2016-08-12 11:40:55 +01:00
  • 17733a66f9 rename MatrixChat defaultDeviceDisplayName prop Richard van der Hoff 2016-08-12 11:40:25 +01:00
  • 7992042526 Merge pull request #413 from matrix-org/rav/device_display_name David Baker 2016-08-12 11:28:18 +01:00
  • 5fc98ffc49 Avoid setting device_id to 'undefined' Richard van der Hoff 2016-08-12 11:20:09 +01:00
  • 3a819a29b7 Make up a device display name Richard van der Hoff 2016-08-12 11:01:01 +01:00
  • a29325cc46 Set initial_device_display_name on login and register Richard van der Hoff 2016-08-11 16:15:42 +01:00
  • cb905dbaef Merge pull request #409 from matrix-org/rav/device_panel_stuff David Baker 2016-08-12 10:43:44 +01:00
  • 5f61464195 Merge pull request #408 from matrix-org/rav/refactor_matrix_client David Baker 2016-08-12 10:42:58 +01:00
  • 9d77fab18f 0.7.4-r1 David Baker 2016-08-12 10:11:40 +01:00
  • 3650c3f08b Prepare changelog for v0.7.4-r1 David Baker 2016-08-12 10:11:39 +01:00
  • 5512fd4220 Bump to matrix-react-sdk 0.6.4-r1 David Baker 2016-08-12 10:09:53 +01:00
  • 3c8a7e36aa 0.6.4-r1 David Baker 2016-08-12 10:08:15 +01:00
  • 6b1e5dfae7 Prepare changelog for v0.6.4-r1 David Baker 2016-08-12 10:08:14 +01:00
  • 10e41d7a26 changelog David Baker 2016-08-12 10:04:35 +01:00
  • fc0c5a5c58 Tidy up fix to multi-invite David Baker 2016-08-12 10:02:55 +01:00
  • 678393e2bd Add note about file table overflows David Baker 2016-08-12 09:59:56 +01:00
  • df22768f1b Use server-generated deviceId Richard van der Hoff 2016-08-11 14:21:52 +01:00
  • 5440fd7504 Fix tests Richard van der Hoff 2016-08-12 07:27:53 +01:00
  • d1eec57118 fix inviting some more Matthew Hodgson 2016-08-11 17:11:51 -05:00
  • 3bedad69cd unbreak inviting :( Matthew Hodgson 2016-08-11 17:08:17 -05:00
  • 25d8a7999f 0.7.4 David Baker 2016-08-11 17:47:17 +01:00
  • 014f7ade86 Prepare changelog for v0.7.4 David Baker 2016-08-11 17:47:16 +01:00
  • 2b671fcafc js-sdk & react sdk released David Baker 2016-08-11 17:45:10 +01:00
  • 434115ccda Bugifx: 'background-color' in react should be 'backgroundColor' wmwragg 2016-08-11 17:34:05 +01:00
  • 7713f0d587 refactoring out the direct message section wmwragg 2016-08-11 17:32:39 +01:00
  • ec9243d4b0 0.6.4 David Baker 2016-08-11 17:29:10 +01:00
  • 028c652f49 Prepare changelog for v0.6.4 David Baker 2016-08-11 17:29:10 +01:00
  • e4dd387376 JS SDK 0.5.5 released David Baker 2016-08-11 17:28:09 +01:00
  • cc1cec8431 Merge branch 'develop' into wmwragg/direct-chat-sublist wmwragg 2016-08-11 16:48:31 +01:00
  • a07833e7fc Merge branch 'develop' into wmwragg/direct-chat-sublist wmwragg 2016-08-11 16:47:19 +01:00
  • 109184aab7 Merge pull request #411 from matrix-org/dbkr/fix_messagecomposer_style David Baker 2016-08-11 16:47:07 +01:00
  • df5b243e75 Merge pull request #1954 from vector-im/dbkr/fix_messagecomposer_style David Baker 2016-08-11 16:47:00 +01:00
  • 4aea2caefc Initial pass at creating a direct message section wmwragg 2016-08-11 16:45:19 +01:00
  • 5e43f2752a Don't show border on composer when not in RTE mode David Baker 2016-08-11 16:30:53 +01:00
  • 7cb663d39d Only show Autocomplete if autocomplete is enabled David Baker 2016-08-11 16:28:32 +01:00
  • 55a28564b9 Add device_id to devices display Richard van der Hoff 2016-08-11 16:16:53 +01:00
  • e32c325863 Don't use MatrixClientPeg for temporary clients Richard van der Hoff 2016-08-11 13:50:38 +01:00
  • 0cb14ba5ec Don't force scrollbar on multi-invite David Baker 2016-08-11 15:11:00 +01:00
  • d65477891e Merge pull request #1941 from vector-im/wmwragg/room-tag-menu Matthew Hodgson 2016-08-11 09:00:48 -05:00
  • 3704e2c648 Merge pull request #402 from matrix-org/wmwragg/room-tag-menu Matthew Hodgson 2016-08-11 08:59:32 -05:00
  • 4f76398b29 Merge pull request #407 from matrix-org/rav/refactor_guest_registration David Baker 2016-08-11 13:13:51 +01:00
  • e06763d421 Move guest registration into the login logic Richard van der Hoff 2016-08-11 13:05:16 +01:00
  • bb1854814c Merge pull request #1951 from vector-im/dbkr/dont_redirect_email_verify Richard van der Hoff 2016-08-11 12:50:06 +01:00
  • 9e15bda803 comment typo Richard van der Hoff 2016-08-11 12:49:57 +01:00
  • e7ac66ad04 Don't redirect to mobile app if verifying 3pid David Baker 2016-08-11 12:44:49 +01:00
  • 4a0a911f3b Merge pull request #1950 from vector-im/rav/clear_test_localstorage David Baker 2016-08-11 12:34:37 +01:00
  • 4780f9000d Merge pull request #403 from matrix-org/dbkr/multi_invite David Baker 2016-08-11 12:34:16 +01:00
  • 7286aeb013 Merge pull request #1942 from vector-im/dbkr/multi_invite David Baker 2016-08-11 12:34:13 +01:00
  • f42d619e7d Missing comma David Baker 2016-08-11 12:30:37 +01:00
  • 244265d52b Make sure that we clear localstorage before *all* tests Richard van der Hoff 2016-08-11 11:40:40 +01:00
  • 5b71b28dcf Fix member info David Baker 2016-08-11 11:34:14 +01:00
  • ab93e96a1f Merge pull request #1947 from vector-im/rav/token_login_tests David Baker 2016-08-11 11:16:27 +01:00
  • 3b317eb15d Merge pull request #406 from matrix-org/rav/refactor_token_login David Baker 2016-08-11 11:09:05 +01:00
  • bbfb9291f8 Refactor login token Richard van der Hoff 2016-08-11 11:00:15 +01:00
  • 5a17d8b450 Merge pull request #1946 from vector-im/rav/rav/refactor_token_login David Baker 2016-08-11 10:52:32 +01:00
  • 6802db05bd Merge pull request #405 from matrix-org/rav/use_right_hs_for_guest_login David Baker 2016-08-11 10:32:37 +01:00
  • 46899a0086 Merge pull request #395 from aviraldg/fix-emoji David Baker 2016-08-11 10:23:00 +01:00
  • 43e3662e60 Merge pull request #1935 from aviraldg/fix-emoji David Baker 2016-08-11 10:22:46 +01:00
  • 19d5063814 Merge branch 'develop' into fix-emoji Aviral Dasgupta 2016-08-09 22:22:48 +05:30
  • 806477dcce s/then/done/ David Baker 2016-08-11 10:08:14 +01:00
  • a58a6275e5 Just use _canceled David Baker 2016-08-11 10:06:22 +01:00
  • 4c1dcb924b reskindex and use sdk.getComponent for EmojiText Aviral Dasgupta 2016-08-11 07:55:12 +05:30
  • da7a556629 More tests for the loading process: Richard van der Hoff 2016-08-11 02:00:27 +01:00
  • c2cb4dff4c Support for refactored login token handling Richard van der Hoff 2016-08-11 01:55:51 +01:00
  • 1fbddcf6af Use the current HS for guest login Richard van der Hoff 2016-08-11 01:30:43 +01:00
  • 5b9d395234 Yet another fix to session saving Richard van der Hoff 2016-08-11 00:58:48 +01:00
  • a85259c2b7 Fix session persistence Richard van der Hoff 2016-08-10 23:52:09 +01:00
  • dd6868c255 Fix joining test Richard van der Hoff 2016-08-10 22:39:53 +01:00
  • cab95f43ff Show cancel button whilst inviting is in progress David Baker 2016-08-10 18:58:36 +01:00
  • d6f7358f81 Make completionStates an object David Baker 2016-08-10 18:50:56 +01:00
  • fa498eb8c6 Comment typo David Baker 2016-08-10 18:37:21 +01:00
  • 6b3b2e30fe Don't reset completionStates David Baker 2016-08-10 18:36:33 +01:00
  • b9f0b72ae1 Missing proptypes David Baker 2016-08-10 18:35:59 +01:00
  • b411a2e489 Merge remote-tracking branch 'origin/develop' into dbkr/multi_invite David Baker 2016-08-10 18:35:36 +01:00
  • 020e4e14df Factor out single-invite David Baker 2016-08-10 18:32:42 +01:00
  • 4a6a9bd95b Remove redundant setState David Baker 2016-08-10 18:28:20 +01:00
  • bb3a0ff08a Merge pull request #404 from matrix-org/dbkr/fix_settings_persistence Richard van der Hoff 2016-08-10 18:19:18 +01:00
  • 92762eca74 Fix settings resetting on refresh David Baker 2016-08-10 18:04:22 +01:00
  • 28343aaa33 Aignment tweak for the room tag menu so the icons better align wmwragg 2016-08-10 17:44:49 +01:00
  • 3f615c6664 Basic CSS for multi-invite dialog David Baker 2016-08-10 17:12:20 +01:00
  • 54b3638a85 Better support for inviting multiple people David Baker 2016-08-10 17:11:49 +01:00
  • 6d1eebe6f2 Resized the avatar back to 24px, from 25px, as it has to be even so that the Text avatar aligns vertically correctly wmwragg 2016-08-10 17:01:06 +01:00
  • 804b17fbf1 Teaks to the CSS for the new ellipsis icon, and resizing the avatar back to 24px from 25px, as needs to be even number for the Text letter to align vertically wmwragg 2016-08-10 17:00:06 +01:00
  • 9798e14733 Menu colour now changeable, and leave room item hooked up. Some additional CSS tweaks to fit current design changes wmwragg 2016-08-10 16:35:22 +01:00
  • e2d3631e7c Menu colour now changeable, and leave room item hooked up wmwragg 2016-08-10 16:34:49 +01:00
  • b742342062 Merge pull request #1938 from vector-im/rav/more_loading_tests Richard van der Hoff 2016-08-10 16:02:01 +01:00
  • f08519a496 Merge pull request #401 from matrix-org/rav/avoid_login_for_guest David Baker 2016-08-10 15:38:34 +01:00
  • 839b985289 Merge pull request #400 from matrix-org/rav/cancel_rate_limited_funcs David Baker 2016-08-10 15:37:02 +01:00
  • f8fa19ed47 Room tag menu dohickey on the avatar on hover wmwragg 2016-08-10 15:04:02 +01:00
  • 667264420c hover state elements for the room tag menu, allong with CSS class updates wmwragg 2016-08-10 14:46:05 +01:00
  • fe4bb3e413 More app-loading tests Richard van der Hoff 2016-08-10 14:37:30 +01:00
  • 68f8db3834 Avoid flashing up login screen during guest registration Richard van der Hoff 2016-08-10 14:34:44 +01:00
  • 8fe470bce1 Cancel calls to rate-limited funcs on unmount Richard van der Hoff 2016-08-10 13:39:47 +01:00
  • 6aa5e5a493 Merge pull request #399 from matrix-org/rav/refactor_session_rehydration David Baker 2016-08-10 12:56:01 +01:00
  • 0bcc4a6bad Merge pull request #398 from matrix-org/dbkr/hide_integrations_header Richard van der Hoff 2016-08-10 12:06:12 +01:00
  • ff13782ab5 Added set icons wmwragg 2016-08-10 12:06:03 +01:00
  • 3922f6a1b7 Move rehydration of MatrixClients from MatrixClientPeg to SessionLoader Richard van der Hoff 2016-08-10 10:33:27 +01:00
  • b7b0991ae9 Don't show integrations header if setting not on David Baker 2016-08-10 11:51:51 +01:00