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

Commit Graph

  • 8cb086ef31 use constants for keycodes in RTE Aviral Dasgupta 2016-06-14 19:14:09 +05:30
  • 2606ea9596 fixes and improvements in RichText Aviral Dasgupta 2016-06-14 19:10:35 +05:30
  • 40b1b99c38 underscore prefix internal method David Baker 2016-06-14 14:40:03 +01:00
  • a95d8b5ed6 Move init logic into componentWillMount David Baker 2016-06-14 14:38:45 +01:00
  • 0ef5cc891e Add currentRoomId / Alias to getInitialState David Baker 2016-06-14 14:10:49 +01:00
  • 3547bd8d00 Update for react-sdk dbkr/fix_peeking branch David Baker 2016-06-14 13:02:34 +01:00
  • b8eee08d69 Fix member list vanishing David Baker 2016-06-14 12:56:37 +01:00
  • 094d54b398 Merge pull request #306 from matrix-org/rav/labify_e2e David Baker 2016-06-14 12:00:32 +01:00
  • e973d18085 Hide e2e features if not enabled Richard van der Hoff 2016-06-14 11:57:08 +01:00
  • aaefdf19c5 Fix MatrixChat syntax fail David Baker 2016-06-14 11:57:07 +01:00
  • 11a38fce48 Fix peeking David Baker 2016-06-14 11:37:04 +01:00
  • 34be17cc7e use rte labs setting Aviral Dasgupta 2016-06-14 00:10:43 +05:30
  • 74527a439c Merge branch 'develop' into feature-rte Aviral Dasgupta 2016-06-13 23:57:10 +05:30
  • 3312a4d57e Merge pull request #305 from aviraldg/feature-labs David Baker 2016-06-13 19:24:03 +01:00
  • 5831a68e11 Labs improvements Aviral Dasgupta 2016-06-13 23:25:31 +05:30
  • 727e6daaae Fix key attr placement in UserSettings Aviral Dasgupta 2016-06-13 22:11:21 +05:30
  • c3a9658392 Add experimental "Labs" section to settings Aviral Dasgupta 2016-06-13 22:04:12 +05:30
  • 4bc8ec3e6d room, user, ddg autocomplete providers (wip) Aviral Dasgupta 2016-06-12 17:02:46 +05:30
  • 0df201c483 Merge branch 'develop' into feature-autocomplete Aviral Dasgupta 2016-06-12 14:10:23 +05:30
  • ab1f37b0bb Merge pull request #1 from pferreir/pr/1553 Aviral Dasgupta 2016-06-12 04:55:05 +05:30
  • df69d1de44 Add basic Markdown highlighting Aviral Dasgupta 2016-06-12 04:47:05 +05:30
  • e75a28bb0d Minimal house cleaning Pedro Ferreira 2016-06-12 00:52:30 +02:00
  • 294a8efdc4 Fix behaviour of modifyText Pedro Ferreira 2016-06-12 00:50:30 +02:00
  • 8f45f168d5 Fix highlighting behaviour on switch Pedro Ferreira 2016-06-11 23:51:18 +02:00
  • a5a3e4e915 Basic Markdown highlighting Pedro Ferreira 2016-06-11 23:13:57 +02:00
  • eb37032d8a Markdown: styles for bold/italics Pedro Ferreira 2016-06-12 01:04:22 +02:00
  • c0d7629980 get /commands working again Aviral Dasgupta 2016-06-12 00:11:27 +05:30
  • b960d220d2 cleanup, better comments, markdown hotkeys Aviral Dasgupta 2016-06-11 22:24:09 +05:30
  • f6ed21559a RTE mode switch styling & cleanup Aviral Dasgupta 2016-06-11 15:54:43 +05:30
  • e4217c3fb7 rte improvements, markdown mode Aviral Dasgupta 2016-06-11 15:52:08 +05:30
  • 469c415557 Merge pull request #304 from matrix-org/dbkr/directory_join_by_alias Richard van der Hoff 2016-06-10 15:23:12 +01:00
  • a5986ade51 Merge pull request #1615 from vector-im/dbkr/directory_join_by_alias Richard van der Hoff 2016-06-10 15:23:07 +01:00
  • d7504aeda5 Switch to new view_room David Baker 2016-06-10 15:13:41 +01:00
  • 719928f389 Remove view_room_alias David Baker 2016-06-10 15:12:42 +01:00
  • bf8e56e04c Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-rte Aviral Dasgupta 2016-06-10 04:43:44 +05:30
  • b2459b2dc6 Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte Aviral Dasgupta 2016-06-10 04:43:06 +05:30
  • 819e06e2cd MessageComposer styling for Draft Aviral Dasgupta 2016-06-10 04:41:59 +05:30
  • 4e0720db12 Fix MessageComposerInput.setLastTextEntry Aviral Dasgupta 2016-06-10 00:03:40 +05:30
  • 29cdd1fc41 user and room decorators, history & typing notifs Aviral Dasgupta 2016-06-09 23:53:09 +05:30
  • b7f1a3db57 gitignore config.json now it isn't versioned David Baker 2016-06-09 18:51:25 +01:00
  • b60ab9d695 Remove XXX now it's fixed (yay!) David Baker 2016-06-09 18:50:18 +01:00
  • 72b3ce200d Make the room directory join rooms by alias David Baker 2016-06-09 18:49:06 +01:00
  • a030e46c69 Use join_room_by_alias in RoomDirectory David Baker 2016-06-09 17:13:02 +01:00
  • f61cfbc542 Fix RoomDirectory to join by alias whenever possible. David Baker 2016-06-09 16:41:01 +01:00
  • 049e3a968b Merge pull request #303 from matrix-org/rav/factor_out_createroom David Baker 2016-06-09 11:05:22 +01:00
  • 888c0611e8 Merge pull request #302 from matrix-org/rav/guest_device_spinner David Baker 2016-06-09 11:03:40 +01:00
  • de36aa63fb Factor out common parts of room creation Richard van der Hoff 2016-06-08 23:03:46 +01:00
  • 2352661513 MemberInfo: remove spinner if device query fails Richard van der Hoff 2016-06-08 22:54:48 +01:00
  • 98ef793809 Default IS should be vector.im now David Baker 2016-06-09 10:56:14 +01:00
  • bb405563c8 Fix default servers David Baker 2016-06-09 10:54:56 +01:00
  • ef764c112e Merge pull request #300 from matrix-org/rav/device_verification Richard van der Hoff 2016-06-09 10:44:42 +01:00
  • c4b7571c45 Merge pull request #1612 from vector-im/dbkr/optional_config Richard van der Hoff 2016-06-09 10:40:58 +01:00
  • 7700bb0ed9 Merge pull request #301 from matrix-org/dbkr/optional_config Richard van der Hoff 2016-06-09 10:40:47 +01:00
  • 4dd477e064 index.js: fix comment typo Richard van der Hoff 2016-06-09 10:38:51 +01:00
  • f595f6f141 This check shouldn't be here with the || David Baker 2016-06-09 10:25:49 +01:00
  • 24602119c5 This doesn't actually need to be global David Baker 2016-06-09 09:59:37 +01:00
  • 3040d0a474 Comment typo David Baker 2016-06-09 09:57:44 +01:00
  • e4ea00ca23 Return here, else we'll call resolve too David Baker 2016-06-09 09:56:57 +01:00
  • 4fc311da90 Style fix David Baker 2016-06-09 09:56:11 +01:00
  • 05404efa34 Remove if (this.props.config) David Baker 2016-06-09 09:53:37 +01:00
  • 7894e52529 Merge pull request #1610 from vector-im/rav/device_verification Richard van der Hoff 2016-06-08 21:37:35 +01:00
  • 7999a70cab Switch to dev versions of react-sdk and js-sdk Richard van der Hoff 2016-03-24 17:39:49 +00:00
  • 1dfb3f71ae Merge branch 'develop' into rav/device_verification Richard van der Hoff 2016-06-08 21:34:47 +01:00
  • cab24bb14c Switch matrix-js-sdk back to develop Richard van der Hoff 2016-06-08 21:33:38 +01:00
  • 85770feb31 device verification: use a js-sdk event Richard van der Hoff 2016-06-08 21:25:42 +01:00
  • f6aa9a7ea4 Make the config optional David Baker 2016-06-08 18:46:21 +01:00
  • c123f02842 Make the config optional David Baker 2016-06-08 18:45:46 +01:00
  • 7ce49c752f Wire up events to update UI on device verification Richard van der Hoff 2016-06-08 18:35:43 +01:00
  • b3ae9cc9d4 Merge pull request #1609 from vector-im/dbkr/SdkConfig David Baker 2016-06-08 17:34:18 +01:00
  • b5ff247f09 Merge pull request #299 from matrix-org/dbkr/SdkConfig David Baker 2016-06-08 17:34:10 +01:00
  • 5f29729e82 Make unverified encrypted events red and verified ones green Richard van der Hoff 2016-06-08 17:03:54 +01:00
  • e24851456a CSS for the MemberDeviceInfo view Richard van der Hoff 2016-06-08 17:03:28 +01:00
  • 1616431d27 EventTile: add classes to indicate verifiedness Richard van der Hoff 2016-06-08 17:01:13 +01:00
  • f3e66e6fd2 Add device info to member info Richard van der Hoff 2016-06-08 13:13:41 +01:00
  • 086698cd11 Add device info to user settings Richard van der Hoff 2016-06-08 13:09:07 +01:00
  • 1e40fd750f Don't use SdkConfig David Baker 2016-06-08 14:55:47 +01:00
  • 7e8c8dd336 Remove SdkConfig David Baker 2016-06-08 14:54:34 +01:00
  • 12816c5e1f Explanatory comment David Baker 2016-06-07 22:14:56 +01:00
  • d063735c96 Use variable for key name David Baker 2016-06-07 22:07:23 +01:00
  • 33251e6566 Remove default options that shouldn't be part of this PR David Baker 2016-06-07 22:03:31 +01:00
  • ed1554f4af index.js: fix wording in android popup Richard van der Hoff 2016-06-07 22:01:56 +01:00
  • b54376aa2a Add singleton object to hold SDK configuration David Baker 2016-06-07 21:49:06 +01:00
  • aca0e060a4 Also change velocity-vector commit & requires David Baker 2016-06-07 20:47:37 +01:00
  • 8679ce80c8 Update vector velocity fork package name David Baker 2016-06-07 20:28:38 +01:00
  • a4352dee50 Merge pull request #298 from matrix-org/dbkr/velocity_mem_leak2 David Baker 2016-06-07 19:55:41 +01:00
  • 943d7e18e1 Add _ to internal member David Baker 2016-06-07 19:55:24 +01:00
  • d5a522fdfe Second attempt at fixing the Velocity memory leak David Baker 2016-06-07 18:22:01 +01:00
  • c6cf5febd5 Merge pull request #1516 from vith/static-config-json David Baker 2016-06-06 19:15:35 +01:00
  • f9aaf7d903 Use the SdkConfig interface David Baker 2016-06-06 19:13:30 +01:00
  • 15dccd9871 Handle errors with scalar-oauthing David Baker 2016-06-06 17:55:45 +01:00
  • fdcebe1e56 Merge remote-tracking branch 'origin/develop' into dbkr/scalar David Baker 2016-06-06 17:19:38 +01:00
  • a2e73cceee Merge branch 'develop' into matthew/scalar Matthew Hodgson 2016-06-06 10:24:39 +01:00
  • c672919d1e 0.7.3 v0.7.3 Matthew Hodgson 2016-06-03 12:20:05 +01:00
  • 7ab2449ac1 Prepare changelog for v0.7.3 Matthew Hodgson 2016-06-03 12:20:04 +01:00
  • e68a2b5e1d pin to react sdk 0.6.3 for release Matthew Hodgson 2016-06-03 12:19:04 +01:00
  • 507f5e2ca1 0.6.3 Matthew Hodgson 2016-06-03 12:17:46 +01:00
  • 9e17c0ddd1 Prepare changelog for v0.6.3 Matthew Hodgson 2016-06-03 12:17:45 +01:00
  • f8b3128645 invite input box wording for amandine Matthew Hodgson 2016-06-02 23:33:55 +01:00
  • ddc4ac187c dep on react-sdk develop Matthew Hodgson 2016-06-02 23:32:47 +01:00
  • 1b3c8481f6 fix dialog prompt an embarassing bug where if 3pid invites triggered a dialog they'd get wedged Matthew Hodgson 2016-06-02 21:07:47 +01:00