gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,533 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

7533 Commits

Author SHA1 Message Date
Travis Ralston 7a65dc96cd
Merge pull request #9726 from vector-im/travis/wk/mobileguide 
Show resolved homeserver configuration on the mobile guide
 2019-05-17 11:01:42 -06:00
Travis Ralston 1ac5df3cd0 Merge branch 'develop' into travis/feature/wellknown2 2019-05-16 12:58:09 -06:00
Travis Ralston 39d1293350
Merge pull request #9721 from vector-im/travis/wk/fallback_hs 
Flag the validated config as the default config
 2019-05-16 12:47:01 -06:00
Travis Ralston 6f8c6bf13e
Merge pull request #9736 from vector-im/travis/docker-test 
Make Dockerfile work for develop and other branches
 2019-05-16 08:43:44 -06:00
Travis Ralston 51f56719c0
Merge pull request #9719 from vector-im/travis/wk/clarify_is_hs_url 
Clarify comment on is_url and hs_url handling
 2019-05-16 08:41:34 -06:00
Tom Lant 45e8c26864 Update issue templates 2019-05-16 11:24:45 +01:00
Travis Ralston 3123b429f7 Increase timeout for yarn install in Docker builds 
Otherwise we run into problems where Docker Hub's limited machines timeout trying to download our dependencies
 2019-05-15 16:24:25 -06:00
David Baker 05a2cb1020 Merge branch 'master' into develop 2019-05-15 14:40:16 +01:00
David Baker 5aa88abacc v1.1.2 2019-05-15 14:36:52 +01:00
David Baker e749420196 Prepare changelog for v1.1.2 2019-05-15 14:36:51 +01:00
David Baker 8ac5957186 v1.1.2 2019-05-15 14:34:59 +01:00
David Baker d0def4a80f react-sdk 1.1.2 2019-05-15 14:34:13 +01:00
J. Ryan Stinnett 5a6be9a665 Add message editing to sample also 2019-05-15 11:12:12 +01:00
Bruno Windels 734221cc3f
Merge pull request #9728 from vector-im/bwindels/message-edit-editor 
add description of new labs feature for message editing
 2019-05-15 09:23:34 +00:00
Bruno Windels f5e7dd5164 add description of new labs feature for message editing 2019-05-15 10:02:50 +01:00
Travis Ralston 22cc33eb15 Do a simple .well-known lookup for default_server_name for mobile guide 2019-05-14 17:57:04 -06:00
Travis Ralston 559416dcae Show most homeserver options on the mobile guide 
This doesn't cover default_server_name because that pulls in a questionable amount of JS.

See https://github.com/vector-im/riot-web/issues/9290
 2019-05-14 17:00:06 -06:00
Travis Ralston 68a7550080 Flag the validated config as the default config 
For use in the rest of the app.

See https://github.com/vector-im/riot-web/issues/9290
 2019-05-14 13:12:34 -06:00
Travis Ralston 7f5589c01b Clarify comment on is_url and hs_url handling 
We don't actually need to do anything because the app transparently handles this.

See https://github.com/vector-im/riot-web/issues/9290
 2019-05-14 12:53:13 -06:00
David Baker da9cde6d18 Merge branch 'master' into develop 2019-05-14 14:04:34 +01:00
David Baker 5aa8326dfc v1.1.1 2019-05-14 14:01:01 +01:00
David Baker e4ed0994ce Prepare changelog for v1.1.1 2019-05-14 14:01:01 +01:00
David Baker 875d1b209a v1.1.1 2019-05-14 13:53:31 +01:00
David Baker 8ed44e6b64 matrix-react-sdk v1.1.1 2019-05-14 13:52:05 +01:00
Travis Ralston 886828caa8
Merge pull request #9496 from vector-im/travis/guests/block-ui 
Validate default homeserver config before loading the app
 2019-05-10 11:20:33 -06:00
