a5cac02910
Merge pull request #3302 from matrix-org/travis/integs/widgets
...
Read integration managers from account data (widgets)
2019-08-13 13:02:00 -06:00
24ac1d1547
Merge branch 'develop' into travis/integs/widgets
2019-08-13 09:02:52 -06:00
831da696ad
Merge pull request #3301 from matrix-org/travis/integs/base
...
Refactor integration manager handling into a common place
2019-08-13 09:00:22 -06:00
12eeb20574
Merge pull request #3291 from matrix-org/t3chguy/fix_RoomAvatarEvent
...
Fix wrong default-letter-avatar for RoomAvatarEvent
2019-08-13 09:32:26 +01:00
b8fb283391
Merge pull request #3307 from matrix-org/travis/fix-settings-alignment
...
Fix alignment of add email/phone number inputs in settings
2019-08-12 14:55:23 -06:00
438eba1c46
Fix alignment of add email/phone number inputs in settings
2019-08-12 14:14:17 -06:00
e3348c6184
Merge pull request #3306 from matrix-org/t3chguy/react16_2
...
Bump matrix-react-test-utils for React 16 compatibility
2019-08-12 18:19:11 +01:00
7145d0e1a6
Hit yarn with a hammer until it works
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-12 18:06:37 +01:00
387fa75da8
Bump matrix-react-test-utils for React 16 compatibility
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-12 17:41:36 +01:00
bb23374b8a
Merge pull request #3304 from matrix-org/t3chguy/un-hardcode-themes-in-settings
...
Consolidate Themes into ThemeController. Remove hardcoded themes in view
2019-08-12 15:57:56 +01:00
7bdac85a2a
Break themes out into a separate file
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-12 14:24:12 +01:00
691b9145ee
Merge pull request #3303 from matrix-org/t3chguy/ModularServerConfig_extend_ServerConfig
...
Deduplicate code in ModularServerConfig by extending ServerConfig
2019-08-12 14:19:17 +01:00
76f5977a2a
Merge pull request #3299 from matrix-org/t3chguy/fix_registrationForm_defaultValue_Field
...
RegistrationForm: the Fields are controlled, fix default values
2019-08-12 13:48:42 +01:00
916af736ad
Consolidate Themes into ThemeController. Remove hardcoded themes in view
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-11 03:43:34 +01:00
3e08bf6ecb
Deduplicate code in ModularServerConfig by extending ServerConfig
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-11 03:34:12 +01:00
d2c7a5a979
Also check that the client even exists
2019-08-10 14:59:13 -06:00
58ccc7eb0c
Don't fetch widgets unless logged in
2019-08-09 18:01:08 -06:00
74ce5c3541
Read integration managers from account data
...
For https://github.com/vector-im/riot-web/issues/4913 / https://github.com/vector-im/riot-web/issues/10161
Relies on the structure defined by [MSC1957](https://github.com/matrix-org/matrix-doc/pull/1957 )
This is just the bit of code to parse the user's widgets (while watching for changes) and allow for it to be the default manager.
2019-08-09 17:35:59 -06:00
4c82d16e34
Merge branch 'travis/integs/base' into travis/integs/widgets
2019-08-09 17:20:51 -06:00
3a4c6f3eac
Appease the linter again
2019-08-09 17:20:37 -06:00
018b4f5d41
Use the default integration manager for config options
2019-08-09 17:08:26 -06:00
5a15e78fe4
Appease the linter
2019-08-09 16:14:36 -06:00
ffa49df889
Refactor integration manager handling into a common place
...
It was already in a common place, but this is the boilerplate for supporting multiple integration managers, and multiple integration manager sources.
For https://github.com/vector-im/riot-web/issues/4913 / https://github.com/vector-im/riot-web/issues/10161
2019-08-09 16:08:06 -06:00
75bcd61934
Merge pull request #3298 from matrix-org/t3chguy/Modal.createX_promise
...
change Modal async/await signature to use raw promises
2019-08-09 18:16:40 +01:00
242f23c753
RegistrationForm: the Fields are controlled, fix default values
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 18:08:17 +01:00
49c7730503
change Modal async/await signature to use raw promises
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 17:29:22 +01:00
a9afdec24a
Merge pull request #3297 from matrix-org/t3chguy/Modal.createX_promise
...
Modal.createX return thenable which extends onFinished, for async/await
2019-08-09 17:16:21 +01:00
13c7149592
Merge pull request #3294 from matrix-org/t3chguy/mount-guard
...
Add mount-guards to MImageBody
2019-08-09 16:55:08 +01:00
cc0b698c92
Merge pull request #3296 from matrix-org/t3chguy/remove_legacyLoginParams
...
Get rid of support for legacy login params
2019-08-09 16:54:51 +01:00
7fe078c07a
Modal.createX return thenable which extends onFinished, for async/await
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 16:47:22 +01:00
d297018d9a
Merge pull request #3295 from matrix-org/dbkr/debounce_field
...
Change throttle to debounce
2019-08-09 15:38:58 +01:00
787e9feeff
Get rid of support for legacy login params
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 15:34:32 +01:00
fcdbce1dda
Change throttle to debounce
...
And add an explanation of whyI think one's more apropriate than the
other for this.
2019-08-09 15:30:05 +01:00
72a83a8e6e
Add mount-guards to MImageBody
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 14:51:07 +01:00
ee3542453e
Fix RoomAvatarEvent historic fallback
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-09 11:31:04 +01:00
78744b8bcf
Merge pull request #3293 from matrix-org/travis/fix-karma
...
Misc fixes to karma webpack
2019-08-08 17:31:39 -06:00
ac9682a75b
Actually use argument in karma tests
2019-08-08 16:00:14 -06:00
a6347af320
Fix karma complaining about woff2 files
2019-08-08 16:00:07 -06:00
423a74c99c
Clean up implementation
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-08 20:21:53 +01:00
28b42d512a
Use the room name rather than sender name for fallback room avatar event
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-08-08 20:07:38 +01:00
3214ed8829
Merge pull request #3289 from matrix-org/jryans/rm-bind-at-reg
...
Remove 3PID binding during registration
2019-08-08 17:48:50 +01:00
c2f81a00c4
Merge pull request #3288 from matrix-org/jryans/user-settings-toggle-3pid
...
Add controls for toggling discovery in user settings
2019-08-08 17:48:17 +01:00
38e64ce966
Remove 3PID binding during registration
...
This disables 3PID binding at registration time, so users won't be discoverable
by 3PID by default. Instead, new discovery controls in settings allow you to
opt-in.
Fixes https://github.com/vector-im/riot-web/issues/10424
2019-08-08 16:25:48 +01:00
e0fb0de83d
Relock gemini-scrollbar deps
2019-08-08 16:01:41 +01:00
07d6fa7fdb
Merge pull request #3286 from matrix-org/travis/immutable-dms/basic
...
Reuse DMs whenever possible instead of asking to reuse them
2019-08-08 07:26:17 -06:00
11cf7493d9
Disable binding 3PIDs when adding to account
...
Binding 3PIDs on the IS is now handled by a separate step in the Discovery
section of settings.
Fixes https://github.com/vector-im/riot-web/issues/10510
2019-08-08 11:52:21 +01:00
178d6605c4
Add controls for toggling discovery in user settings
...
This adds controls for each 3PID to allow the user to choose whether it's bound
on the IS.
Fixes https://github.com/vector-im/riot-web/issues/10159
2019-08-08 11:35:35 +01:00
54ca7b708e
Merge pull request #3285 from matrix-org/dbkr/work_without_is
...
Work with no ID server set
2019-08-08 09:48:44 +01:00
f85898cdca
Remove ChatCreateOrReuseDialog
...
Part of https://github.com/vector-im/riot-web/issues/10416
All usages of the dialog have been replaced with new DM logic.
2019-08-07 12:18:41 -06:00
24705d02b7
Replace DM logic in `view_start_chat_or_reuse`
...
Part of https://github.com/vector-im/riot-web/issues/10416
This code is used by the welcome bot logic and the groups/communities section of the app. goHomeOnCancel can be removed because no matter what happens we'll end up in a room with the user (and we aren't showing a dialog anymore).
2019-08-07 12:13:59 -06:00
Travis Ralston