Commit Graph

  • 796b51113f CSS for Create Group dialog David Baker 2017-06-29 16:59:26 +01:00
  • 6bd7284161 Be sensible about handling up/down vs tab/tab-shift Luke Barnard 2017-06-29 15:07:06 +01:00
  • 810f16ce69 Merge pull request #1158 from matrix-org/luke/feature-rte-quick-emoji Luke Barnard 2017-06-29 11:55:17 +01:00
  • 7a1a0e613c Translated using Weblate (Italian) Dreamwhite 2017-06-29 10:49:30 +00:00
  • 233a7dbf68 Translated using Weblate (Italian) Dreamwhite 2017-06-29 10:47:23 +00:00
  • 982b009b90 Implement ascii emoji tab completion Luke Barnard 2017-06-29 11:29:55 +01:00
  • 8912400675 Add XXX for https://github.com/vector-im/riot-web/issues/4445 Luke Barnard 2017-06-28 18:05:39 +01:00
  • a3e02f470f Merge pull request #1156 from matrix-org/luke/fix-rte-debounce Luke Barnard 2017-06-28 18:03:36 +01:00
  • af3374e210 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-28 16:38:56 +00:00
  • 515f8de2c5 Merge pull request #4456 from vector-im/luke/css-rte-improvements Luke Barnard 2017-06-28 17:38:53 +01:00
  • de81188b13 Do debouncing for autocomplete in a sane way Luke Barnard 2017-06-28 17:27:21 +01:00
  • d5585e29b1 Merge pull request #1155 from matrix-org/luke/fix-rte-cursor-at-start-of-history Luke Barnard 2017-06-28 17:17:56 +01:00
  • 2ea69624af Add some style improvements to autocompletions Luke Barnard 2017-06-28 16:36:32 +01:00
  • ed6ea13773 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-06-28 15:07:03 +00:00
  • 7aff42ca9d Translated using Weblate (Ukrainian) strix aluco 2017-06-24 14:35:00 +00:00
  • c320c64f27 Translated using Weblate (Spanish) Carlos A. Carnero Delgado 2017-06-26 03:25:25 +00:00
  • b55fa94db9 Translated using Weblate (Russian) Andrey 2017-06-27 16:12:11 +00:00
  • a5bc9a953c Translated using Weblate (Polish) bldrzzy 2017-06-25 20:49:17 +00:00
  • 34f52e8315 Translated using Weblate (Persian) Rayeshman 2017-06-25 13:45:13 +00:00
  • 15dcc507d8 Translated using Weblate (Korean) IMIN 2017-06-25 22:04:33 +00:00
  • 962f081fcd Translated using Weblate (German) Bamstam 2017-06-27 10:17:35 +00:00
  • 991789da72 Translated using Weblate (Esperanto) Rayeshman 2017-06-25 09:36:40 +00:00
  • d5c37ad8bc Translated using Weblate (Chinese (Traditional)) Jeff Huang 2017-06-24 03:40:58 +00:00
  • 4ee5431e07 Translated using Weblate (Chinese (Simplified)) Tong Hui 2017-06-26 15:30:59 +00:00
  • 176f7f1515 Merge pull request #4447 from vector-im/rxl881/apps Richard Lewis 2017-06-28 16:06:57 +01:00
  • d61525e420 Merge pull request #1152 from matrix-org/rxl881/apps Richard Lewis 2017-06-28 16:06:20 +01:00
  • ea83d7eee2 Add missing import and fix apps reference. Richard Lewis 2017-06-28 15:53:18 +01:00
  • d696373bc2 Fix issue where the cursor is put at the start of selected history item Luke Barnard 2017-06-28 15:29:07 +01:00
  • bcb67bb273 Refactor shared code between onUpArrow and onDownArrow Luke Barnard 2017-06-28 15:20:16 +01:00
  • b3eee0c007 Merge pull request #1153 from matrix-org/luke/fix-rte-pre-extra-nls Luke Barnard 2017-06-28 15:13:39 +01:00
  • 9b24f70d00 Update comment Luke Barnard 2017-06-28 14:29:53 +01:00
  • dc72dfae7a Merge pull request #1154 from matrix-org/luke/fix-rte-emoji-suggestions Luke Barnard 2017-06-28 14:28:11 +01:00
  • eeb1c33868 Do the less invasive fix of replacing <br>\n with \n but only within <pre> Luke Barnard 2017-06-28 14:27:24 +01:00
  • 105c54a1f1 CSS for Groups page David Baker 2017-06-28 13:57:20 +01:00
  • a2ff289ed8 Add 'groups' page David Baker 2017-06-28 13:56:18 +01:00
  • 3a10cda2ca Add translations. Richard Lewis 2017-06-28 13:55:18 +01:00
  • f8c064ec25 REmove redundant call to _getApps Richard Lewis 2017-06-28 13:45:29 +01:00
  • 48eb6f251b Update comment Luke Barnard 2017-06-28 13:44:44 +01:00
  • 30f80b57f2 Instead of making this part of the build process, let the devs generate stripped-emoji.json Luke Barnard 2017-06-28 13:28:48 +01:00
  • e70eca0b0c Comment unused code and add TODO to handle scalar errors. Richard Lewis 2017-06-28 12:58:09 +01:00
  • d06d066050 Move getInitialState to top of file. Richard Lewis 2017-06-28 12:54:47 +01:00
  • e752cc8557 Use 'this' in preference to local reference. Richard Lewis 2017-06-28 12:32:38 +01:00
  • 481a66ef3c Fix header. Richard Lewis 2017-06-28 12:26:05 +01:00
  • 93bdfc99df i18n "Cancel" alt text. Richard Lewis 2017-06-28 12:25:36 +01:00
  • ddea1f35d2 Fix header. Richard Lewis 2017-06-28 12:23:33 +01:00
  • ff1636aaf5 Simplify boolean assignment. Richard Lewis 2017-06-28 12:21:05 +01:00
  • 06dafdc099 Remove unused state variable. Richard Lewis 2017-06-28 12:20:07 +01:00
  • bf2a4afce5 Change to allow setting of DEBUG at run-time. Richard Lewis 2017-06-28 12:02:07 +01:00
  • 2b1d15717a Add translation for Matrix Apps labs setting. Richard Lewis 2017-06-28 12:00:22 +01:00
  • 22ddbc63c3 Make lib dir prior to building Luke Barnard 2017-06-28 11:54:05 +01:00
  • f73fa4b49b Move processing into renamed function processHtmlforSending Luke Barnard 2017-06-28 11:49:50 +01:00
  • 2b8da85726 Strip the emoji meta-data for the data we need Luke Barnard 2017-06-28 11:35:14 +01:00
  • 8ca3b382ed Use emojione/emoji.json because we don't want two sets of emoji meta Luke Barnard 2017-06-28 11:19:16 +01:00
  • f4db765239 Fix indentation Luke Barnard 2017-06-28 10:32:46 +01:00
  • 907aaebe2f Remove redundant emoji data file Luke Barnard 2017-06-28 10:31:59 +01:00
  • 1523d304f2 WIP to prevent RTE from deleting current message input when up arrow pressed Luke Barnard 2017-06-28 10:30:59 +01:00
  • ad2517bd8b Uppercase the first letter of the app tile name. Richard Lewis 2017-06-28 10:27:06 +01:00
  • 9d339b96bd Order emojis by standard ordering, add alternate shortnames Luke Barnard 2017-06-27 20:13:48 +01:00
  • 69589c19e7 Work around draft-js-export-html#62 by post-processing <br>\n Luke Barnard 2017-06-27 18:33:45 +01:00
  • be60dfdc3a Merge pull request #1151 from matrix-org/luke/fix-rte-pasting-multi-line-code David Baker 2017-06-27 18:03:27 +01:00
  • 3872f0750c Only show apps button if labs feature enabled. Richard Lewis 2017-06-27 17:40:28 +01:00
  • 338a4db87f Only show apps drawer if matrix apps labs setting ids enabled Richard Lewis 2017-06-27 17:40:09 +01:00
  • 8dfd047f03 Don't show widgets when editing room settings and lint fixes. Richard Lewis 2017-06-27 17:39:29 +01:00
  • 7a7687699b Add matrix apps to Labs settings Richard Lewis 2017-06-27 17:38:33 +01:00
  • 7245ca88a4 Translated using Weblate (German) Krombel 2017-06-27 16:23:16 +00:00
  • 37f920d0b9 Translated using Weblate (German) Bamstam 2017-06-26 19:33:17 +00:00
  • 5307731dfd Overide default draft-js handling of pasting text/html Luke Barnard 2017-06-27 17:10:28 +01:00
  • 4645ba1bba Merge pull request #1150 from matrix-org/luke/fix-rte-dev-tools-toggle Luke Barnard 2017-06-27 15:38:19 +01:00
  • ba31a32440 Allow toggling of dev tools when RTE focussed Luke Barnard 2017-06-27 15:17:57 +01:00
  • f36c1ca207 fix Quote not closing contextual menu Michael Telatynski 2017-06-27 14:51:18 +01:00
  • aa7a113324 More PR feedback David Baker 2017-06-27 13:41:43 +01:00
  • 87fac367ac quote consistency David Baker 2017-06-27 13:37:59 +01:00
  • 6c9716637e Fix linting errors David Baker 2017-06-27 13:13:00 +01:00
  • 83353e9419 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/apps Richard Lewis 2017-06-27 12:40:32 +01:00
  • aab4c097e6 Make query parameters generic. Richard Lewis 2017-06-27 12:26:13 +01:00
  • ad9a3d9ddc Remove unused case statement. Richard Lewis 2017-06-27 11:55:32 +01:00
  • 89f051e693 Fix automerge error. Richard Lewis 2017-06-27 11:52:49 +01:00
  • f6627937fa CSS for GroupView David Baker 2017-06-27 11:52:46 +01:00
  • 2aeaaf26ca remove inline css David Baker 2017-06-27 11:52:23 +01:00
  • ddc0da396d Merge in changes from develop Richard Lewis 2017-06-27 11:44:36 +01:00
  • 63b1250385 Add comment Richard Lewis 2017-06-27 11:39:20 +01:00
  • 1f1352786f Temporarily disable Jitsi default Richard Lewis 2017-06-27 11:38:14 +01:00
  • 18ea76b864 Removed commented code Richard Lewis 2017-06-27 11:31:00 +01:00
  • e343e99355 Cleaned up unused files and removed commented code Richard Lewis 2017-06-27 11:28:38 +01:00
  • 971f7ad045 Fix avatars David Baker 2017-06-27 10:32:21 +01:00
  • 867b47f4a2 PR feedback: remove phases David Baker 2017-06-27 10:28:46 +01:00
  • f0aaca0a31 Fix some PR feedback David Baker 2017-06-27 10:05:05 +01:00
  • c033d5defd Missing React import David Baker 2017-06-27 09:58:29 +01:00
  • a122e72a2b Translated using Weblate (Greek) Tom Tryfonidis 2017-06-27 07:53:11 +00:00
  • 3b527bc2c7 Translated using Weblate (Greek) Tom Tryfonidis 2017-06-27 07:50:40 +00:00
  • 8222a4972f Translated using Weblate (Russian) Andrey 2017-06-27 02:37:52 +00:00
  • fbaa3de28b Null-guard m.video info lukebarnard 2017-06-26 22:22:03 +01:00
  • 447f93ba73 Merge pull request #1074 from kyrias/only-highlight-specified-language Matthew Hodgson 2017-06-26 18:25:33 +01:00
  • 09b1012388 Merge remote-tracking branch 'origin/develop' into erikj/group_server David Baker 2017-06-26 17:49:06 +01:00
  • 812b3643de Add message for HSes that don't support groups David Baker 2017-06-26 17:47:17 +01:00
  • a26498bc6c Make 'group not found' work David Baker 2017-06-26 17:38:10 +01:00
  • 48c32172fd TextualBody: only highlight code block if language was specified Johannes Löthberg 2017-06-12 02:13:10 +02:00
  • 661e6a6d01 HtmlUtils: Allow language- classes on code blocks through the sanitizer Johannes Löthberg 2017-06-12 02:03:38 +02:00
  • fcde56f614 Translated using Weblate (Chinese (Simplified)) Tong Hui 2017-06-26 15:29:06 +00:00
  • 5e857afd5e Translated using Weblate (French) Brendan Abolivier 2017-06-26 15:26:41 +00:00