David Baker 814b5297ad Merge branch 'master' into develop 2019-05-07 16:05:58 +01:00
David Baker 2ab8db3c0c v1.1.0 2019-05-07 15:55:56 +01:00
David Baker 94979f7ff5 Prepare changelog for v1.1.0 2019-05-07 15:55:55 +01:00
David Baker 5c46bd37e8 v1.1.0 2019-05-07 15:54:38 +01:00
David Baker c81b9bab79 Released react-sdk and js-sdk 2019-05-07 15:52:50 +01:00
J. Ryan Stinnett 818bab9fa4
Merge pull request #9632 from vector-im/travis/dockerfile-release 
Add Dockerfile
 2019-05-07 10:07:08 +01:00
Matthew Hodgson ee0b7e9c82 use right android app id 2019-05-04 10:50:14 -06:00
Matthew Hodgson 03b2766ca8 use right android app id 2019-05-04 17:28:02 +01:00
Travis Ralston fc5c93ab5f Fix unit tests for new login 
Supply a server config to the component and adjust the wait logic to be less of a race. The Login component will noop onPasswordLogin if it is "busy", and it is busy when it requests the login flows.
 2019-05-03 16:27:41 -06:00
Travis Ralston eee2468a01 Merge branch 'travis/dockerfile-continued' into travis/dockerfile-release 2019-05-03 11:45:20 -06:00
Travis Ralston a5092dc763 Fix tests to use new server config options 2019-05-03 11:06:32 -06:00
Travis Ralston bf97fd67b4 Handle cases of no default server 2019-05-03 11:06:32 -06:00
Travis Ralston 45caa8baab Add a couple notes 2019-05-03 11:06:32 -06:00
Travis Ralston ab6ba0e0d8 Add some clarity to the config options 2019-05-03 11:06:32 -06:00
Travis Ralston e7bf643d8b Don't repackage the ValidatedDiscoveryConfig 
It's usable as-is, and we can add things to it when we need to (ie: integrations).
 2019-05-03 11:06:32 -06:00
Travis Ralston c8caf6797d Move bulk of discovery processing to react-sdk 2019-05-03 11:06:32 -06:00
Travis Ralston 51941eae49 Add note to self 2019-05-03 11:06:32 -06:00
Travis Ralston 5445632026 Use new js-sdk properties for getting discovery errors 
Requires https://github.com/matrix-org/matrix-js-sdk/pull/899
 2019-05-03 11:06:32 -06:00
Travis Ralston f08491cee8 Validate default homeserver config before loading the app 
Implements the process described here: https://github.com/vector-im/riot-web/issues/9290#issuecomment-481966910

The expectation is that later layers (like the react-sdk) will make use of the `validated_discovery_config` option instead of interpreting the config themselves.

We intentionally block the UI from loading here to avoid races between discovery and the app loading.
 2019-05-03 11:06:32 -06:00
David Baker 9cd4ac1df4
Merge pull request #9628 from vector-im/dbkr/thanks_you_junit_but_its_not_2005_anymore 
Remove karma junit output
 2019-05-03 12:43:04 +01:00
David Baker c612633402 Merge remote-tracking branch 'origin/develop' into dbkr/thanks_you_junit_but_its_not_2005_anymore 2019-05-03 12:37:28 +01:00
David Baker 0c36849c0f
Merge pull request #9626 from vector-im/dbkr/yarn_upgrade_may19 
yarn upgrade
 2019-05-03 12:36:26 +01:00
David Baker 1a1f2254e5 Remove karma junit output 
See https://github.com/matrix-org/matrix-react-sdk/pull/2944
 2019-05-03 11:40:53 +01:00
David Baker 908a72e00e yarn upgrade 
ALL THE UPDATES!

(so many updates)
 2019-05-03 11:13:04 +01:00
David Baker 2fe6b5074d
Merge pull request #9617 from vector-im/dbkr/arghbuildkite 
Respond quickly to buildkite pokes
 2019-05-02 18:13:38 +01:00