86fcaa2af0
Merge pull request #3350 from matrix-org/dbkr/dont_infinite_loop_on_server_change
...
Don't infinite loop on server change
2019-08-28 09:18:35 -04:00
ac2b8b874f
Don't infinite loop on server change
...
ServerConfig assumed that the state was already correct when
checking the given urls against the default, but that is not
neccessarily the case (eg. the validation can return a different
url to what the user entered). This would cause an infinite loop
because it would keep firing onServerConfigChange to change to
the desired URLs but the state would never change.
Fixes part of https://github.com/vector-im/riot-web/issues/10666
2019-08-27 17:29:56 -04:00
8e799b7136
Merge pull request #3341 from matrix-org/travis/tabbed-managers
...
Support multiple integration managers behind a labs flag
2019-08-27 09:08:17 -06:00
3eddded039
Merge branch 'develop' into travis/tabbed-managers
2019-08-27 09:07:52 -06:00
971e1ac8c3
Merge pull request #3340 from matrix-org/travis/homeserver-managers
...
Support homeserver-configured integration managers
2019-08-27 09:07:09 -06:00
e0b99b5cc8
Merge pull request #3342 from matrix-org/bwindels/cider-replace-emoticons
...
Auto-replace emoticons with emojis in new composer
2019-08-27 14:40:53 +00:00
08339abd35
Merge pull request #3348 from matrix-org/travis/fix-discovery
...
Adjust copy and include identity server changing when terms are pending
2019-08-27 08:27:03 -06:00
f10e1d7654
fix jsdoc comments
2019-08-27 09:54:13 +02:00
56606a46f4
don't assume preceding space for emoticon at start of document
...
also add more inline comments to explain what is going on
2019-08-27 09:50:36 +02:00
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
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
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
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
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
0273795f5d
add transform step to composer to auto-replace emoticons with emoji
2019-08-26 16:16:27 +02:00
4fd4ad41c1
improve editor model documentation
2019-08-26 16:16:27 +02:00
f8f0e77bde
add transform step during editor model update
2019-08-26 16:16:27 +02:00
0e65f71a37
support incrementing/decrementing doc positions with predicate
2019-08-26 16:16:27 +02:00
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
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
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
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
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
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
e8b0c41157
minus ;
2019-08-23 12:01:47 -06:00
e1552b61fc
fix i18n
2019-08-23 12:01:13 -06:00
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
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
dc0c7e3053
Merge pull request #3331 from matrix-org/jaywink/extra-rageshake-cleanup
...
Tweak rageshake logging messages
2019-08-23 09:59:05 -06:00
266e3af475
Appease the scss linter
2019-08-23 09:20:28 -06:00
160396ca9e
Appease the linter
2019-08-23 09:16:44 -06:00
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
602c338a26
Merge branch 'travis/homeserver-managers' into travis/tabbed-managers
2019-08-23 08:50:21 -06:00
84e3d339ac
Change to provider object
2019-08-23 11:17:51 +01:00
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
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
470295ad14
Expose a getOrderedManagers() function for use elsewhere
2019-08-22 15:17:59 -06:00
8493887ceb
Import the right js-sdk
2019-08-22 14:57:09 -06:00
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
7d511fbbc5
remove leftover debugger =)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-22 18:34:26 +01:00
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
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
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
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
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
088568ea11
Merge pull request #3334 from matrix-org/travis/remove-logging
...
Remove extraneous logging
2019-08-22 08:27:21 -06:00
4a27abb131
fix css lint
2019-08-22 15:11:31 +01:00
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
5cebce9bbf
fix bug detected by tests
2019-08-22 14:41:40 +01:00
1dd052d9dd
fix test after refactoring
2019-08-22 14:38:24 +01:00
David Baker