Commit Graph

  • 5872f2389f Translated using Weblate (Basque) Osoitz 2017-08-03 06:29:49 +00:00
  • da2b3c067b Translated using Weblate (Chinese (Traditional)) Jeff Huang 2017-08-03 06:11:00 +00:00
  • 3ba4823fd7 Translated using Weblate (Chinese (Traditional)) Jeff Huang 2017-06-24 03:40:58 +00:00
  • 1b004f170d make eslint happy Michael Telatynski 2017-08-03 01:10:32 +01:00
  • 9ab30b7b17 fix line-length and copyright header Michael Telatynski 2017-08-03 01:05:05 +01:00
  • 131d1c74c9 add room state explorer to devtools Michael Telatynski 2017-08-03 00:59:40 +01:00
  • 5752345b80 Merge pull request #1263 from matrix-org/rxl881/warnings Richard Lewis 2017-08-02 17:30:46 +01:00
  • 7599bde1f6 Fix logging line length. Richard Lewis 2017-08-02 17:05:46 +01:00
  • 700dd51584 Merge pull request #1267 from matrix-org/luke/fix-complete-after-blocks Luke Barnard 2017-08-02 16:41:47 +01:00
  • c914f1607b scalar-develop is a scalar URL Kegan Dougal 2017-08-02 14:35:14 +01:00
  • b9ff6c873c Added translation using Weblate (Japanese) yuurii 2017-08-02 13:32:57 +00:00
  • 29f43f8fe8 add styling for TextInputWithCheckboxDialog Michael Telatynski 2017-08-02 14:01:32 +01:00
  • 6e39e72849 fix m.federate always being false because value is a string. Y HTML... Michael Telatynski 2017-08-02 14:00:24 +01:00
  • e9afcec5b2 fix m.federate=false warning in room settings Michael Telatynski 2017-08-02 13:42:24 +01:00
  • 4b4b730233 fix and i18n the impl Michael Telatynski 2017-08-02 13:41:26 +01:00
  • 6653ccf9a1 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-08-02 12:06:35 +00:00
  • 4b8764c070 Merge pull request #4730 from vector-im/luke/update-dep-draft-js Luke Barnard 2017-08-02 13:06:31 +01:00
  • bf09c14e44 Merge branch 'develop' of github.com:vector-im/riot-web into set_default_federate_by_settings Michael Telatynski 2017-08-02 12:24:15 +01:00
  • fd454b476a Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into set_default_federate_by_settings Michael Telatynski 2017-08-02 12:15:00 +01:00
  • 2f99a4883f Update draft-js from 0.8.1 to 0.10.1 Luke Barnard 2017-08-02 11:52:47 +01:00
  • 27a1038e8d Merge branch 'master' of github.com:vector-im/riot-web into set_default_federate_by_settings Michael Telatynski 2017-08-02 11:48:20 +01:00
  • 1512aff326 Add comments Luke Barnard 2017-08-02 11:06:02 +01:00
  • 2c86086444 Account for \n after each block Luke Barnard 2017-08-02 10:51:34 +01:00
  • 9010f96e60 Merge pull request #1266 from matrix-org/luke/fix-ac-providers-sort Luke Barnard 2017-08-02 10:36:47 +01:00
  • 72c1cf9288 When sorting completions, use matched string, not entire query Luke Barnard 2017-08-02 10:09:00 +01:00
  • b632c9132c Merge pull request #1265 from matrix-org/luke/fix-room-completions-order Luke Barnard 2017-08-02 10:05:17 +01:00
  • dbade448c1 Don't try to match query against roomId Luke Barnard 2017-08-02 09:40:00 +01:00
  • 8053d2933a Order room completions more intuitively Luke Barnard 2017-08-02 09:35:07 +01:00
  • 48faf72fdc Disable eslint rule Richard Lewis 2017-08-01 21:00:18 +01:00
  • ff378cc85a Merge pull request #1264 from matrix-org/luke/fix-rte-emoji-sorting Luke Barnard 2017-08-01 17:58:54 +01:00
  • 2ab6bc84a7 Improve clarity Richard Lewis 2017-08-01 17:49:41 +01:00
  • f0224460d2 Fix comparison and handle case where app has permission to load but content is mixed protocol. Richard Lewis 2017-08-01 17:48:02 +01:00
  • e6f3164348 Merge pull request #1262 from matrix-org/luke/upgrade-dep-draft-js David Baker 2017-08-01 17:46:09 +01:00
  • d29610bdd2 Fix boolean comparison. Richard Lewis 2017-08-01 17:45:06 +01:00
  • f57b0d4cc7 Fix invalid translation Richard Lewis 2017-08-01 17:43:38 +01:00
  • ff95542549 Adjust emoji sorting such that exact matches/prefixes appear first Luke Barnard 2017-08-01 17:36:41 +01:00
  • 73e5cc9721 Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-08-01 16:30:35 +00:00
  • b12741464e Translated using Weblate (Russian) Walter 2017-07-30 14:35:25 +00:00
  • af85f18eae Styling tweaks Richard Lewis 2017-08-01 17:30:22 +01:00
  • bc4d979d1e Display warning if widget is mixed content Richard Lewis 2017-08-01 17:29:29 +01:00
  • 240a3545d0 Translated using Weblate (Basque) Osoitz 2017-08-01 16:11:16 +00:00
  • 2a82201551 Translated using Weblate (Basque) Osoitz 2017-08-01 16:06:46 +00:00
  • a40a86669a Merge pull request #1260 from matrix-org/luke/fix-rte-pills-not-updating Luke Barnard 2017-08-01 16:30:25 +01:00
  • 435455c9f0 Added translation using Weblate (Basque) Osoitz 2017-08-01 15:29:58 +00:00
  • 2551a945b8 Translated using Weblate (Basque) Osoitz 2017-08-01 15:27:29 +00:00
  • 630c2968eb Use componentWillReceiveProps Luke Barnard 2017-08-01 16:20:32 +01:00
  • 71abd3aff8 Revert setting of key Luke Barnard 2017-08-01 16:14:12 +01:00
  • 1001c39da9 Upgrade draft-js from 0.8.1 to 0.10.1 Luke Barnard 2017-08-01 16:02:28 +01:00
  • 7fcb8c5ff0 Merge pull request #1261 from matrix-org/luke/fix-agressive-emoji-auto-replace Luke Barnard 2017-08-01 15:56:42 +01:00
  • 546173d246 Fix scalar token Richard Lewis 2017-08-01 15:53:42 +01:00
  • 6bab8295d7 Added translation using Weblate (Basque) Osoitz 2017-08-01 14:02:02 +00:00
  • 438b63bee2 Only auto-replace emoji following ^ or \s Luke Barnard 2017-08-01 14:26:30 +01:00
  • 9e71ba26c4 Add key prop to RTE decorated entities (Pills and links) Luke Barnard 2017-08-01 13:51:08 +01:00
  • abae43b65e Merge pull request #1257 from matrix-org/rxl881/widgetPermissions Richard Lewis 2017-08-01 12:13:09 +01:00
  • 5f8e86197f Check that wurl is scalar, before checking for curl Richard Lewis 2017-08-01 12:00:03 +01:00
  • 596efb6062 Fix missing comma Richard Lewis 2017-08-01 11:42:50 +01:00
  • 46755de962 Fix event type. Richard Lewis 2017-08-01 11:41:41 +01:00
  • 15f39040a0 Simplify canUserModifyWidgets API Richard Lewis 2017-08-01 11:39:17 +01:00
  • 62af06104d resolve -> reject because semantics. Michael Telatynski 2017-07-31 14:22:05 +01:00
  • f310d4446c i18n the title of the set mxid dialog Michael Telatynski 2017-07-31 13:31:07 +01:00
  • 25d1d21d93 copy logic from RegistrationForm to detect invalid localparts Michael Telatynski 2017-07-31 13:28:43 +01:00
  • 6bfdd69279 add devtools dialog Michael Telatynski 2017-07-31 12:08:41 +01:00
  • 79b83e60ab add /devtools command Michael Telatynski 2017-07-31 12:08:28 +01:00
  • 5b6dbfb701 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/i18n_analytics Michael Telatynski 2017-07-28 21:02:48 +01:00
  • 4bdaa15c47 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/i18n_analytics Michael Telatynski 2017-07-28 21:01:59 +01:00
  • a310ff3bab Add ToDo item. Richard Lewis 2017-07-28 18:21:23 +01:00
  • 6aa1d923ce Add comment Richard Lewis 2017-07-28 16:48:13 +01:00
  • 9935dd0051 Add comment to explain "fullWidth" component porperty. Richard Lewis 2017-07-28 16:46:21 +01:00
  • 8529a21f5c Translate "Allow" Richard Lewis 2017-07-28 16:42:07 +01:00
  • 700ef34e95 Translate warning Richard Lewis 2017-07-28 16:39:18 +01:00
  • 4308d2c635 Inline setState. Richard Lewis 2017-07-28 16:36:06 +01:00
  • 50ad80ad86 Use ES6 style import Richard Lewis 2017-07-28 16:24:32 +01:00
  • 2e6fb1f956 Fix license header Richard Lewis 2017-07-28 16:23:49 +01:00
  • 6238c1d704 Fix default prop initialisation Richard Lewis 2017-07-28 16:23:38 +01:00
  • 6f57fe96f2 Add JS doc to indicate that the function may throw an error. Richard Lewis 2017-07-28 16:19:20 +01:00
  • a901ca5308 Remove invalid OM license header. Richard Lewis 2017-07-28 16:17:18 +01:00
  • 8b26d5b7fb Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-28 14:34:13 +00:00
  • 384727a553 Merge pull request #4693 from vector-im/luke/css-sending-event-tile David Baker 2017-07-28 15:34:09 +01:00
  • 8fd0ced215 Merge pull request #1258 from matrix-org/luke/feature-rte-enter-to-toggle-empty-block David Baker 2017-07-28 15:33:45 +01:00
  • 397523f4ac Make pills, emoji translucent when sending Luke Barnard 2017-07-28 15:13:36 +01:00
  • 8a5f2bf2ca Interpret a split-block as format toggle for an empty block Luke Barnard 2017-07-28 14:46:57 +01:00
  • ca388b8c7c Merge remote-tracking branch 'origin/develop' into develop Weblate 2017-07-28 13:15:45 +00:00
  • ca5fdff72f Merge pull request #4690 from vector-im/rxl881/widgetPermissions Richard Lewis 2017-07-28 14:15:41 +01:00
  • aff1cd9469 Add allow-presentation permission to iframe sandbox permissions Richard Lewis 2017-07-28 11:14:04 +01:00
  • 11335b1488 Rename variable to curlBase, for clarity Richard Lewis 2017-07-28 10:18:06 +01:00
  • e1d9301eb4 Strip query parameters from content URLs Richard Lewis 2017-07-28 10:01:58 +01:00
  • f4f85d053d Translated using Weblate (Russian) Andrei Shevchuk 2017-07-28 03:35:38 +00:00
  • c0d312af10 Translated using Weblate (Russian) Andrei Shevchuk 2017-07-28 03:16:55 +00:00
  • 9bbe3871e7 Translated using Weblate (Russian) Andrey 2017-07-27 13:17:10 +00:00
  • d69c9a36b3 Factor out check permissions code. Richard Lewis 2017-07-27 23:38:26 +01:00
  • 20a1693c71 Only display add app link if user has permission to add widgets in the room. Richard Lewis 2017-07-27 23:38:02 +01:00
  • ccf3c1de7a Add widget utility class. Add static method to determine if user can modify widgets in the specified room. Richard Lewis 2017-07-27 23:37:33 +01:00
  • 5e23d676b4 Remove comments. Richard Lewis 2017-07-27 23:05:43 +01:00
  • 317ff8c6af Beta tag styling Richard Lewis 2017-07-27 23:02:19 +01:00
  • 50f5abf535 Permissions button cursor. Richard Lewis 2017-07-27 20:19:08 +01:00
  • 51d160e7d6 Hide edit button when user does not have permission to edit. Richard Lewis 2017-07-27 20:18:31 +01:00
  • f7e9dd4118 Add edit translation Richard Lewis 2017-07-27 19:56:28 +01:00
  • ff0741d435 Merge pull request #1256 from matrix-org/luke/fix-rte-md-entity-weirdness David Baker 2017-07-27 18:48:37 +01:00
  • 6cb8b12cda Instead of inserting MD for completion, convert the Entity later Luke Barnard 2017-07-27 18:07:41 +01:00
  • c1fe3533c4 Add red cancel icon and styling. Richard Lewis 2017-07-27 18:10:56 +01:00