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

Commit Graph

  • 1ade7a711c Merge pull request #3395 from vector-im/luke/merge-RoomTile-context-menus Luke Barnard 2017-03-14 14:19:41 +00:00
  • 5e93dde0dd Merge pull request #746 from matrix-org/luke/merge-RoomTile-context-menus Luke Barnard 2017-03-14 14:19:36 +00:00
  • 0e95926925 Merge pull request #748 from matrix-org/luke/logout-after-deactivate David Baker 2017-03-14 14:13:08 +00:00
  • c717dc02ab Merge pull request #745 from matrix-org/luke/UDE-file-upload Luke Barnard 2017-03-14 14:11:11 +00:00
  • 32b9ee7f6f Copyright Luke Barnard 2017-03-14 14:07:10 +00:00
  • e4c155a881 Merge branch 'develop' into luke/merge-RoomTile-context-menus Luke Barnard 2017-03-14 14:01:47 +00:00
  • 17c9fcbb85 Merge branch 'develop' into luke/UDE-file-upload Luke Barnard 2017-03-14 13:59:04 +00:00
  • 4e6541b404 Merge pull request #3385 from vector-im/luke/fix-screen-after-login David Baker 2017-03-14 13:47:55 +00:00
  • 30b442515e Merge pull request #743 from matrix-org/luke/fix-screen-after-login David Baker 2017-03-14 13:44:08 +00:00
  • 878413f6a4 Support msisdn signin David Baker 2017-03-14 11:50:13 +00:00
  • ba0715ba7c Fix import for Lifecycle Luke Barnard 2017-03-13 14:10:14 +00:00
  • d8a30aa848 Double UNPAGINATION_PADDING again Luke Barnard 2017-03-13 13:48:15 +00:00
  • 925bbb79ad fix kick dialog CSS Matthew Hodgson 2017-03-13 00:47:33 +00:00
  • df22c90016 fix kick dialog CSS Matthew Hodgson 2017-03-13 00:47:20 +00:00
  • ffba088192 fix CSS for ChatCreateOrReuseDialog Matthew Hodgson 2017-03-13 00:03:53 +00:00
  • 8a0b08e7f6 fix CSS for ChatCreateOrReuseDialog.js Matthew Hodgson 2017-03-13 00:03:33 +00:00
  • bf64f387ce name class to match file Matthew Hodgson 2017-03-12 23:50:12 +00:00
  • 3a849bce60 name class to match file Matthew Hodgson 2017-03-12 23:48:57 +00:00
  • 185473b898 copyright... Matthew Hodgson 2017-03-12 23:48:49 +00:00
  • d639eb1049 beautify all error msgs Matthew Hodgson 2017-03-12 23:26:26 +00:00
  • 3aaf37df1a beautify a tonne more errors Matthew Hodgson 2017-03-12 22:59:41 +00:00
  • 71e0780eee beautify search fail error Matthew Hodgson 2017-03-12 22:24:16 +00:00
  • 0a0293d8fb fix focus on cancel button Matthew Hodgson 2017-03-12 20:13:53 +00:00
  • e5a5b5cd08 oops Matthew Hodgson 2017-03-12 20:13:39 +00:00
  • 4ad825e4fe fix up cancelbutton CSS Matthew Hodgson 2017-03-12 20:04:07 +00:00
  • 611bb3a857 beautiful error on roomdirectory fail Matthew Hodgson 2017-03-12 20:04:02 +00:00
  • b7d5d2fd56 beautify UserSettings error msg fix up default dialog cancel button Matthew Hodgson 2017-03-12 20:03:05 +00:00
  • 8dc7f8efe2 rte: remove logging and fix new history Aviral Dasgupta 2017-03-10 21:10:27 +05:30
  • 6004f6d610 rte: fix history Aviral Dasgupta 2017-03-10 20:34:31 +05:30
  • e5b3ec83b3 Revert "Support for phone number registration / signin (#3381)" Richard van der Hoff 2017-03-09 20:41:11 +00:00
  • 2786fb0f46 Revert "Support registration & login with phone number (#742)" Richard van der Hoff 2017-03-09 18:32:44 +00:00
  • 7fb9ce2b78 Merge pull request #744 from matrix-org/luke/add-onclick-permalinks Matthew Hodgson 2017-03-09 18:29:42 +00:00
  • 6c7b191577 Merge pull request #605 from SijmenSchoon/feature/pastefiles Matthew Hodgson 2017-03-09 17:55:58 +00:00
  • 3dc45886f7 Merge the two RoomTile context menus into one Luke Barnard 2017-03-09 17:05:51 +00:00
  • 1f788feacd Merge the two RoomTile context menus into one Luke Barnard 2017-03-09 17:03:57 +00:00
  • 927d305ed9 Fixing triage markdown as per #3382 Tom Lant 2017-03-09 12:00:54 +00:00
  • c4bc38f0d7 Fixing triage markdown as per #3382 Tom Lant 2017-03-09 12:00:54 +00:00
  • 0269562383 Support registration & login with phone number (#742) David Baker 2017-03-09 10:59:22 +00:00
  • 271fedd1e9 Support for phone number registration / signin (#3381) David Baker 2017-03-09 10:58:58 +00:00
  • 4f7914813d Make UDD appear when UDE on uploading a file Luke Barnard 2017-03-09 10:44:09 +00:00
  • 23422fdb86 Merge pull request #3379 from vector-im/luke/css-visible-redactions David Baker 2017-03-09 10:09:31 +00:00
  • 7ff2871ad5 const Luke Barnard 2017-03-09 10:04:15 +00:00
  • cbc31a6c41 Remove redundant thing Luke Barnard 2017-03-09 10:03:23 +00:00
  • c98a2144e9 Merge branch 'develop' into luke/add-onclick-permalinks Luke Barnard 2017-03-09 09:59:09 +00:00
  • 173daddb04 Comment typo Luke Barnard 2017-03-09 09:56:52 +00:00
  • 676c5c21c1 Merge pull request #739 from matrix-org/luke/visible-redactions David Baker 2017-03-09 09:41:31 +00:00
  • 6a1118218b Merge pull request #3340 from vector-im/luke/css-rts-fix-welcome-pages-safari Luke Barnard 2017-03-08 17:07:53 +00:00
  • 2513bfa612 Add onClick to permalinks to route within Riot Luke Barnard 2017-03-08 16:55:44 +00:00
  • c4001b5c5d Use else instead of two returns Luke Barnard 2017-03-08 15:11:38 +00:00
  • eddf33a689 Refactor screen set after login Luke Barnard 2017-03-08 14:57:13 +00:00
  • eca82bdb42 Make sure the screen is set, otherwise ignore screenAfterLogin Luke Barnard 2017-03-08 10:45:07 +00:00
  • 06a05c351d Decide on which screen to show after login in one place Luke Barnard 2017-03-08 10:25:54 +00:00
  • b7f1b1a424 Merge pull request #736 from matrix-org/luke/chat-create-or-reuse-dialog Luke Barnard 2017-03-07 16:22:52 +00:00
  • 08852c6174 Merge pull request #3376 from vector-im/luke/refactor-room-tile Luke Barnard 2017-03-07 16:20:31 +00:00
  • 2bf96d4887 Merge pull request #3350 from vector-im/luke/css-statusbar-v-balance Luke Barnard 2017-03-07 13:29:56 +00:00
  • 9d96baa613 Alter comments on height: auto Luke Barnard 2017-03-07 10:22:45 +00:00
  • a7db42d184 CSS for redacted EventTiles Luke Barnard 2017-03-07 09:21:50 +00:00
  • b977b559de autocomplete: add missing commands to CommandProvider Aviral Dasgupta 2017-03-07 04:46:55 +05:30
  • 79f481f81e rte: special return handling for some block types Aviral Dasgupta 2017-03-07 04:39:38 +05:30
  • f5b52fb488 rte: change list behaviour in markdown mode Aviral Dasgupta 2017-03-07 04:15:28 +05:30
  • 9946cadc2d autocomplete: fix RoomProvider regression Aviral Dasgupta 2017-03-07 04:08:06 +05:30
  • feac919c0a fix rendering of UNDERLINE inline style in RTE Aviral Dasgupta 2017-02-22 03:10:15 +05:30
  • 3a07fc1601 fix code-block for markdown mode Aviral Dasgupta 2017-02-22 02:51:57 +05:30
  • 32dd89774e add support for autocomplete delay Aviral Dasgupta 2017-02-20 19:26:40 +05:30
  • 2d39b25334 turn off force complete when editor content changes Aviral Dasgupta 2017-02-10 23:44:04 +05:30
  • e65744abdc fix EmojiProvider for new QueryMatcher Aviral Dasgupta 2017-02-10 23:35:13 +05:30
  • 0653343319 order User completions by last spoken Aviral Dasgupta 2017-02-10 22:34:52 +05:30
  • c7d0652762 actually sort autocomplete results by distance Aviral Dasgupta 2017-02-10 04:26:36 +05:30
  • 5fbe06ed91 force editor rerender when we swap editorStates Aviral Dasgupta 2017-02-10 03:40:57 +05:30
  • 46d30c378d fix tab focus issue in MessageComposerInput Aviral Dasgupta 2017-02-10 02:06:06 +05:30
  • aaac06c6d3 run eslint --fix over MessageComposerInput Aviral Dasgupta 2017-02-10 01:33:06 +05:30
  • 48376a32c2 refactor: MessageComposer.setEditorState to overridden setState Aviral Dasgupta 2016-12-30 19:42:36 +05:30
  • 78641a80dd autocomplete: replace Fuse.js with liblevenshtein Aviral Dasgupta 2016-12-01 12:06:57 +05:30
  • edd5903ed7 autocomplete: add space after completing room name Aviral Dasgupta 2016-11-30 23:12:03 +05:30
  • f4c0baaa2f refactor MessageComposerInput: bind -> class props Aviral Dasgupta 2016-11-30 22:46:33 +05:30
  • f2ad4bee8b Disable force completion for RoomProvider (RTE) Aviral Dasgupta 2016-10-11 19:17:57 +05:30
  • ab3b6497f9 Disable "syntax highlighting" in MD mode (RTE) Aviral Dasgupta 2016-10-11 19:16:35 +05:30
  • 65ce8c2113 Merge pull request #741 from matrix-org/dbkr/fix_teamserver_2 David Baker 2017-03-06 17:57:42 +00:00
  • 3d67234372 view_room dispatch from onClick RoomTile Luke Barnard 2017-03-06 17:55:12 +00:00
  • 87a5db65d5 Merge pull request #740 from matrix-org/luke/clarify-no-devices David Baker 2017-03-06 17:54:23 +00:00
  • 391886cac4 Remove dis as a dep in RoomTile Luke Barnard 2017-03-06 17:45:25 +00:00
  • bf348a0f78 Instead of listening for view_room, use a callback Luke Barnard 2017-03-06 17:44:29 +00:00
  • 341f978743 Fix the team server registration David Baker 2017-03-06 17:31:21 +00:00
  • 04510da057 Clarify "No devices" message Luke Barnard 2017-03-06 16:01:22 +00:00
  • 20fa36325f Remember to unregister on unmoun Luke Barnard 2017-03-06 15:01:46 +00:00
  • 4548d1b824 Use dispatch instead of passing onClick, adjust dialog wording. Luke Barnard 2017-03-06 14:51:01 +00:00
  • a122b5d88e Style Luke Barnard 2017-03-06 14:22:12 +00:00
  • c0fc3ba3fe Make redactions appear when the event has been redacted (on Room.redaction) Luke Barnard 2017-03-06 14:20:24 +00:00
  • 49c66d8645 Merge pull request #735 from matrix-org/luke/matrix-to-timestamp-permalink David Baker 2017-03-06 11:07:50 +00:00
  • 30eddf9fda Merge pull request #734 from matrix-org/luke/fix-resend David Baker 2017-03-06 11:06:52 +00:00
  • edccfeb20b No text required, do not continuate after redacted even Luke Barnard 2017-03-06 10:26:26 +00:00
  • b1f14ba979 Merge pull request #3351 from vector-im/luke/css-spinner-height Luke Barnard 2017-03-03 18:01:08 +00:00
  • abd71cd2ac No need for "redactor" as we dont currently show it Luke Barnard 2017-03-03 17:57:13 +00:00
  • 9f6a5d11ae Merge pull request #737 from matrix-org/luke/fix-color-regex-strictness Luke Barnard 2017-03-03 17:49:12 +00:00
  • 9bae936816 Add the redacter display name to the redaction text Luke Barnard 2017-03-03 17:35:42 +00:00
  • 5ef61b7c35 Only show a redaction tile for messages Luke Barnard 2017-03-03 16:45:29 +00:00
  • 6c32e3720b Remove seemingly unused "bounce" Luke Barnard 2017-03-03 15:51:14 +00:00
  • fa2cf41039 Make COLOR_REGEX stricter Luke Barnard 2017-03-03 15:46:13 +00:00
  • 2bd9885288 Start to show redacted events Luke Barnard 2017-03-03 15:42:24 +00:00
  • 62d9439530 Remove old import & pass through result David Baker 2017-03-03 14:31:52 +00:00