Commit Graph

17533 Commits (b16f983a1f509004d4238d632ee7444ef5c5120e)

Author SHA1 Message Date
Bruno Windels 5c28b57681 always recalculate position after doing transform step
as the amount of characters might not have changed,
parts may still have been merged, removed or added which
requires a new position.
2019-08-27 09:49:22 +02:00
Michael Telatynski 8bdc1e9446
Merge pull request #3347 from matrix-org/t3chguy/react16_5
Migrate away from React.createClass for views/dialogs. React 16 :D
2019-08-26 19:45:26 +01:00
Michael Telatynski 0b9f6cf388
Merge pull request #3346 from matrix-org/t3chguy/react16_4
Migrate away from React.createClass for async-components. React 16 :D
2019-08-26 19:44:57 +01:00
Michael Telatynski bcbd603874
Merge pull request #3345 from matrix-org/t3chguy/react16_3
Switch from react-addons-test-utils to react-dom/test-utils. React 16 :D
2019-08-26 19:44:51 +01:00
Travis Ralston abbc8ffef0 Adjust copy and include identity server changing when terms are pending
Fixes https://github.com/vector-im/riot-web/issues/10636
Fixes https://github.com/vector-im/riot-web/issues/10635
2019-08-26 11:26:21 -06:00
Bruno Windels 0273795f5d add transform step to composer to auto-replace emoticons with emoji 2019-08-26 16:16:27 +02:00
Bruno Windels 4fd4ad41c1 improve editor model documentation 2019-08-26 16:16:27 +02:00
Bruno Windels f8f0e77bde add transform step during editor model update 2019-08-26 16:16:27 +02:00
Bruno Windels 0e65f71a37 support incrementing/decrementing doc positions with predicate 2019-08-26 16:16:27 +02:00
Bruno Windels 10291bafe0 add support for selecting ranges in the editor model, and replacing them
this to support finding emoticons and replacing them with an emoji
2019-08-26 16:16:27 +02:00
Michael Telatynski d94e2179bf Migrate away from React.createClass for views/dialogs. React 16 :D
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-24 11:59:46 +01:00
Michael Telatynski 360cef66c1 Migrate away from React.createClass for async-components. React 16 :D
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-24 11:53:28 +01:00
Michael Telatynski accb0abe2d Switch from react-addons-test-utils to react-dom/test-utils. React 16 :D
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-24 11:47:07 +01:00
Michael Telatynski e5d3198f53
Merge pull request #3339 from matrix-org/t3chguy/substitute_handle_global
Iterate over all instances of variable/tag for _t substitutions
2019-08-23 19:43:40 +01:00
Travis Ralston f4ca91d4d3
Merge pull request #3344 from matrix-org/travis/fix-is-terms
Treat 404 errors on IS as having no terms
2019-08-23 12:15:19 -06:00
Travis Ralston e8b0c41157 minus ; 2019-08-23 12:01:47 -06:00
Travis Ralston e1552b61fc fix i18n 2019-08-23 12:01:13 -06:00
Travis Ralston c44ae2df4d Treat 404 errors on IS as having no terms
Fixes https://github.com/vector-im/riot-web/issues/10634
2019-08-23 11:58:04 -06:00
J. Ryan Stinnett 72ec6c7062 Reveal custom IS field only when required
This hides the identity server at first from the custom server auth flows. For
the flows that may need an IS if the HS requires it (registration, password
reset), we then check with the HS before proceeding further and reveal the IS
field if it is in fact needed.

Fixes https://github.com/vector-im/riot-web/issues/10553
2019-08-23 18:43:55 +01:00
J. Ryan Stinnett 47ee299e70
Merge pull request #3337 from matrix-org/jryans/is-token-to-hs
Add IS access token callback
2019-08-23 17:13:55 +01:00
Travis Ralston dc0c7e3053
Merge pull request #3331 from matrix-org/jaywink/extra-rageshake-cleanup
Tweak rageshake logging messages
2019-08-23 09:59:05 -06:00
Travis Ralston 266e3af475 Appease the scss linter 2019-08-23 09:20:28 -06:00
Travis Ralston 160396ca9e Appease the linter 2019-08-23 09:16:44 -06:00
Travis Ralston b3cda4b19a Support multiple integration managers behind a labs flag
Fixes https://github.com/vector-im/riot-web/issues/10622
Implements [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957)

