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

Commit Graph

  • 548c392236 PR feedback David Baker 2016-06-28 14:59:45 +01:00
  • c016eb78c8 Fix user links David Baker 2016-06-28 14:28:05 +01:00
  • 486adb717b Merge pull request #1670 from Half-Shot/patch-1 Matthew Hodgson 2016-06-24 19:16:50 +01:00
  • 98c03869a7 Display an error message if room not found David Baker 2016-06-24 15:34:07 +01:00
  • 1c280badde Increase timeout on TimelinePanel test David Baker 2016-06-23 18:36:44 +01:00
  • 773f592c3f Merge pull request #1688 from vector-im/rav/device_blocking David Baker 2016-06-23 18:24:40 +01:00
  • b01b786dfc Merge pull request #324 from matrix-org/rav/device_blocking David Baker 2016-06-23 18:24:21 +01:00
  • 2ca9d87b95 CSS for device blocking Richard van der Hoff 2016-06-23 17:32:33 +01:00
  • a1dd427420 Implement device blocking Richard van der Hoff 2016-06-23 17:27:23 +01:00
  • dc50a0f24a Add logging to TimelinePanel test David Baker 2016-06-23 16:20:40 +01:00
  • 5cda2a6802 Disable colour output in jenkins script David Baker 2016-06-23 14:38:08 +01:00
  • e046f5359f CreateRoom: remove reference to encryption module Richard van der Hoff 2016-06-23 14:08:45 +01:00
  • 0df6209a57 Merge pull request #322 from matrix-org/rav/remove_encrypt_command David Baker 2016-06-23 13:41:18 +01:00
  • cdaf317f1d Merge pull request #321 from matrix-org/rav/encrypt_room_setting Richard van der Hoff 2016-06-23 13:40:30 +01:00
  • 6283b200fb Remove /encrypt command Richard van der Hoff 2016-06-23 13:21:55 +01:00
  • 38a1a0b30f Merge pull request #320 from matrix-org/rav/fix_room_setting_warnings David Baker 2016-06-23 12:46:01 +01:00
  • 3a21958faf RoomSettings: add encryption setting Richard van der Hoff 2016-06-23 12:21:31 +01:00
  • 7a7d7c0e02 Fix a pair of warnings from RoomSettings Richard van der Hoff 2016-06-23 11:15:55 +01:00
  • 4bc4292ceb Rooms may not have aliases David Baker 2016-06-23 11:12:25 +01:00
  • e741226c02 Merge pull request #319 from matrix-org/rav/room_power_levels David Baker 2016-06-23 10:43:58 +01:00
  • a04f03669c RoomSettings: refactor permissions calculations Richard van der Hoff 2016-06-23 10:36:16 +01:00
  • cbb72c2f29 Merge pull request #1685 from vector-im/dbkr/fix_room_directory David Baker 2016-06-23 10:21:03 +01:00
  • 5f477b313b Unused variable David Baker 2016-06-23 10:20:11 +01:00
  • d45e44d01c Fix joining rooms by typing the alias David Baker 2016-06-23 10:11:46 +01:00
  • c12839dc7b Merge pull request #1680 from vector-im/dbkr/delete_alias Richard van der Hoff 2016-06-22 17:25:27 +01:00
  • c35c9f7c3a PR feedback David Baker 2016-06-22 16:20:06 +01:00
  • ff5c7072d7 Mark the room as private (unlisted) too David Baker 2016-06-22 14:52:55 +01:00
  • 5195140ff8 reposition Login spinner Matthew Hodgson 2016-06-21 19:50:03 +01:00
  • eca453ee5a reposition Login spinner Matthew Hodgson 2016-06-21 19:49:55 +01:00
  • 2ddfccdab3 Merge pull request #318 from matrix-org/dbkr/fix_default_hs Richard van der Hoff 2016-06-21 17:55:27 +01:00
  • d3265ab970 Redundant getDeafultHs() David Baker 2016-06-21 17:46:55 +01:00
  • 801a2c0647 Merge pull request #317 from matrix-org/dbkr/fix_slash_join Richard van der Hoff 2016-06-21 17:07:43 +01:00
  • ad2541299f Add ability to delete an alias from room directory David Baker 2016-06-21 16:47:40 +01:00
  • dc840fdf48 updated selection styling Aviral Dasgupta 2016-06-21 19:02:18 +05:30
  • a74db3a815 Get basic keyboard selection working Aviral Dasgupta 2016-06-21 18:33:39 +05:30
  • fb6eec0f7d Hide/show autocomplete based on selection state Aviral Dasgupta 2016-06-21 15:46:20 +05:30
  • 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