mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 20:01:54 +03:00
Code Issues Projects Releases Packages Wiki Activity
17185 commits 219 branches 562 tags 474 MiB
Commit graph

17185 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
e21c12c2c9 Merge remote-tracking branch 'origin/dbkr/change_is' into travis/integs/account_set 2019-08-12 13:06:36 -06:00
Travis Ralston
ef33adce01 Merge branch 'travis/integs/widgets' into travis/integs/account_set 2019-08-12 13:02:23 -06:00
Travis Ralston
60778d843d Merge branch 'travis/integs/base' into travis/integs/account_set 2019-08-12 13:02:19 -06:00
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
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
David Baker
4d33438acb c+p fail 2019-08-12 14:46:04 +01:00
David Baker
f358b6162d Remove the access token for the old IS 
Pretty important that we don't send that to the new IS...
 2019-08-12 14:38:49 +01:00
Michael Telatynski
7bdac85a2a Break themes out into a separate file 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-12 14:24:12 +01:00
Michael Telatynski
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
Michael Telatynski
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
David Baker
bc088e4472 add comment 2019-08-12 13:31:31 +01:00
David Baker
10b19622db Don't clear field on failure 2019-08-12 13:29:52 +01:00
David Baker
bc66545fd0 shorten url by default 2019-08-12 13:11:05 +01:00
David Baker
06905bc5bb Actually appease linter 2019-08-12 12:05:25 +01:00
David Baker
bf9caa7fd8 add the rest of the files 2019-08-12 11:51:44 +01:00
David Baker
1067457d63 rerun i18n 2019-08-12 11:51:08 +01:00
David Baker
417d9b6af8 nicer way to appease linter 2019-08-12 11:50:11 +01:00
Michael Telatynski
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
Michael Telatynski
3e08bf6ecb Deduplicate code in ModularServerConfig by extending ServerConfig 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-11 03:34:12 +01:00
Travis Ralston
d2c7a5a979 Also check that the client even exists 2019-08-10 14:59:13 -06:00
Travis Ralston
58ccc7eb0c Don't fetch widgets unless logged in 2019-08-09 18:01:08 -06:00
Travis Ralston
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
Travis Ralston
4c82d16e34 Merge branch 'travis/integs/base' into travis/integs/widgets 2019-08-09 17:20:51 -06:00
Travis Ralston
3a4c6f3eac Appease the linter again 2019-08-09 17:20:37 -06:00
Travis Ralston
018b4f5d41 Use the default integration manager for config options 2019-08-09 17:08:26 -06:00
Travis Ralston
5a15e78fe4 Appease the linter 2019-08-09 16:14:36 -06:00
Travis Ralston
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
David Baker
4075cdde7f lint 2019-08-09 18:59:57 +01:00
Michael Telatynski
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
Michael Telatynski
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
David Baker
c76514fceb Add UI in settings to change ID Server 
Just changes the current ID server being used

To come in subsequent PRs:
 * Store this in account data
 * Check for terms or support the proper UI for accepting terms when setting
 * Support disconnecting

Part 1 of https://github.com/vector-im/riot-web/issues/10094
Requires https://github.com/matrix-org/matrix-js-sdk/pull/1013
 2019-08-09 18:07:58 +01:00
Michael Telatynski
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
Michael Telatynski
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
Michael Telatynski
13c7149592
Merge pull request #3294 from matrix-org/t3chguy/mount-guard 
Add mount-guards to MImageBody
 2019-08-09 16:55:08 +01:00
Michael Telatynski
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
Michael Telatynski
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
David Baker
d297018d9a
Merge pull request #3295 from matrix-org/dbkr/debounce_field 
Change throttle to debounce
 2019-08-09 15:38:58 +01:00
Michael Telatynski
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
David Baker
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
Michael Telatynski
72a83a8e6e Add mount-guards to MImageBody 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2019-08-09 14:51:07 +01:00
Travis Ralston
78744b8bcf
Merge pull request #3293 from matrix-org/travis/fix-karma 
Misc fixes to karma webpack
 2019-08-08 17:31:39 -06:00
Travis Ralston
ac9682a75b Actually use argument in karma tests 2019-08-08 16:00:14 -06:00
Travis Ralston
a6347af320 Fix karma complaining about woff2 files 2019-08-08 16:00:07 -06:00
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
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
J. Ryan Stinnett
e0fb0de83d Relock gemini-scrollbar deps 2019-08-08 16:01:41 +01:00
Travis Ralston
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