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

Commit Graph

  • 213e284edf Fix https://github.com/vector-im/vector-web/issues/1679 David Baker 2016-06-21 11:05:37 +01:00
  • f6a76edfdf Fuzzy matching in User and Room providers Aviral Dasgupta 2016-06-21 05:05:23 +05:30
  • 510bb5785e Merge branch 'develop' into feature-autocomplete Aviral Dasgupta 2016-06-21 04:09:23 +05:30
  • 442291c0a4 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-autocomplete Aviral Dasgupta 2016-06-21 04:09:22 +05:30
  • fc06ebcc63 Fix view_next_room David Baker 2016-06-20 18:43:56 +01:00
  • 4c214119b2 Fix PR feedback David Baker 2016-06-20 18:05:58 +01:00
  • 4d5fbfc5b1 Remove now unused MatrixTools.GetRoomForAlias David Baker 2016-06-20 17:11:46 +01:00
  • d8dedae084 Fix /join to be consistent with the other code David Baker 2016-06-20 16:30:51 +01:00
  • 9556795611 Merge pull request #1678 from vector-im/rav/olmify_develop_again David Baker 2016-06-20 15:28:06 +01:00
  • 4c6fa740f3 package.json: add olm as optionalDependency Richard van der Hoff 2016-06-20 15:10:19 +01:00
  • f4a3e9a39b Merge pull request #1675 from vector-im/rav/olmify_develop David Baker 2016-06-20 14:38:00 +01:00
  • bb820bebd1 README: fix some lies Richard van der Hoff 2016-06-20 10:52:56 +01:00
  • 664f809362 webpack: Use require to look for olm Richard van der Hoff 2016-06-20 10:47:16 +01:00
  • 034c045b37 Styling for autocomplete Aviral Dasgupta 2016-06-20 13:53:18 +05:30
  • 4af983ed90 Style changes and improvements in autocomplete Aviral Dasgupta 2016-06-20 13:52:55 +05:30
  • 4dfb0e9a90 Merge branch 'develop' into matthew/scalar Matthew Hodgson 2016-06-19 22:40:58 +01:00
  • 94aec10512 Merge branch 'develop' into dbkr/scalar Matthew Hodgson 2016-06-19 22:40:48 +01:00
  • 654429dbdb improve wording on 'search room names' Matthew Hodgson 2016-06-18 21:12:32 +01:00
  • c7d0214aaa #1664 Set a maximum height for codeblocks Will Hunt 2016-06-18 12:21:34 +01:00
  • 607923b58f Fix test since we peek by room ID, not alias David Baker 2016-06-17 17:49:11 +01:00
  • 8103a795ec Merge pull request #316 from matrix-org/rav/fix_react_version_number David Baker 2016-06-17 17:13:35 +01:00
  • f6835baa9c UserSettings: fix the displayed version of the react-sdk Richard van der Hoff 2016-06-17 17:09:52 +01:00
  • 1d42443c0c Merge pull request #314 from matrix-org/dbkr/show_canonical_alias Richard van der Hoff 2016-06-17 17:03:18 +01:00
  • aa67e33744 Merge pull request #313 from matrix-org/dbkr/roomview_tests Richard van der Hoff 2016-06-17 17:02:02 +01:00
  • 895fb63d5d Merge pull request #1661 from vector-im/rav/unverify_device David Baker 2016-06-17 17:00:26 +01:00
  • 4f96bd1b01 Merge pull request #315 from matrix-org/rav/unverify_device David Baker 2016-06-17 17:00:12 +01:00
  • b172018d08 Merge pull request #1660 from vector-im/rav/crypto_css_fix David Baker 2016-06-17 16:58:47 +01:00
  • 6adce649eb Use the first alias is there's no canonical alias David Baker 2016-06-17 16:56:34 +01:00
  • 95a0bc92d6 CSS for unverify button Richard van der Hoff 2016-06-09 19:08:31 +01:00
  • ad00abe9c0 Support for making devices unverified Richard van der Hoff 2016-06-09 19:07:01 +01:00
  • a90492e393 fix CSS Matthew Hodgson 2016-06-09 11:49:55 -07:00
  • 53d92df6f8 Set up / teardown container div in before/afterEach David Baker 2016-06-17 15:50:13 +01:00
  • b2f0ed09ab Sort alphabetically (and name consistently) David Baker 2016-06-17 15:46:31 +01:00
  • 3b5378fa53 Show canonical alias in URL bar David Baker 2016-06-17 15:17:45 +01:00
  • d3a463e9ac restore the room header too David Baker 2016-06-17 12:23:45 +01:00
  • b0bf24c136 Comment David Baker 2016-06-17 12:22:16 +01:00
  • 1fbf027a40 Some basic tests for RoomView David Baker 2016-06-17 12:20:26 +01:00
  • ec7067e7bd Autocomplete style Aviral Dasgupta 2016-06-17 04:58:39 +05:30
  • b9d7743e5a Emoji provider, DDG working, style improvements Aviral Dasgupta 2016-06-17 04:58:09 +05:30
  • 769b3f0c2a Merge branch 'develop' into feature-autocomplete Aviral Dasgupta 2016-06-17 00:37:39 +05:30
  • 42b7410a5d Merge pull request #1652 from vector-im/rav/fix_karma_olm_warning David Baker 2016-06-16 11:16:00 +01:00
  • 624e34c48a Merge pull request #312 from matrix-org/rav/eventlistnener_warning David Baker 2016-06-16 11:15:08 +01:00
  • 4cfcdfa040 Merge pull request #1639 from vector-im/dbkr/fix_peeking Richard van der Hoff 2016-06-16 11:13:29 +01:00
  • 0cc4497ef0 Merge pull request #307 from matrix-org/dbkr/fix_peeking Richard van der Hoff 2016-06-16 11:13:20 +01:00
  • 3e44d7307f Fix eventListener warning Richard van der Hoff 2016-06-16 08:06:12 +01:00
  • 721ae68aa4 Merge pull request #311 from aviraldg/fix-rte-history David Baker 2016-06-16 10:16:41 +01:00
  • 8b1332cd29 Use different keys for new MessageComposerInput Aviral Dasgupta 2016-06-16 14:41:12 +05:30
  • 795986f146 Karma: fix warning by ignoring olm Richard van der Hoff 2016-06-16 07:39:34 +01:00
  • d38c338f89 Merge pull request #1641 from vector-im/dbkr/update_readme Richard van der Hoff 2016-06-15 17:10:02 +01:00
  • 6ae3276c46 Merge pull request #310 from aviraldg/fix-rte-escape David Baker 2016-06-15 16:06:04 +01:00
  • 56ac1ed0c0 update comment Aviral Dasgupta 2016-06-15 20:34:37 +05:30
  • 8b8deb86ed Fix RTE escaping, HTML output with breaks Aviral Dasgupta 2016-06-15 20:24:37 +05:30
  • a373849b5b Give better instructions for modifying config. David Baker 2016-06-15 11:03:52 +01:00
  • 8fd8847890 Merge pull request #308 from aviraldg/feature-rte-improvements David Baker 2016-06-14 19:49:13 +01:00
  • 3f1b57b35b Fix cursor bug, persist editor mode & rte default Aviral Dasgupta 2016-06-15 00:13:34 +05:30
  • 8cd4637316 Merge pull request #1643 from vector-im/dbkr/fix_karma Richard van der Hoff 2016-06-14 16:38:14 +01:00
  • 0635a6f562 Fix karma tests David Baker 2016-06-14 16:32:07 +01:00
  • a8cee87c08 js-sdk doesn't have a build step David Baker 2016-06-14 15:53:13 +01:00
  • a7598ea815 Mention copying sample file here too David Baker 2016-06-14 15:52:03 +01:00
  • 22cef7a6a0 Copy config.json first David Baker 2016-06-14 15:41:55 +01:00
  • 5199cd04a2 Merge pull request #292 from aviraldg/feature-rte David Baker 2016-06-14 15:27:39 +01:00
  • e507339324 Merge pull request #1553 from aviraldg/feature-rte David Baker 2016-06-14 15:27:35 +01:00
  • b643d8ff6a Update README.md David Baker 2016-06-14 15:12:35 +01:00
  • ba69e4365d more RTE fixes Aviral Dasgupta 2016-06-14 19:28:51 +05:30
  • 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