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

Commit Graph

  • 3930720127 Translated using Weblate (Malayalam) Pirate Praveen Arimbrathodiyil 2017-07-07 19:11:10 +00:00
  • ae2f1ff382 Translated using Weblate (Malayalam) നിദര്‍ശ് 2017-07-07 19:10:37 +00:00
  • 5ce3d5dc36 Translated using Weblate (Malayalam) Pirate Praveen Arimbrathodiyil 2017-07-07 19:09:06 +00:00
  • 4218308bef Merge pull request #1200 from matrix-org/luke/fix-invite-sync-type-error Luke Barnard 2017-07-07 20:03:26 +01:00
  • 62ee0f4e02 Fix accepting invites Luke Barnard 2017-07-07 19:43:30 +01:00
  • 9a272d4965 Only allow completion of emoji in certain circumstances Luke Barnard 2017-07-07 19:02:51 +01:00
  • 5f5a802b44 Add CSS from react-sdk PR feedback David Baker 2017-07-07 18:34:57 +01:00
  • 1e713557bb PR feedback David Baker 2017-07-07 18:34:40 +01:00
  • f2d243443b Suppress more errors from spurious postMessage calls on the demo instance Kegan Dougal 2017-07-07 17:44:25 +01:00
  • ea68cca233 Translated using Weblate (German) zottel 2017-07-07 07:33:42 +00:00
  • 0792c9a555 Merge pull request #1198 from matrix-org/luke/fix-rte-auto-complete-stuck David Baker 2017-07-07 16:11:56 +01:00
  • 7a8f524f4a Remove two possible sources for the "AutoComplete stays visible bug Luke Barnard 2017-07-07 15:30:31 +01:00
  • 82ee0d4106 Translated using Weblate (Telugu) Sri Lakshmi 2017-07-07 14:02:54 +00:00
  • 681fd512d7 Lint David Baker 2017-07-07 13:46:05 +01:00
  • c1833f9833 Merge remote-tracking branch 'origin/dbkr/my_groups' into dbkr/groups_better_groupview David Baker 2017-07-07 13:44:35 +01:00
  • 052f9effc1 Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview David Baker 2017-07-07 12:02:38 +01:00
  • c21f90338d Merge remote-tracking branch 'origin/develop' into dbkr/groups_better_groupview David Baker 2017-07-07 12:02:15 +01:00
  • b420a8389d Merge pull request #1197 from matrix-org/dbkr/my_groups_withMatrixClient Luke Barnard 2017-07-07 11:47:13 +01:00
  • bc8c2d442b WithMatrixClient -> withMatrixClient David Baker 2017-07-07 11:34:20 +01:00
  • e970b68859 Merge pull request #1194 from matrix-org/rxl881/apps Richard Lewis 2017-07-07 11:28:39 +01:00
  • d1eab75cfc Trigger rebuild Richard Lewis 2017-07-07 11:15:13 +01:00
  • fea0a941ce Fix lint David Baker 2017-07-07 11:01:54 +01:00
  • 3b439d4bb2 Empty commit David Baker 2017-07-07 10:50:03 +01:00
  • b4602fd2b1 Comment David Baker 2017-07-07 10:49:19 +01:00
  • 43bdc04637 Merge remote-tracking branch 'origin/develop' into dbkr/my_groups David Baker 2017-07-07 10:47:41 +01:00
  • 183f45bc1f Fix lint errors David Baker 2017-07-07 10:41:59 +01:00
  • 45986306cc Merge remote-tracking branch 'origin/develop' into dbkr/my_groups David Baker 2017-07-07 10:32:37 +01:00
  • 28c0daf51d Merge pull request #1148 from matrix-org/erikj/group_server David Baker 2017-07-07 10:31:14 +01:00
  • 8df6deee23 Empty commit David Baker 2017-07-07 10:23:20 +01:00
  • 1deb406294 Fix race David Baker 2017-07-07 10:08:29 +01:00
  • 32a01b54b8 Merge branch 'develop' into erikj/group_server Luke Barnard 2017-07-07 10:08:49 +01:00
  • 0a1647e5c6 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps Richard Lewis 2017-07-07 09:48:24 +01:00
  • b414db06e0 Translated using Weblate (German) Bamstam 2017-07-07 07:08:34 +00:00
  • 700672b6ec Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-06 21:04:36 +00:00
  • e36899c30f Merge pull request #4442 from vector-im/erikj/group_server Luke Barnard 2017-07-06 22:04:30 +01:00
  • 7fdbec4046 Merge pull request #1195 from matrix-org/luke/fix-rte-emoji-suggestions2 Luke Barnard 2017-07-06 21:59:44 +01:00
  • e04f34a202 More CSS for group view David Baker 2017-07-06 19:14:12 +01:00
  • fa37d03db6 Improve the Group View page David Baker 2017-07-06 19:13:14 +01:00
  • 0a4f8ffead Alter EMOJI_REGEX to include end of string ($) Luke Barnard 2017-07-06 18:11:46 +01:00
  • 282b63d0cf Merge pull request #1193 from matrix-org/luke/fix-create-room-preview David Baker 2017-07-06 17:58:30 +01:00
  • a921059432 Fix vector-im/riot-web#4526 by pretending to join Luke Barnard 2017-07-06 17:40:27 +01:00
  • d091550ccb Use app ID for element key and pass screen parameter to scalar. Richard Lewis 2017-07-06 15:59:59 +01:00
  • d34164ec49 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-06 13:08:42 +00:00
  • fc5ce7fb61 Merge pull request #4525 from vector-im/t3chguy/markdown_allow_u Luke Barnard 2017-07-06 14:08:37 +01:00
  • 6404f7603c Merge pull request #1192 from matrix-org/t3chguy/markdown_allow_u Luke Barnard 2017-07-06 14:08:01 +01:00
  • d9a67355d2 Merge pull request #1190 from matrix-org/luke/fix-rte-paste-html-md-on Luke Barnard 2017-07-06 13:59:52 +01:00
  • ff7ae5b995 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/markdown_allow_u Michael Telatynski 2017-07-06 13:56:20 +01:00
  • 2aa5a3a09c Merge pull request #1191 from matrix-org/t3chguy/room-settings-unban-no-pl Luke Barnard 2017-07-06 13:54:52 +01:00
  • a8d5f7d5eb remove unused class Michael Telatynski 2017-07-06 13:53:17 +01:00
  • fcd8321a63 Allow underline through MD and in RTE (MD) using <u> which works with CM Michael Telatynski 2017-07-06 13:49:13 +01:00
  • 6149b37245 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/room-settings-unban-no-pl Michael Telatynski 2017-07-06 13:30:40 +01:00
  • c6d9ec42a2 only show unban button in RoomSettings if user has sufficient PL to do so Michael Telatynski 2017-07-06 12:51:55 +01:00
  • bdefb35c64 Only insert HTML into the composer in RTE mode Luke Barnard 2017-07-06 11:52:02 +01:00
  • 3e93930dcc Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into develop Luke Barnard 2017-07-06 11:18:10 +01:00
  • 6b6af3f148 Remove RTE content_state logging Luke Barnard 2017-07-06 11:17:54 +01:00
  • c29863362f Merge pull request #1189 from matrix-org/rav/fix_duplicate_preview_key Richard van der Hoff 2017-07-06 11:08:03 +01:00
  • 4f8d9d869e mention preserving ordering in comment Richard van der Hoff 2017-07-06 10:47:15 +01:00
  • 42ba3ff410 Linting Kegan Dougal 2017-07-06 10:44:32 +01:00
  • efa0184034 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-06 09:27:31 +00:00
  • 0796b304cc Merge pull request #4466 from vector-im/luke/css-rte-improvements Luke Barnard 2017-07-06 10:27:25 +01:00
  • 6a2d6b2e6e Fix a React duplicate key error Richard van der Hoff 2017-07-06 10:02:25 +01:00
  • e0e321783b Append the scalar_token to the widget URL if the widget URL is a scalar URL (#1182) Kegsay 2017-07-06 09:28:48 +01:00
  • 0bf1124f1b Merge pull request #1181 from matrix-org/luke/fix-rte-draft-persist Luke Barnard 2017-07-05 18:24:28 +01:00
  • 7f1d8e3c90 Merge pull request #1188 from matrix-org/luke/feature-rte-visual-bell Luke Barnard 2017-07-05 18:23:10 +01:00
  • 3d167d8a27 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-05 17:22:13 +00:00
  • d4435daf31 Merge pull request #4516 from vector-im/luke/css-visual-bell Luke Barnard 2017-07-05 18:22:09 +01:00
  • 14ddf4e2aa Merge pull request #1187 from matrix-org/luke/fix-rte-emoji-filter-supported Luke Barnard 2017-07-05 18:21:50 +01:00
  • 29e793f591 Merge pull request #1180 from matrix-org/luke/fix-rte-force-immediately Luke Barnard 2017-07-05 18:20:48 +01:00
  • 89d0ec4de8 Merge pull request #1179 from matrix-org/luke/fix-query-matcher-empty-query Luke Barnard 2017-07-05 18:20:25 +01:00
  • d78168d407 Add visual feedback for when there are no completions available Luke Barnard 2017-07-05 18:14:22 +01:00
  • 07e8d4ef69 Add visual bell animation for RTE Luke Barnard 2017-07-05 18:13:23 +01:00
  • 2de4dd7b71 Filter out unsupported emoji from the emoji meta data Luke Barnard 2017-07-05 17:09:16 +01:00
  • b52a6a693a Merge pull request #1186 from matrix-org/rav/startup_logging Richard van der Hoff 2017-07-05 16:29:03 +01:00
  • a20ed2f632 Add some logging to track down flaky test Richard van der Hoff 2017-07-05 16:20:21 +01:00
  • 769752e0b3 Merge pull request #1185 from matrix-org/rav/fix_reactsdk_build Richard van der Hoff 2017-07-05 15:58:05 +01:00
  • 458e0a38bc Run the riot-web tests against js-sdk develop Richard van der Hoff 2017-07-05 15:43:33 +01:00
  • b32cb174a9 Merge pull request #1184 from matrix-org/rav/chrome_headless Richard van der Hoff 2017-07-05 15:20:08 +01:00
  • 0eb979ab68 Merge pull request #1183 from matrix-org/luke/fix-new-dm Luke Barnard 2017-07-05 15:04:19 +01:00
  • b3db6344ae Fix import for Rooms so that DMs can be created Luke Barnard 2017-07-05 15:00:50 +01:00
  • 5c9d3edec4 Revert #1170, fde7d5eaf4 Luke Barnard 2017-07-05 14:46:00 +01:00
  • f69033c907 Use headless chrome instead of phantomjs for tests Richard van der Hoff 2017-07-05 14:39:02 +01:00
  • 167ce88a80 Rewrite ScrollPanel test Richard van der Hoff 2017-07-05 14:34:25 +01:00
  • e8c8a0a2c8 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-05 13:00:08 +00:00
  • 8daa0fced8 Merge pull request #4502 from vector-im/luke/fix-rte-autocomplete-truncate Luke Barnard 2017-07-05 14:00:02 +01:00
  • 65a160f24a Merge branch 'develop' into luke/fix-rte-autocomplete-truncate Luke Barnard 2017-07-05 13:45:06 +01:00
  • 04fd29c8b7 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-05 12:42:58 +00:00
  • 43a70c2bfb Merge pull request #4512 from vector-im/rav/chrome_headless Richard van der Hoff 2017-07-05 13:42:52 +01:00
  • df23a6cd85 Use Object.assign to set initial state of MessageComposerStore Luke Barnard 2017-07-05 13:38:34 +01:00
  • 3d5b3ed7ad Use ContentState instead and persist over localStorage Luke Barnard 2017-07-05 11:49:34 +01:00
  • a14bc9a9b1 README: minor fixes Richard van der Hoff 2017-07-05 11:47:38 +01:00
  • ba0073ca71 README: Add notes on running tests Richard van der Hoff 2017-07-05 11:45:23 +01:00
  • 3b06db0725 Pass with, height & resizeMethod through David Baker 2017-07-05 11:39:22 +01:00
  • e128434acd Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-05 09:55:03 +00:00
  • 9f05236503 Translated using Weblate (Chinese (Simplified)) Tong Hui 2017-07-04 17:31:33 +00:00
  • 60703bdcfc Log errors thrown by getThirdpartyProtocols Richard van der Hoff 2017-07-05 10:54:10 +01:00
  • 084a933dbd Implement MessageComposerStore to persist composer state across room switching Luke Barnard 2017-07-05 10:24:55 +01:00
  • 2ccd36d09e Merge remote-tracking branch 'origin/develop' into erikj/group_server David Baker 2017-07-05 10:13:53 +01:00
  • cfe9e762ad Use trusty dist Richard van der Hoff 2017-07-05 10:01:13 +01:00
  • 9969d6095d Remove phantomjs; add chrome Richard van der Hoff 2017-07-05 09:43:40 +01:00
  • 38b1ca9b90 Use headless chrome instead of phantomjs for tests Richard van der Hoff 2017-07-05 09:35:51 +01:00