Design is not final.
2019-08-23 09:12:40 -06:00
Travis Ralston 602c338a26 Merge branch 'travis/homeserver-managers' into travis/tabbed-managers 2019-08-23 08:50:21 -06:00
J. Ryan Stinnett 84e3d339ac Change to provider object 2019-08-23 11:17:51 +01:00
Bruno Windels f39dc6feab
Merge pull request #3287 from matrix-org/bwindels/new-main-composer
Support editing composer to be used as main composer (feature flagged)
2019-08-23 10:06:19 +00:00
Jason Robinson f505aa0c83 Ensure logging tweak doesn't fail on undefined
Run the replace on the log line string instead of the separate
parts since we can ensure the line is a string.

Signed-off-by: Jason Robinson <jasonr@matrix.org>
2019-08-23 10:14:26 +03:00
Travis Ralston 470295ad14 Expose a getOrderedManagers() function for use elsewhere 2019-08-22 15:17:59 -06:00
Travis Ralston 8493887ceb Import the right js-sdk 2019-08-22 14:57:09 -06:00
Travis Ralston a35735da45 Support homeserver-configured integration managers
Fixes https://github.com/vector-im/riot-web/issues/4913
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1024
Implements part of [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957)
2019-08-22 14:49:20 -06:00
Michael Telatynski 7d511fbbc5 remove leftover debugger =)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-22 18:34:26 +01:00
Michael Telatynski 310457059b [i18n] only append tail if it is actually needed
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-22 18:31:02 +01:00
Michael Telatynski b5daba9026 Iterate over all instances of variable/tag for _t substitutions
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-22 18:17:08 +01:00
Michael Telatynski cd6a980c7e Only Destroy the expected persistent widget, not *ANY*
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-22 16:57:51 +01:00
Travis Ralston efe8254985
Merge pull request #3333 from matrix-org/travis/fix-tooltip
Remove tooltipClassName from the Field's input
2019-08-22 08:40:23 -06:00
Travis Ralston fbb2af00da
Merge pull request #3335 from matrix-org/travis/fix-alignment
Fix alignment of discovery section addresses
2019-08-22 08:35:11 -06:00
Travis Ralston e9b44c9802
Merge pull request #3336 from matrix-org/travis/fix-removing-widgets
No-op removals of widgets that don't exist
2019-08-22 08:34:11 -06:00
Travis Ralston 088568ea11
Merge pull request #3334 from matrix-org/travis/remove-logging
Remove extraneous logging
2019-08-22 08:27:21 -06:00
Bruno Windels 4a27abb131 fix css lint 2019-08-22 15:11:31 +01:00
J. Ryan Stinnett e7097d58ec Add IS access token callback
This passes a callback to the JS SDK which it can use to get IS access tokens
whenever needed for either talking to the IS directly or passing along to the
HS.

Fixes https://github.com/vector-im/riot-web/issues/10525
2019-08-22 14:44:09 +01:00
Bruno Windels 5cebce9bbf fix bug detected by tests 2019-08-22 14:41:40 +01:00
Bruno Windels 1dd052d9dd fix test after refactoring 2019-08-22 14:38:24 +01:00
Bruno Windels 9c6953f176 lint 2019-08-22 14:11:04 +01:00
Bruno Windels 8c9846efc1 update i18n 2019-08-22 14:10:08 +01:00
Bruno Windels b395fad834 add feature flag, allowing to revert to old slate editor 2019-08-22 14:07:43 +01:00
Bruno Windels 6e54bb8e51 default is unused here 2019-08-22 14:07:31 +01:00
Bruno Windels 944c56d09b prevent cider history overlapping with slate composer history 2019-08-22 14:07:03 +01:00
Bruno Windels 6a3ecde4e6 duplicate slate code where we changed it drastically
to still make it work when the feature flag will be turned off
2019-08-22 14:05:54 +01:00
Bruno Windels 36390da634 some doc improvements 2019-08-22 13:33:20 +01:00