Commit Graph

  • e8495f637f Strip MD mentions from the body of sent messages Luke Barnard 2017-07-21 16:38:31 +01:00
  • f9cff50ef5 _loadGroupFromServer doesn't return a promise David Baker 2017-07-21 14:41:29 +01:00
  • d48924e768 Lint David Baker 2017-07-21 14:30:09 +01:00
  • be7228996a This should be null rather than false David Baker 2017-07-21 14:18:28 +01:00
  • d2f02e8e99 Swap classes instead of using 0 height elements David Baker 2017-07-21 14:14:27 +01:00
  • 4eda2ab083 Swap classes instead of using 0 height elements David Baker 2017-07-21 14:13:57 +01:00
  • 03aba64b97 Merge branch 'luke/refactor-pills' of github.com:matrix-org/matrix-react-sdk into luke/refactor-pills Luke Barnard 2017-07-21 14:08:36 +01:00
  • 7db7192701 Factor out shared logic in two code-paths for pill rendering Luke Barnard 2017-07-21 13:41:23 +01:00
  • 3c44af11f7 Revert changes to ChangeAvatar David Baker 2017-07-21 14:06:08 +01:00
  • 8ef820054d Factor out shared logic in two code-paths for pill rendering Luke Barnard 2017-07-21 13:41:23 +01:00
  • f2afd852d8 Make group editing work David Baker 2017-07-21 14:03:10 +01:00
  • b589fcc3b0 Merge pull request #1240 from matrix-org/rxl881/deleteWidgets Richard Lewis 2017-07-21 11:14:42 +01:00
  • 5ba3453dcc cursor: pointer on avatar picker David Baker 2017-07-21 11:12:46 +01:00
  • 571fada77e Make group profile editing mostly work David Baker 2017-07-21 11:12:15 +01:00
  • 8c531a85e9 Merge pull request #1239 from matrix-org/luke/feature-rte-insert-pills-on-click-tl-profile Luke Barnard 2017-07-21 10:42:48 +01:00
  • 9d8215e49f Added translation using Weblate (Latvian) Lauris Mierkalns 2017-07-20 23:24:17 +00:00
  • 511ab7c9ea Translated using Weblate (French) Alexandre Morignot 2017-07-08 16:38:47 +00:00
  • bac22cfb7c Re-add removal of (IRC) suffix Luke Barnard 2017-07-20 18:04:12 +01:00
  • 08cc0c421d insert_displayname -> insert_mention Luke Barnard 2017-07-20 18:02:54 +01:00
  • 0cc890c020 WIP store history as raw content state Luke Barnard 2017-07-20 18:01:39 +01:00
  • 6d7bff83ca Update type Completion Luke Barnard 2017-07-20 16:49:23 +01:00
  • 0600c5b049 Pretend that insert_displayname is a completion on that user Luke Barnard 2017-07-20 16:46:53 +01:00
  • 4bee9bd8c7 Merge branch 'develop' into luke/feature-rte-insert-pills-on-click-tl-profile Luke Barnard 2017-07-20 15:48:38 +01:00
  • 0419eff230 Insert pill onClick of timeline profile Luke Barnard 2017-07-20 15:46:36 +01:00
  • 26b16b076c Merge pull request #1238 from matrix-org/luke/fix-rte-md-mentions Luke Barnard 2017-07-20 15:32:36 +01:00
  • d080490ed3 Merge branch 'luke/fix-rte-md-mentions' of github.com:matrix-org/matrix-react-sdk into luke/fix-rte-md-mentions Luke Barnard 2017-07-20 15:17:36 +01:00
  • e893f994e1 Default to first room alias and then roomID Luke Barnard 2017-07-20 15:16:25 +01:00
  • b881efbc05 Default to first room alias and then roomID Luke Barnard 2017-07-20 15:16:25 +01:00
  • 84fe51a162 Insert MD links when autocompleting in MD mode Luke Barnard 2017-07-20 15:09:59 +01:00
  • 2cc153c796 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-20 13:05:10 +00:00
  • 55084d3aca Merge pull request #4584 from vector-im/rxl881/beta Richard Lewis 2017-07-20 14:05:06 +01:00
  • 563f5f7bac Merge pull request #1226 from matrix-org/rxl881/beta Richard Lewis 2017-07-20 14:04:53 +01:00
  • 199b771051 Merge pull request #1237 from matrix-org/luke/fix-rte-colon-parity David Baker 2017-07-20 13:05:40 +01:00
  • 0185119146 Merge pull request #1236 from matrix-org/luke/fix-rte-emoji-match-by-name Luke Barnard 2017-07-20 11:53:41 +01:00
  • 352f70f9ce Implement old composer feature that inserts ': ' or ' ' Luke Barnard 2017-07-20 11:45:25 +01:00
  • 878ff9826a Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-20 10:50:26 +00:00
  • 7e00a86048 Merge pull request #4650 from vector-im/rav/bump_indexeddb_timeot Richard van der Hoff 2017-07-20 11:50:23 +01:00
  • e133160a68 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-20 10:25:25 +00:00
  • 62579ed6b0 Add tracebacks to deploy exceptions Kegan Dougal 2017-07-20 11:25:19 +01:00
  • 98e3746a1e Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-20 10:16:40 +00:00
  • 01eef7eb41 Merge branch 'develop' of github.com:vector-im/riot-web into develop Luke Barnard 2017-07-20 11:16:26 +01:00
  • ccf5d6fc90 Adjust pill CSS Luke Barnard 2017-07-20 11:14:54 +01:00
  • 055224693a Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-20 10:02:15 +00:00
  • 9864ce5bb2 Support multiple config.json symlinks in redeploy.py (#4644) Kegsay 2017-07-20 11:02:10 +01:00
  • 238afde00a Increase the timeout for clearing indexeddbs Richard van der Hoff 2017-07-20 11:01:27 +01:00
  • b3df546cb9 Fix comment Luke Barnard 2017-07-20 10:51:15 +01:00
  • 206c771eb1 Translated using Weblate (Spanish) LuPa 2017-07-10 04:16:17 +00:00
  • a7feb58b63 Match emojis by long name Luke Barnard 2017-07-19 16:54:58 +01:00
  • 4b67900225 Translated using Weblate (German) Bamstam 2017-07-12 09:30:07 +00:00
  • 0e8ad75248 Merge pull request #1233 from matrix-org/rav/async_crypto Richard van der Hoff 2017-07-19 21:11:36 +01:00
  • 2f293adad5 Fix userId undefined in pillifyLinks Luke Barnard 2017-07-19 18:21:26 +01:00
  • ecaf6e5223 Merge pull request #1234 from matrix-org/luke/feature-mention-pill Luke Barnard 2017-07-19 17:56:24 +01:00
  • 61d5d078dd Merge pull request #1235 from matrix-org/luke/fix-rte-inline-code-format Luke Barnard 2017-07-19 17:44:56 +01:00
  • fb10357dd5 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-19 16:26:16 +00:00
  • f7d282fc8e Merge pull request #4597 from vector-im/luke/css-matrixto-timeline-pills Luke Barnard 2017-07-19 17:26:13 +01:00
  • 5d1b33d2a8 Merge branch 'develop' into luke/feature-mention-pill Luke Barnard 2017-07-19 17:22:03 +01:00
  • 3a53fabb87 Merge pull request #1228 from matrix-org/luke/feature-auto-complete-matrixto-pills Luke Barnard 2017-07-19 17:19:47 +01:00
  • 29b6d70aff Merge branch 'develop' into luke/fix-rte-inline-code-format Luke Barnard 2017-07-19 17:19:25 +01:00
  • d179398cf2 Merge pull request #1227 from matrix-org/luke/feature-matrixto-timeline-pills Luke Barnard 2017-07-19 17:17:48 +01:00
  • 75ca141cf9 Merge pull request #1232 from matrix-org/luke/fix-rte-backspace-unstyled-block Luke Barnard 2017-07-19 17:16:34 +01:00
  • 11ae3dd46c Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-19 16:16:06 +00:00
  • 3544c2b0c8 Merge pull request #4639 from vector-im/luke/css-rte-pre Luke Barnard 2017-07-19 17:16:02 +01:00
  • 8d7ff127f1 Merge pull request #1231 from matrix-org/luke/fix-rte-duplicate-autocompletions Richard van der Hoff 2017-07-19 17:05:12 +01:00
  • c8722292e3 Don't truncate EmojiProvider completion pills Luke Barnard 2017-07-19 16:20:57 +01:00
  • 28c98d93d1 Mimic ctrl+j of RT mode in MD mode Luke Barnard 2017-07-19 15:00:25 +01:00
  • edfa3c1980 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-19 13:27:40 +00:00
  • 620f39c6a2 Translated using Weblate (Telugu) Bhuvan Krishna 2017-07-18 18:09:58 +00:00
  • 0c253e2437 Merge pull request #4643 from vector-im/luke/fix-room-tile-dnd Luke Barnard 2017-07-19 14:27:37 +01:00
  • 53ae42ed68 Use catch instead of fail to handle room tag error Luke Barnard 2017-07-19 14:11:22 +01:00
  • 871c9e6d3e Add bing mention pill CSS Luke Barnard 2017-07-19 11:02:51 +01:00
  • b131637a11 Add mx_UserPill_me class to user pills that match credentials.userId Luke Barnard 2017-07-19 11:00:26 +01:00
  • ccc30fb52e Apply CSS to <pre> tags to distinguish them from each other Luke Barnard 2017-07-19 09:25:53 +01:00
  • 4998d1b359 Prepare for asynchronous e2e APIs Richard van der Hoff 2017-07-18 23:46:03 +01:00
  • 98ca937fef Interpret backspace at start of style block as block style toggle Luke Barnard 2017-07-18 17:52:04 +01:00
  • 745b803d28 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-18 16:45:25 +00:00
  • bd693768cc deliberately de-theme pre tags Matthew Hodgson 2017-07-18 17:45:17 +01:00
  • b185f43d3d Use _uniq instead of _sortedUniq for return unique matched results Luke Barnard 2017-07-18 16:23:54 +01:00
  • 6e1c40ea0f Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-18 14:50:34 +00:00
  • b45108d80d ooooops, fix dark theme code blocks correctly Matthew Hodgson 2017-07-18 15:50:28 +01:00
  • ec68c54644 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-18 14:33:48 +00:00
  • 4e5e5dd6b3 Translated using Weblate (Italian) erciccione 2017-07-15 00:04:49 +00:00
  • e7ba618bbe fix text in code blocks on dark theme Matthew Hodgson 2017-07-18 15:33:41 +01:00
  • 8a818d250f Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit David Baker 2017-07-18 11:34:48 +01:00
  • b9dfaf777e Merge pull request #1230 from matrix-org/dbkr/fix_multi_invite David Baker 2017-07-18 11:34:33 +01:00
  • 7cfef04c1f Remove other promise notify David Baker 2017-07-18 11:27:21 +01:00
  • fc470cd20d Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit David Baker 2017-07-18 11:14:27 +01:00
  • b261c89a63 Fix inviting multiple people to a room David Baker 2017-07-18 11:11:42 +01:00
  • c6bc20cd2a Fix menu on change keyboard language issue #4345 Alexey Murz Korepov 2017-07-18 09:23:32 +03:00
  • d207ee5244 Expand groups into variables with readable names Luke Barnard 2017-07-17 19:31:36 +01:00
  • cd418a5525 Retest David Baker 2017-07-17 18:16:50 +01:00
  • 859239f881 Lint / comment out line correctly David Baker 2017-07-17 18:13:20 +01:00
  • 7041106bf2 Merge remote-tracking branch 'origin/develop' into dbkr/groupview_edit David Baker 2017-07-17 17:23:02 +01:00
  • 65b9086f18 Add group header button css David Baker 2017-07-17 17:20:11 +01:00
  • 6f65128928 Disable edit button again David Baker 2017-07-17 17:18:46 +01:00
  • 1cd79fc918 Rename group settings to 'Edit Group' David Baker 2017-07-17 17:17:18 +01:00
  • 29757fcf11 Merge branch 'luke/feature-matrixto-timeline-pills' into pills Luke Barnard 2017-07-17 16:43:46 +01:00
  • 897ff05d87 Implement composer completion user/room pill insertion Luke Barnard 2017-07-17 15:53:29 +01:00
  • 0e71ea7a5a Make some adjustments to mx_UserPill and mx_RoomPill Luke Barnard 2017-07-17 14:52:08 +01:00
  • b1e3dc406c Decorate matrix.to anchor tags as mx_UserPill and mx_RoomPill Luke Barnard 2017-07-17 14:50:45 +01:00
  • a32113ad97 Add onChange handlers & tabIndexes David Baker 2017-07-17 14:40:38 +01:00