Commit Graph

  • 46d306a217 Change register response access_token to scalar_token Luke Barnard 2016-08-17 17:16:19 +01:00
  • 69e8cb6f44 Merge branch 'rav/no_deviceload_if_disabled' into develop Richard van der Hoff 2016-08-17 14:41:18 +01:00
  • 0356f04b9c MemberInfo: initialise _enableDevices in componentWillMount Richard van der Hoff 2016-08-17 14:40:10 +01:00
  • e173900808 Update autocomplete design and scroll it correctly Aviral Dasgupta 2016-08-17 17:27:19 +05:30
  • 9a7f5388d9 Update autocomplete design Aviral Dasgupta 2016-08-17 17:27:01 +05:30
  • 30168a1b9c Don't download E2E devices if feature disabled Richard van der Hoff 2016-08-17 09:57:06 +01:00
  • d1649771cc Images now slighlty set in so they don't appear under the context button, and give a margin to the right of the image wmwragg 2016-08-16 17:41:54 +01:00
  • 08e5f61b10 Image button now has cursor set to pointer wmwragg 2016-08-16 17:41:09 +01:00
  • 52f5061cc5 Made the menu button a clickable image rather than an input element wmwragg 2016-08-16 17:34:33 +01:00
  • 012f085f33 alignment tweaks and persistent highlight when meni clicked, plus menu button no longer an input item wmwragg 2016-08-16 17:33:37 +01:00
  • 9f570152e5 Altered message composer size to match that of the message timeline messages wmwragg 2016-08-16 16:20:38 +01:00
  • 3099ef68a9 Added linked message styling wmwragg 2016-08-16 16:17:15 +01:00
  • 58d9789645 Increase main avatar size wmwragg 2016-08-16 16:03:34 +01:00
  • f0bac3a3b0 Design tweaks wmwragg 2016-08-16 16:03:10 +01:00
  • cd0ed879e3 Make the slider work David Baker 2016-08-16 15:54:28 +01:00
  • 95418089f3 Updating timestamp format wmwragg 2016-08-16 15:01:25 +01:00
  • 8e8e6fd5fe formatTime for use with new timestamp format wmwragg 2016-08-16 15:01:01 +01:00
  • c359358101 Initial context menu positioning and style change wmwragg 2016-08-16 11:59:26 +01:00
  • 650a0f1c1f Added context button, and initial highlighting and readReceipts positioning wmwragg 2016-08-16 11:58:52 +01:00
  • 757e885abc Initial reposition of the read avatars wmwragg 2016-08-16 10:59:04 +01:00
  • 6fd61f5816 Initial reposition of the timestamp wmwragg 2016-08-16 10:26:27 +01:00
  • 2c8e7782c5 Initial reposition of the timestamp wmwragg 2016-08-16 10:26:14 +01:00
  • bdfc7d069d Merge pull request #417 from aviraldg/fix-574-again Matthew Hodgson 2016-08-15 23:24:33 +01:00
  • 8777780928 strip (IRC) suffix from tabcomplete entries Aviral Dasgupta 2016-08-16 03:50:59 +05:30
  • ff39d52431 add fancy changelog dialog Aviral Dasgupta 2016-08-16 03:31:02 +05:30
  • d3eccc1d6f add rel='noopener' wherever we do target='_blank' because https://mathiasbynens.github.io/rel-noopener/ Matthew Hodgson 2016-08-15 21:37:37 +01:00
  • 2a3b0e85ea add rel='noopener' wherever we do target='_blank' because https://mathiasbynens.github.io/rel-noopener/ Matthew Hodgson 2016-08-15 21:37:26 +01:00
  • a94d415106 Merge pull request #415 from matrix-org/matthew/ignore-local-busy David Baker 2016-08-15 17:13:58 +01:00
  • 534d996582 ignore local busy - workaround for https://github.com/vector-im/vector-web/issues/1964 Matthew Hodgson 2016-08-15 16:17:35 +01:00
  • 40aee5b03d Merge pull request #1966 from vector-im/rav/use_cpx_to_copy_olm David Baker 2016-08-15 13:10:27 +01:00
  • 4c9ade5ecb Use cpx to copy olm.js, and add watcher Richard van der Hoff 2016-08-15 12:16:08 +01:00
  • 1d435890af Unpin react-sdk and js-sdk Richard van der Hoff 2016-08-15 12:15:24 +01:00
  • 8a2b2daad7 Revert "Unpin react-sdk and js-sdk" Richard van der Hoff 2016-08-15 12:13:58 +01:00
  • 21334cab28 Unpin react-sdk and js-sdk Richard van der Hoff 2016-08-15 12:11:35 +01:00
  • a17df609f3 Read all 4 different notif states David Baker 2016-08-12 15:19:34 +01:00
  • 0afdf5d8e4 Merge pull request #1959 from vector-im/rav/device_display_name David Baker 2016-08-12 11:48:12 +01:00
  • 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 v0.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 v0.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